From 8dea18adc1b9067dc840a3f05dada3d4da52babc Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 5 Mar 2018 10:05:15 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=91=98=E5=92=8C=E5=AE=A1=E6=A0=B8=E5=91=98=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/SysRole.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/nis/domain/SysRole.java b/src/main/java/com/nis/domain/SysRole.java index 7914c7731..23697b938 100644 --- a/src/main/java/com/nis/domain/SysRole.java +++ b/src/main/java/com/nis/domain/SysRole.java @@ -45,7 +45,11 @@ public class SysRole extends BaseEntity{ private Date createTime; - // 数据范围（1：所有数据；2：所在国家中心及以下数据；3：所在国家中心数据；4：所在省中心及以下数据；5：所在省中心数据；8：所在部门及以下数据；9：所在部门数据） + /** + * 数据范围（1：所有数据；2：所在国家中心及以下数据；3：所在国家中心数据；4：所在省中心及以下数据；5：所在省中心数据； + * 6：所在部门及以下数据；7：所在部门数据,8:配置员，9：审核员） + */ + public static final Integer DATA_SCOPE_ALL = 1; public static final Integer DATA_SCOPE_COMPANY_AND_CHILD = 2; public static final Integer DATA_SCOPE_COMPANY = 3; @@ -53,6 +57,8 @@ public class SysRole extends BaseEntity{ public static final Integer DATA_SCOPE_OFFICE = 5; public static final Integer DATA_SCOPE_ENTITY_AND_CHILD = 6; public static final Integer DATA_SCOPE_ENTITY = 7; + public static final Integer DATA_SCOPE_CREATOR = 8; + public static final Integer DATA_SCOPE_AUDITOR = 9; From 58cff64fd964370d5c4fe6a5a7f6391d39f20af1 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Mon, 5 Mar 2018 10:23:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?1.=E7=B3=BB=E7=BB=9F=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0serviceId?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=202.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E6=97=B6serviceId=E4=BC=9A?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E6=96=B0=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88serviceId=E6=98=AF=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E4=BF=AE=E6=94=B9=E7=9A=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/dao/systemService/SystemServiceInfoDao.xml | 3 +++ src/main/webapp/WEB-INF/views/systemService/form.jsp | 4 +++- src/main/webapp/WEB-INF/views/systemService/list.jsp | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml index fb0696c19..5909e0dd9 100644 --- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml +++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml @@ -41,6 +41,9 @@ and ssi.service_name like CONCAT('%', #{serviceName}, '%') + + and ssi.service_id like CONCAT('%', #{serviceId}, '%') + and ssi.action=#{action} diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp index 3025fe689..80d767ed2 100644 --- a/src/main/webapp/WEB-INF/views/systemService/form.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp @@ -116,6 +116,9 @@ //自动获取serviceId function autoServiceId() { + if ("${systemServiceInfo.id}") { + return false; + } var type = $("[name=tableType]").val(); var action = $("#action").val(); var serviceIdPre; @@ -315,7 +318,6 @@
- <%-- --%>
diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp index e5f847025..0ea8ce84e 100644 --- a/src/main/webapp/WEB-INF/views/systemService/list.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp @@ -79,10 +79,15 @@ function deleteService(id) { - 名称 : + 业务名称 : + + 业务ID : + + + + > + diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp index 0ea8ce84e..393cf39bd 100644 --- a/src/main/webapp/WEB-INF/views/systemService/list.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp @@ -28,14 +28,14 @@ function deleteService(id) {

- 业务管理 + 系统业务管理

@@ -43,11 +43,11 @@ function deleteService(id) {
- 业务列表 + 列表
-
+
@@ -90,13 +90,13 @@ function deleteService(id) {
- -
- +
+ +
@@ -105,9 +105,9 @@ function deleteService(id) { - - - + + + @@ -115,7 +115,7 @@ function deleteService(id) { - From 6dd3934dcca3691021ee0adce23ca6437f510b81 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 5 Mar 2018 17:23:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9D=A5=E5=87=BD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E4=B8=93=E9=A1=B9=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/domain/configuration/RequestInfo.java | 23 ++- .../nis/domain/configuration/TaskInfo.java | 131 ++++++++++++ .../configuration/RequestInfoController.java | 24 ++- .../web/dao/configuration/RequestInfoDao.java | 9 +- .../web/dao/configuration/RequestInfoDao.xml | 161 +-------------- .../web/dao/configuration/TaskInfoDao.java | 8 + .../nis/web/dao/configuration/TaskInfoDao.xml | 192 ++++++++++++++++++ .../configuration/RequestInfoService.java | 8 + src/main/resources/generatorConfig.xml | 16 +- .../resources/messages/message_en.properties | 10 +- .../resources/messages/message_ru.properties | 11 +- .../messages/message_zh_CN.properties | 12 +- src/main/webapp/WEB-INF/include/header.jsp | 2 + .../webapp/WEB-INF/views/cfg/requestForm.jsp | 21 +- .../webapp/WEB-INF/views/cfg/requestList.jsp | 27 +-- 15 files changed, 449 insertions(+), 206 deletions(-) create mode 100644 src/main/java/com/nis/domain/configuration/TaskInfo.java create mode 100644 src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java create mode 100644 src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml diff --git a/src/main/java/com/nis/domain/configuration/RequestInfo.java b/src/main/java/com/nis/domain/configuration/RequestInfo.java index 45239f3a1..7bcb0235d 100644 --- a/src/main/java/com/nis/domain/configuration/RequestInfo.java +++ b/src/main/java/com/nis/domain/configuration/RequestInfo.java @@ -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{ + private Long taskId; + private String requestNumber; private String requestOrg; @@ -39,8 +42,18 @@ public class RequestInfo extends BaseEntity{ 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{ public void setTimeType(String timeType) { this.timeType = timeType; } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } } \ No newline at end of file diff --git a/src/main/java/com/nis/domain/configuration/TaskInfo.java b/src/main/java/com/nis/domain/configuration/TaskInfo.java new file mode 100644 index 000000000..efe9a4fc6 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/TaskInfo.java @@ -0,0 +1,131 @@ +package com.nis.domain.configuration; + +import java.util.Date; + +import com.nis.domain.BaseEntity; + +public class TaskInfo extends BaseEntity { + 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; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index a43656ba0..63b86a2d0 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -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 taskInfos = requestInfoService.showTask(taskInfo); + model.addAttribute("taskInfos", taskInfos); + } } diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java index 46b20704b..4ab24fb5e 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java @@ -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 showTask(TaskInfo taskInfo); - int insertSelective(RequestInfo requestInfo); - - RequestInfo selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(RequestInfo requestInfo); - - int updateByPrimaryKey(RequestInfo requestInfo); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 63390a446..f0cb73683 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -16,6 +16,7 @@ + id, request_number, request_org, request_time, request_title, request_content, is_valid, @@ -25,6 +26,7 @@ - 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 - - - AND r.request_title like - CONCAT('%',#{requestTitle}, '%') - - - AND r.request_content like - CONCAT('%',#{requestContent},'%') - - - AND r.request_number=#{requestNumber} - - - AND r.is_audit=${isAudit} - - - AND r.request_time between #{beginDate} and #{endDate} - - - AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate}) - - - order by r.request_time desc - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java new file mode 100644 index 000000000..ca9088a52 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java @@ -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{ +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml new file mode 100644 index 000000000..3720339f1 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + 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 + + + + + + delete from task_info + where id = #{id,jdbcType=BIGINT} + + + 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 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, + + + + + #{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}, + + + + + update task_info + + + 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 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} + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java index 5f8fed8e6..01d98d236 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -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 findRequestInfo(Page page, RequestInfo requestInfo) { // 设置分页参数 @@ -81,4 +85,8 @@ public class RequestInfoService extends BaseService{ RequestInfo requestInfo=new RequestInfo(); return requestInfoDao.findAllList(requestInfo); } + + public List showTask(TaskInfo taskInfo) { + return taskInfoDao.findList(taskInfo); + } } diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml index f1c4d84a7..a3a3ff1ed 100644 --- a/src/main/resources/generatorConfig.xml +++ b/src/main/resources/generatorConfig.xml @@ -5,35 +5,35 @@ "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd"> - + + connectionURL="jdbc:mysql://10.0.6.100:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull" + userId="dfh" password="111111"> - + - + - + -
业务ID 动作 类型创建人创建时间描述 操作
${ssi.serviceName }${ssi.serviceId } + ${ssi.serviceId } 阻断 监测 @@ -134,8 +134,8 @@ function deleteService(id) { ${ssi.serviceDesc } - 修改 - 删除 + +
+ + diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index 918e282d0..e256c9d34 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -7,18 +7,18 @@ -
+
-
+
- +
@@ -47,12 +47,23 @@
-
-
+ @@ -110,6 +112,7 @@ +
: +
+
+
+
: +
+ + + + ${taskInfo.taskName} + + +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 06f66dffb..93310dae3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -8,15 +8,15 @@ -
+

- 来函管理 +

@@ -24,7 +24,7 @@
- +
@@ -35,19 +35,20 @@
: - + - -<%-- --%> + + @@ -79,6 +80,7 @@
${requestInfo.requestTitle } ${requestInfo.requestContent }${requestInfo.taskName }
@@ -117,12 +120,12 @@ -
    • +
  • ', this.href)">
    •  -
    • -
    • -
    • +
  • ', this.href)">
    • +
  • ', this.href)">
    • +
  • ', this.href)">
    •      From 37fad74b72c03612330696eab1d4020211cf7aee Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 5 Mar 2018 17:55:26 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=8E=92=E9=99=A4gson-parent=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index c00d520a3..2f1ece719 100644 --- a/pom.xml +++ b/pom.xml @@ -642,6 +642,12 @@ com.google.code.gson gson 2.8.0 + + + com.google.code.gson + gson-parent + + From 8f767f7f6346a0385fdc35cb4988cd2b00f4c85d Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 5 Mar 2018 18:17:59 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E5=AF=86=E7=A0=81=E6=8F=90=E7=A4=BA=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 3 ++- src/main/resources/messages/message_ru.properties | 3 ++- src/main/resources/messages/message_zh_CN.properties | 2 ++ src/main/webapp/WEB-INF/views/login.jsp | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index b33a28d98..7131aa19a 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -138,5 +138,6 @@ required=This field is required\uff01 select=Please select date_list=Date List confirm_message=Are you sure? - +fill_loginName=Please fill in the loginName +fill_loginPassWord=Please fill in the passWord #==========message end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 659b85104..7169f6d87 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -138,5 +138,6 @@ required=This field is required！ select=Please select date_list=Date List confirm_message=Are you sure? - +fill_loginName=Please fill in the loginName +fill_loginPassWord=Please fill in the passWord #==========message end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 2a817dcb5..fd0eb3da3 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -136,5 +136,7 @@ required=\u4e0d\u80fd\u4e3a\u7a7a! select=--\u8bf7\u9009\u62e9-- date_list=\u6570\u636e\u5217\u8868 confirm_message=\u786e\u5b9a\u5417\uff1f +fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7 +fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801 #==========message end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index a9628796f..ef0916973 100644 --- a/src/main/webapp/WEB-INF/views/login.jsp +++ b/src/main/webapp/WEB-INF/views/login.jsp @@ -47,10 +47,10 @@