gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

来函信息页面添加专项任务，修改页面显示，修改翻译配置文件

Browse Source
This commit is contained in:
zhanghongqing
2018-03-05 17:23:42 +08:00
parent 05ba52f8bf
commit 6dd3934dcc
15 changed files with 449 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/nis/domain/configuration/RequestInfo.java
View File

@@ -1,11 +1,14 @@
package com.nis.domain.configuration;
import java.util.Date;
import java.util.List;
import com.nis.domain.BaseEntity;
public class RequestInfo extends BaseEntity<RequestInfo>{
private Long taskId;
private String requestNumber;
private String requestOrg;
@@ -39,8 +42,18 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
private Date beginDate;//开始时间
private Date endDate;//结束时间
private String timeType;//时间类型
private String taskName;//专项任务
public String getRequestNumber() {
public Long getTaskId() {
return taskId;
}
public void setTaskId(Long taskId) {
this.taskId = taskId;
}
public String getRequestNumber() {
return requestNumber;
}
@@ -191,5 +204,13 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
public void setTimeType(String timeType) {
this.timeType = timeType;
}
public String getTaskName() {
return taskName;
}
public void setTaskName(String taskName) {
this.taskName = taskName;
}
}

131
src/main/java/com/nis/domain/configuration/TaskInfo.java Normal file
View File

@@ -0,0 +1,131 @@
package com.nis.domain.configuration;
import java.util.Date;
import com.nis.domain.BaseEntity;
public class TaskInfo extends BaseEntity<TaskInfo> {
private static final long serialVersionUID = 1L;
private String taskName;
private String taskOrg;
private Date taskTime;
private String taskDesc;
private Integer isValid;
private Integer isAudit;
private Integer creatorId;
private Date createTime;
private Integer editorId;
private Date editTime;
private Integer auditorId;
private Date auditTime;
public String getTaskName() {
return taskName;
}
public void setTaskName(String taskName) {
this.taskName = taskName;
}
public String getTaskOrg() {
return taskOrg;
}
public void setTaskOrg(String taskOrg) {
this.taskOrg = taskOrg;
}
public Date getTaskTime() {
return taskTime;
}
public void setTaskTime(Date taskTime) {
this.taskTime = taskTime;
}
public String getTaskDesc() {
return taskDesc;
}
public void setTaskDesc(String taskDesc) {
this.taskDesc = taskDesc;
}
public Integer getIsValid() {
return isValid;
}
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Integer getIsAudit() {
return isAudit;
}
public void setIsAudit(Integer isAudit) {
this.isAudit = isAudit;
}
public Integer getCreatorId() {
return creatorId;
}
public void setCreatorId(Integer creatorId) {
this.creatorId = creatorId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getEditorId() {
return editorId;
}
public void setEditorId(Integer editorId) {
this.editorId = editorId;
}
public Date getEditTime() {
return editTime;
}
public void setEditTime(Date editTime) {
this.editTime = editTime;
}
public Integer getAuditorId() {
return auditorId;
}
public void setAuditorId(Integer auditorId) {
this.auditorId = auditorId;
}
public Date getAuditTime() {
return auditTime;
}
public void setAuditTime(Date auditTime) {
this.auditTime = auditTime;
}
}

24
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -1,5 +1,7 @@
package com.nis.web.controller.configuration;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -12,15 +14,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.configuration.RequestInfo;
import com.nis.util.Constants;
import com.nis.util.StringUtils;
import com.nis.domain.configuration.TaskInfo;
import com.nis.web.controller.BaseController;
import com.nis.web.service.configuration.RequestInfoService;
/**
* 测试类
*
*/
@Controller
@RequestMapping("${adminPath}/cfg/request")
public class RequestInfoController extends BaseController{
@@ -43,11 +40,15 @@ public class RequestInfoController extends BaseController{
*/
@RequestMapping(value={"form"})
public String form(RequestInfo requestInfo, Model model) {
TaskInfo taskInfo = new TaskInfo();
taskInfo.setId(requestInfo.getTaskId());
showTask(taskInfo,model);
if(requestInfo.getId()!=null){
requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
model.addAttribute("requestInfo", requestInfo);
}else{
model.addAttribute("requestInfo", requestInfo);
}
model.addAttribute("requestInfo", requestInfo);
return "/cfg/requestForm";
}
@@ -133,4 +134,13 @@ public class RequestInfoController extends BaseController{
}
/**
* 查询专项任务
* @param taskInfo
* @param model
*/
public void showTask(TaskInfo taskInfo ,Model model){
List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
model.addAttribute("taskInfos", taskInfos);
}
}

9
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
View File

@@ -6,6 +6,7 @@ import java.util.Map;
import org.apache.ibatis.annotations.Param;
import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.TaskInfo;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao;
@@ -20,14 +21,8 @@ public interface RequestInfoDao extends CrudDao {
int deleteByPrimaryKey(Long id);
List<TaskInfo> showTask(TaskInfo taskInfo);
int insertSelective(RequestInfo requestInfo);
RequestInfo selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(RequestInfo requestInfo);
int updateByPrimaryKey(RequestInfo requestInfo);
}

161
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -16,6 +16,7 @@
<result column="edit_time" jdbcType="DATE" property="editTime" />
<result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
<result column="audit_time" jdbcType="DATE" property="auditTime" />
<result column="task_id" jdbcType="BIGINT" property="taskId" />
</resultMap>
<sql id="Base_Column_List">
id, request_number, request_org, request_time, request_title, request_content, is_valid,
@@ -25,6 +26,7 @@
<select id="findRequestInfo" resultMap="BaseResultMap">
select
r.id AS id,
r.task_id AS taskId,
r.request_number AS requestNumber,
r.request_org AS requestOrg,
r.request_time AS requestTime,
@@ -37,11 +39,13 @@
u.name AS editorName,
r.edit_time AS editTime,
e.name AS currentName,
r.audit_time AS auditTime
r.audit_time AS auditTime,
t.task_name AS taskName
from request_info r
left join sys_user s on r.creator_id=s.id
left join sys_user u on r.editor_id=u.id
left join sys_user e on r.auditor_id=e.id
left join task_info t on r.task_id=t.id
where r.is_valid=1 and r.is_audit !=3
<if test="requestTitle != null and requestTitle != ''">
AND r.request_title like
@@ -159,159 +163,4 @@
where id = #{id,jdbcType=BIGINT} and is_audit !=1
</update>
<insert id="insertSelective" parameterType="com.nis.domain.configuration.RequestInfo">
insert into request_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="requestNumber != null">
request_number,
</if>
<if test="requestOrg != null">
request_org,
</if>
<if test="requestTime != null">
request_time,
</if>
<if test="requestTitle != null">
request_title,
</if>
<if test="requestContent != null">
request_content,
</if>
<if test="isValid != null">
is_valid,
</if>
<if test="isAudit != null">
is_audit,
</if>
<if test="creatorId != null">
creator_id,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="editorId != null">
editor_id,
</if>
<if test="editTime != null">
edit_time,
</if>
<if test="auditorId != null">
auditor_id,
</if>
<if test="auditTime != null">
audit_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="requestNumber != null">
#{requestNumber,jdbcType=VARCHAR},
</if>
<if test="requestOrg != null">
#{requestOrg,jdbcType=VARCHAR},
</if>
<if test="requestTime != null">
#{requestTime,jdbcType=DATE},
</if>
<if test="requestTitle != null">
#{requestTitle,jdbcType=VARCHAR},
</if>
<if test="requestContent != null">
#{requestContent,jdbcType=VARCHAR},
</if>
<if test="isValid != null">
#{isValid,jdbcType=INTEGER},
</if>
<if test="isAudit != null">
#{isAudit,jdbcType=INTEGER},
</if>
<if test="creatorId != null">
#{creatorId,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=DATE},
</if>
<if test="editorId != null">
#{editorId,jdbcType=INTEGER},
</if>
<if test="editTime != null">
#{editTime,jdbcType=DATE},
</if>
<if test="auditorId != null">
#{auditorId,jdbcType=INTEGER},
</if>
<if test="auditTime != null">
#{auditTime,jdbcType=DATE},
</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.RequestInfo">
update request_info
set request_number = #{requestNumber,jdbcType=VARCHAR},
request_org = #{requestOrg,jdbcType=VARCHAR},
request_time = #{requestTime,jdbcType=DATE},
request_title = #{requestTitle,jdbcType=VARCHAR},
request_content = #{requestContent,jdbcType=VARCHAR},
is_valid = #{isValid,jdbcType=INTEGER},
is_audit = #{isAudit,jdbcType=INTEGER},
creator_id = #{creatorId,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=DATE},
editor_id = #{editorId,jdbcType=INTEGER},
edit_time = #{editTime,jdbcType=DATE},
auditor_id = #{auditorId,jdbcType=INTEGER},
audit_time = #{auditTime,jdbcType=DATE}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="findAllList" resultMap="BaseResultMap">
select
r.id AS id,
r.request_number AS requestNumber,
r.request_org AS requestOrg,
r.request_time AS requestTime,
r.request_title AS requestTitle,
r.request_content AS requestContent,
r.is_valid AS isValid,
r.is_audit AS isAudit,
s.name AS creatorName,
r.create_time AS createTime,
u.name AS editorName,
r.edit_time AS editTime,
e.name AS currentName,
r.audit_time AS auditTime
from request_info r
left join sys_user s on r.creator_id=s.id
left join sys_user u on r.editor_id=u.id
left join sys_user e on r.auditor_id=e.id
<trim prefix="where" prefixOverrides="AND|OR">
<if test="requestTitle != null and requestTitle != ''">
AND r.request_title like
<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
</if>
<if test="requestContent != null and requestContent != ''">
AND r.request_content like
<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
</if>
<if test="requestNumber != null and requestNumber != ''">
AND r.request_number=#{requestNumber}
</if>
<if test="isAudit != null">
AND r.is_audit=${isAudit}
</if>
<if test=" timeType = 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND r.request_time between #{beginDate} and #{endDate}
</if>
<if test="timeType = 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
</if>
</trim>
order by r.request_time desc
</select>
</mapper>

8
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java Normal file
View File

@@ -0,0 +1,8 @@
package com.nis.web.dao.configuration;
import com.nis.domain.configuration.TaskInfo;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao;
@MyBatisDao
public interface TaskInfoDao extends CrudDao<TaskInfo>{
}

192
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml Normal file
View File

@@ -0,0 +1,192 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nis.web.dao.configuration.TaskInfoDao">
<resultMap id="BaseResultMap" type="com.nis.domain.configuration.TaskInfo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="task_name" jdbcType="VARCHAR" property="taskName" />
<result column="task_org" jdbcType="VARCHAR" property="taskOrg" />
<result column="task_time" jdbcType="DATE" property="taskTime" />
<result column="task_desc" jdbcType="VARCHAR" property="taskDesc" />
<result column="is_valid" jdbcType="INTEGER" property="isValid" />
<result column="is_audit" jdbcType="INTEGER" property="isAudit" />
<result column="creator_id" jdbcType="INTEGER" property="creatorId" />
<result column="create_time" jdbcType="DATE" property="createTime" />
<result column="editor_id" jdbcType="INTEGER" property="editorId" />
<result column="edit_time" jdbcType="DATE" property="editTime" />
<result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
<result column="audit_time" jdbcType="DATE" property="auditTime" />
</resultMap>
<sql id="Base_Column_List">
id, task_name, task_org, task_time, task_desc, is_valid, is_audit, creator_id, create_time,
editor_id, edit_time, auditor_id, audit_time
</sql>
<select id="findList" parameterType="com.nis.domain.configuration.TaskInfo" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from task_info
<if test="id!=null">
where id = #{id,jdbcType=BIGINT}
</if>
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from task_info
where id = #{id,jdbcType=BIGINT}
</delete>
<insert id="insert" parameterType="com.nis.domain.configuration.TaskInfo">
insert into task_info (id, task_name, task_org,
task_time, task_desc, is_valid,
is_audit, creator_id, create_time,
editor_id, edit_time, auditor_id,
audit_time)
values (#{id,jdbcType=BIGINT}, #{taskName,jdbcType=VARCHAR}, #{taskOrg,jdbcType=VARCHAR},
#{taskTime,jdbcType=DATE}, #{taskDesc,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER},
#{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=DATE},
#{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, #{auditorId,jdbcType=INTEGER},
#{auditTime,jdbcType=DATE})
</insert>
<insert id="insertSelective" parameterType="com.nis.domain.configuration.TaskInfo">
insert into task_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="taskName != null">
task_name,
</if>
<if test="taskOrg != null">
task_org,
</if>
<if test="taskTime != null">
task_time,
</if>
<if test="taskDesc != null">
task_desc,
</if>
<if test="isValid != null">
is_valid,
</if>
<if test="isAudit != null">
is_audit,
</if>
<if test="creatorId != null">
creator_id,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="editorId != null">
editor_id,
</if>
<if test="editTime != null">
edit_time,
</if>
<if test="auditorId != null">
auditor_id,
</if>
<if test="auditTime != null">
audit_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="taskName != null">
#{taskName,jdbcType=VARCHAR},
</if>
<if test="taskOrg != null">
#{taskOrg,jdbcType=VARCHAR},
</if>
<if test="taskTime != null">
#{taskTime,jdbcType=DATE},
</if>
<if test="taskDesc != null">
#{taskDesc,jdbcType=VARCHAR},
</if>
<if test="isValid != null">
#{isValid,jdbcType=INTEGER},
</if>
<if test="isAudit != null">
#{isAudit,jdbcType=INTEGER},
</if>
<if test="creatorId != null">
#{creatorId,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=DATE},
</if>
<if test="editorId != null">
#{editorId,jdbcType=INTEGER},
</if>
<if test="editTime != null">
#{editTime,jdbcType=DATE},
</if>
<if test="auditorId != null">
#{auditorId,jdbcType=INTEGER},
</if>
<if test="auditTime != null">
#{auditTime,jdbcType=DATE},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.nis.domain.configuration.TaskInfo">
update task_info
<set>
<if test="taskName != null">
task_name = #{taskName,jdbcType=VARCHAR},
</if>
<if test="taskOrg != null">
task_org = #{taskOrg,jdbcType=VARCHAR},
</if>
<if test="taskTime != null">
task_time = #{taskTime,jdbcType=DATE},
</if>
<if test="taskDesc != null">
task_desc = #{taskDesc,jdbcType=VARCHAR},
</if>
<if test="isValid != null">
is_valid = #{isValid,jdbcType=INTEGER},
</if>
<if test="isAudit != null">
is_audit = #{isAudit,jdbcType=INTEGER},
</if>
<if test="creatorId != null">
creator_id = #{creatorId,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=DATE},
</if>
<if test="editorId != null">
editor_id = #{editorId,jdbcType=INTEGER},
</if>
<if test="editTime != null">
edit_time = #{editTime,jdbcType=DATE},
</if>
<if test="auditorId != null">
auditor_id = #{auditorId,jdbcType=INTEGER},
</if>
<if test="auditTime != null">
audit_time = #{auditTime,jdbcType=DATE},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.TaskInfo">
update task_info
set task_name = #{taskName,jdbcType=VARCHAR},
task_org = #{taskOrg,jdbcType=VARCHAR},
task_time = #{taskTime,jdbcType=DATE},
task_desc = #{taskDesc,jdbcType=VARCHAR},
is_valid = #{isValid,jdbcType=INTEGER},
is_audit = #{isAudit,jdbcType=INTEGER},
creator_id = #{creatorId,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=DATE},
editor_id = #{editorId,jdbcType=INTEGER},
edit_time = #{editTime,jdbcType=DATE},
auditor_id = #{auditorId,jdbcType=INTEGER},
audit_time = #{auditTime,jdbcType=DATE}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

8
src/main/java/com/nis/web/service/configuration/RequestInfoService.java
View File

@@ -11,9 +11,11 @@ import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.TaskInfo;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.RequestInfoDao;
import com.nis.web.dao.configuration.TaskInfoDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@@ -23,6 +25,8 @@ public class RequestInfoService extends BaseService{
@Autowired
private RequestInfoDao requestInfoDao;
@Autowired
private TaskInfoDao taskInfoDao;
public Page<RequestInfo> findRequestInfo(Page<RequestInfo> page, RequestInfo requestInfo) {
// 设置分页参数
@@ -81,4 +85,8 @@ public class RequestInfoService extends BaseService{
RequestInfo requestInfo=new RequestInfo();
return requestInfoDao.findAllList(requestInfo);
}
public List<TaskInfo> showTask(TaskInfo taskInfo) {
return taskInfoDao.findList(taskInfo);
}
}