diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java index 0837f8185..6b30fd483 100644 --- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -58,22 +58,22 @@ public class TaskInfoController extends BaseController{ // 保存用户信息 logger.info(taskInfo.getId()+"修改成功"); taskInfoService.saveOrUpdate(taskInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); }else{ if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){ logger.info(taskInfo.getTaskName()+"重复数据"); - addMessage(model, "error"); + addMessage(model, "save_failed"); return form(taskInfo, model); } // 保存用户信息 taskInfoService.saveOrUpdate(taskInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); logger.info(taskInfo.getId()+"保存成功"); } } catch (Exception e) { logger.error(e.getMessage()); e.printStackTrace(); - addMessage(model, "error"); + addMessage(model, "save_failed"); } return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -100,7 +100,7 @@ public class TaskInfoController extends BaseController{ public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] exId = ids.split(","); taskInfoService.taskExamine(exId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -114,7 +114,7 @@ public class TaskInfoController extends BaseController{ public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ String[] noId = ids.split(","); taskInfoService.taskExamineNo(noId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -128,7 +128,7 @@ public class TaskInfoController extends BaseController{ public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] canclelId = ids.split(","); taskInfoService.taskCancelExamine(canclelId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -142,7 +142,7 @@ public class TaskInfoController extends BaseController{ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ String[] delId = ids.split(","); taskInfoService.delete(delId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "delete_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index 85d816c50..b0d980bfc 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -186,8 +186,8 @@ public class ComplexStringCfgController extends BaseController{ }else if(!StringUtils.isBlank(cfg.getTableName())){ int serviceId=cfg.getServiceId(); long compileId=getCompileId(cfg); - cfg.setCreatorId(cfg.getCurrentUser().getId()); - cfg.setCreateTime(new Date()); +// cfg.setCreatorId(cfg.getCurrentUser().getId()); +// cfg.setCreateTime(new Date()); cfg.setIsValid(Constants.VALID_NO); cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setCompileId(compileId); @@ -211,8 +211,8 @@ public class ComplexStringCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ long compileId=getCompileId(cfg); cfg.setTableName(tableName); - cfg.setCreatorId(cfg.getCurrentUser().getId()); - cfg.setCreateTime(new Date()); +// cfg.setCreatorId(cfg.getCurrentUser().getId()); +// cfg.setCreateTime(new Date()); cfg.setIsValid(Constants.VALID_NO); cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setCompileId(compileId); diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 4ff3d08be..7747fa609 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -262,8 +262,8 @@ public class IpCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ long compileId=getCompileId(); ipCfg.setTableName(tableName); - ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); - ipCfg.setCreateTime(new Date()); +// ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); +// ipCfg.setCreateTime(new Date()); ipCfg.setIsValid(Constants.VALID_NO); ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.setCompileId(compileId); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 5aa2a68fb..f064d3d71 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -144,8 +144,8 @@ public class NumCfgController extends BaseController{ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ long compileId=getCompileId(cfg); - cfg.setCreatorId(cfg.getCurrentUser().getId()); - cfg.setCreateTime(new Date()); +// cfg.setCreatorId(cfg.getCurrentUser().getId()); +// cfg.setCreateTime(new Date()); cfg.setIsValid(Constants.VALID_NO); cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setCompileId(compileId); 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 84883214d..c20c7c975 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -62,22 +62,22 @@ public class RequestInfoController extends BaseController{ // 保存用户信息 logger.info(requestInfo.getId()+"修改成功"); requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); }else{ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ logger.info(requestInfo.getRequestNumber()+"重复数据"); - addMessage(model, "error"); + addMessage(model, "save_failed"); return form(requestInfo, model); } // 保存用户信息 requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); logger.info(requestInfo.getId()+"保存成功"); } } catch (Exception e) { logger.error(e.getMessage()); e.printStackTrace(); - addMessage(model, "error"); + addMessage(model, "save_failed"); } return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -104,7 +104,7 @@ public class RequestInfoController extends BaseController{ public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] exId = ids.split(","); requestInfoService.requestExamine(exId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -118,7 +118,7 @@ public class RequestInfoController extends BaseController{ public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ String[] noId = ids.split(","); requestInfoService.requestExamineNo(noId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -132,7 +132,7 @@ public class RequestInfoController extends BaseController{ public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] canclelId = ids.split(","); requestInfoService.requestCancelExamine(canclelId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -146,7 +146,7 @@ public class RequestInfoController extends BaseController{ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ String[] delId = ids.split(","); requestInfoService.delete(delId); - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "delete_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index 2430efdc8..c1da0c564 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -186,8 +186,8 @@ public class StringCfgController extends BaseController{ }else if(!StringUtils.isBlank(stringCfg.getTableName())){ int serviceId=stringCfg.getServiceId(); long compileId=getCompileId(stringCfg); - stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); - stringCfg.setCreateTime(new Date()); +// stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); +// stringCfg.setCreateTime(new Date()); stringCfg.setIsValid(Constants.VALID_NO); stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); stringCfg.setCompileId(compileId); @@ -211,8 +211,8 @@ public class StringCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ long compileId=getCompileId(stringCfg); stringCfg.setTableName(tableName); - stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); - stringCfg.setCreateTime(new Date()); +// stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); +// stringCfg.setCreateTime(new Date()); stringCfg.setIsValid(Constants.VALID_NO); stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); stringCfg.setCompileId(compileId); diff --git a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml index f32932669..d59d28801 100644 --- a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml @@ -22,7 +22,7 @@ - + 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 aa64cb5cb..71979abec 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -39,6 +39,7 @@ u.name AS editorName, r.edit_time AS editTime, e.name AS currentName, + e.name AS auditorName, r.audit_time AS auditTime, t.task_name AS taskName from request_info r @@ -65,8 +66,8 @@ AND r.request_time between #{beginDate} and #{endDate} - AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate}) - + AND r.edit_time between #{dobeginDate} and #{doendDate} + order by r.request_time desc @@ -78,10 +79,31 @@ @@ -98,31 +120,32 @@ editor_id, edit_time, auditor_id, - audit_time + audit_time, + task_id ) values (#{requestNumber,jdbcType=VARCHAR}, #{requestOrg,jdbcType=VARCHAR}, #{requestTime,jdbcType=DATE}, #{requestTitle,jdbcType=VARCHAR}, #{requestContent,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}) + #{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE}, #{taskId,jdbcType=BIGINT}) update request_info - + 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}, @@ -149,6 +172,9 @@ audit_time = #{auditTime,jdbcType=DATE}, + + task_id = #{taskId}, + where id = #{id,jdbcType=BIGINT} diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index f9fc17fe4..a818ea17d 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -22,7 +22,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index 3e373d774..683e8561a 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -24,9 +24,10 @@ @@ -43,7 +44,7 @@ r.create_time AS createTime, u.name AS editorName, r.edit_time AS editTime, - e.name AS currentName, + e.name AS auditorName, r.audit_time AS auditTime from task_info r left join sys_user s on r.creator_id=s.id @@ -61,7 +62,7 @@ AND r.task_time between #{beginDate} and #{endDate} - AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate}) + AND r.edit_time between #{dobeginDate} and #{doendDate} order by r.task_time desc diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java index 6d84a74b5..8b86b0a79 100644 --- a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java +++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java @@ -1,5 +1,7 @@ package com.nis.web.dao.systemService; +import java.util.List; + import org.apache.ibatis.annotations.Param; import com.nis.domain.ServiceConfigInfo; @@ -8,4 +10,5 @@ import com.nis.web.dao.MyBatisDao; @MyBatisDao public interface ServiceConfigInfoDao extends CrudDao{ public ServiceConfigInfo findSysServiceConfigInfo(@Param("service_id")int serviceId); + public List findList(@Param("service_id")int serviceId); } diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml index eaebed82d..52b8d4137 100644 --- a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml +++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml @@ -26,6 +26,20 @@ where service_id=#{service_id} and is_valid=1 + insert into service_config_info ( diff --git a/src/main/java/com/nis/web/service/basics/TaskInfoService.java b/src/main/java/com/nis/web/service/basics/TaskInfoService.java index e4ebe5fb0..bf5cc2b99 100644 --- a/src/main/java/com/nis/web/service/basics/TaskInfoService.java +++ b/src/main/java/com/nis/web/service/basics/TaskInfoService.java @@ -63,6 +63,7 @@ public class TaskInfoService extends BaseService{ for (int i = 0; i < exId.length; i++) { taskInfo.setId(Long.valueOf(exId[i])); taskInfo.setIsAudit(1);//审核通过 + taskInfo.setIsValid(1);//审核通过 taskInfo.setAuditTime(new Date()); taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 taskInfoDao.update(taskInfo); @@ -85,6 +86,7 @@ public class TaskInfoService extends BaseService{ for (int i = 0; i < cancelId.length; i++) { taskInfo.setId(Long.valueOf(cancelId[i])); taskInfo.setIsAudit(3);//取消审核通过 + taskInfo.setIsValid(0); taskInfo.setAuditTime(new Date()); taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 taskInfoDao.update(taskInfo); 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 f74bc07c5..abeb0c464 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -67,6 +67,7 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < exId.length; i++) { requestInfo.setId(Long.valueOf(exId[i])); requestInfo.setIsAudit(1);//审核通过 + requestInfo.setIsValid(1);//审核通过有效 requestInfo.setAuditTime(new Date()); requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); @@ -89,6 +90,7 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < cancelId.length; i++) { requestInfo.setId(Long.valueOf(cancelId[i])); requestInfo.setIsAudit(3);//取消审核通过 + requestInfo.setIsValid(0);//取消审核通过无效 requestInfo.setAuditTime(new Date()); requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); diff --git a/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java b/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java index 58611bf69..a40c7728c 100644 --- a/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java +++ b/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java @@ -1,5 +1,7 @@ package com.nis.web.service.systemService; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,4 +15,7 @@ public class ServiceConfigInfoService { public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){ return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId); } + public List findList(int serviceId){ + return serviceConfigInfoDao.findList(serviceId); + } } diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag index 29af115b5..3e6d03cb1 100644 --- a/src/main/webapp/WEB-INF/tags/sys/message.tag +++ b/src/main/webapp/WEB-INF/tags/sys/message.tag @@ -5,6 +5,6 @@ -
${content}
- +
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index df9a34953..ccd49bb4d 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -82,6 +82,10 @@
    • + href="javascript:;"> + + @@ -112,7 +116,7 @@
    - +
    - - + + + + + + @@ -176,17 +184,11 @@ ${taskInfo.creatorName } - - - - - - - - - - - + + ${taskInfo.editorName } + + ${taskInfo.auditorName } + diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index e256c9d34..aebed9bba 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -81,16 +81,6 @@
    -