diff --git a/src/main/java/com/nis/domain/configuration/TaskInfo.java b/src/main/java/com/nis/domain/configuration/TaskInfo.java index efe9a4fc6..96c8ac3b6 100644 --- a/src/main/java/com/nis/domain/configuration/TaskInfo.java +++ b/src/main/java/com/nis/domain/configuration/TaskInfo.java @@ -30,6 +30,16 @@ public class TaskInfo extends BaseEntity { private Integer auditorId; private Date auditTime; + + //自定义 创建人员 修改人员 审核人员 + private String creatorName; + private String editorName; + private String auditorName; + private Date beginDate;//来函开始时间 + private Date endDate;//来函结束时间 + private String seltype;//选中类型 + private Date dobeginDate;//操作开始时间 + private Date doendDate;//操作结束时间 public String getTaskName() { return taskName; @@ -127,5 +137,69 @@ public class TaskInfo extends BaseEntity { this.auditTime = auditTime; } + public String getCreatorName() { + return creatorName; + } + + public void setCreatorName(String creatorName) { + this.creatorName = creatorName; + } + + public String getEditorName() { + return editorName; + } + + public void setEditorName(String editorName) { + this.editorName = editorName; + } + + public String getAuditorName() { + return auditorName; + } + + public void setAuditorName(String auditorName) { + this.auditorName = auditorName; + } + + public Date getBeginDate() { + return beginDate; + } + + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public String getSeltype() { + return seltype; + } + + public void setSeltype(String seltype) { + this.seltype = seltype; + } + + public Date getDobeginDate() { + return dobeginDate; + } + + public void setDobeginDate(Date dobeginDate) { + this.dobeginDate = dobeginDate; + } + + public Date getDoendDate() { + return doendDate; + } + + public void setDoendDate(Date doendDate) { + this.doendDate = doendDate; + } + } \ No newline at end of file diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java new file mode 100644 index 000000000..0837f8185 --- /dev/null +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -0,0 +1,150 @@ +package com.nis.web.controller.basics; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.nis.domain.Page; +import com.nis.domain.configuration.TaskInfo; +import com.nis.web.controller.BaseController; +import com.nis.web.service.basics.TaskInfoService; + +@Controller +@RequestMapping("${adminPath}/basics/taskInfo") +public class TaskInfoController extends BaseController{ + + @Autowired + private TaskInfoService taskInfoService; + + + /** + *来函列表 + */ + @RequestMapping(value = {"list",""}) + public String list(TaskInfo taskInfo, HttpServletRequest request, HttpServletResponse response, Model model) { + Page page = taskInfoService.findTaskInfo(new Page(request, response), taskInfo); + model.addAttribute("page", page); + return "/basics/taskInfoList"; + } + /** + * 进入用户添加或修改页面 + */ + @RequestMapping(value={"form"}) + public String form(TaskInfo taskInfo, Model model) { + if(taskInfo.getId()!=null){ + taskInfo = taskInfoService.getTaskInfoById(taskInfo.getId()); + model.addAttribute("taskInfo", taskInfo); + }else{ + model.addAttribute("taskInfo", taskInfo); + } + return "/basics/taskInfoForm"; + } + + /** + * 新增/修改 + */ + @RequestMapping(value = "saveOrUpdate") + public String saveOrUpdate(TaskInfo taskInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) { + try { + if(taskInfo.getId()!=null){ + // 保存用户信息 + logger.info(taskInfo.getId()+"修改成功"); + taskInfoService.saveOrUpdate(taskInfo); + addMessage(redirectAttributes, "success"); + }else{ + if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){ + logger.info(taskInfo.getTaskName()+"重复数据"); + addMessage(model, "error"); + return form(taskInfo, model); + } + // 保存用户信息 + taskInfoService.saveOrUpdate(taskInfo); + addMessage(redirectAttributes, "success"); + logger.info(taskInfo.getId()+"保存成功"); + } + } catch (Exception e) { + logger.error(e.getMessage()); + e.printStackTrace(); + addMessage(model, "error"); + } + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + } + + /** + * 验证是否有效 + */ + @ResponseBody + @RequestMapping(value = "checkTaskName") + public String checkTaskName(String taskName) { + if (taskName !=null && taskInfoService.getTaskInfoByTaskName(taskName) == null) { + return "true"; + } + return "false"; + } + + /** + * 审核通过 + * @param taskInfo + * @param model + * @return + */ + @RequestMapping(value = "taskExamine") + public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] exId = ids.split(","); + taskInfoService.taskExamine(exId); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + + } + /** + * 审核未通过 + * @param taskInfo + * @param model + * @return + */ + @RequestMapping(value = "taskExamineNo") + public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] noId = ids.split(","); + taskInfoService.taskExamineNo(noId); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + + } + /** + * 取消审核 + * @param taskInfo + * @param model + * @return + */ + @RequestMapping(value = "taskCancelExamine") + public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] canclelId = ids.split(","); + taskInfoService.taskCancelExamine(canclelId); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + + } + /** + * 删除 + * @param taskInfo + * @param model + * @return + */ + @RequestMapping(value = "delete") + public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] delId = ids.split(","); + taskInfoService.delete(delId); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + + } + +} diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java index ca9088a52..a1de06a46 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java @@ -1,8 +1,20 @@ package com.nis.web.dao.configuration; +import java.util.List; + +import org.apache.ibatis.annotations.Param; + import com.nis.domain.configuration.TaskInfo; import com.nis.web.dao.CrudDao; import com.nis.web.dao.MyBatisDao; @MyBatisDao public interface TaskInfoDao extends CrudDao{ + List findTaskInfo(TaskInfo requestInfo); + + TaskInfo getTaskInfoByTaskName(@Param("taskName") String taskName); + + TaskInfo getTaskInfoById(@Param("id") Long id); + + void delete(@Param("id") Long id); + } \ 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 index 3720339f1..3e373d774 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -30,10 +30,55 @@ - - delete from task_info + + + + + + insert into task_info (id, task_name, task_org, task_time, task_desc, is_valid, @@ -46,92 +91,8 @@ #{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 @@ -173,20 +134,14 @@ 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} + + + update task_info + + + is_valid=-1 + + + where id = #{id,jdbcType=BIGINT} and is_audit !=1 \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/basics/TaskInfoService.java b/src/main/java/com/nis/web/service/basics/TaskInfoService.java new file mode 100644 index 000000000..e4ebe5fb0 --- /dev/null +++ b/src/main/java/com/nis/web/service/basics/TaskInfoService.java @@ -0,0 +1,99 @@ +package com.nis.web.service.basics; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.nis.domain.Page; +import com.nis.domain.configuration.TaskInfo; +import com.nis.util.Constants; +import com.nis.util.StringUtil; +import com.nis.web.dao.configuration.TaskInfoDao; +import com.nis.web.security.UserUtils; +import com.nis.web.service.BaseService; + +@Service +@Transactional(readOnly=true) +public class TaskInfoService extends BaseService{ + + @Autowired + private TaskInfoDao taskInfoDao; + + public Page findTaskInfo(Page page, TaskInfo taskInfo) { + // 设置分页参数 + taskInfo.setPage(page); + // 执行分页查询 + page.setList(taskInfoDao.findTaskInfo(taskInfo)); + return page; + } + + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void saveOrUpdate(TaskInfo taskInfo) { + if (StringUtil.isEmpty(taskInfo.getId())) { + //设置默认参数值 + taskInfo.setIsValid(1);//有效 + taskInfo.setIsAudit(0);//未审核 + taskInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员 + taskInfo.setCreateTime(new Date());//创建时间 + taskInfoDao.insert(taskInfo); + }else{ + taskInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员 + taskInfo.setEditTime(new Date());//修改时间 + taskInfoDao.update(taskInfo); + } + + } + + public TaskInfo getTaskInfoByTaskName(String taskName) { + + return taskInfoDao.getTaskInfoByTaskName(taskName); + } + public TaskInfo getTaskInfoById(Long id) { + + return taskInfoDao.getTaskInfoById(id); + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void taskExamine(String[] exId){ + TaskInfo taskInfo = new TaskInfo(); + for (int i = 0; i < exId.length; i++) { + taskInfo.setId(Long.valueOf(exId[i])); + taskInfo.setIsAudit(1);//审核通过 + taskInfo.setAuditTime(new Date()); + taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + taskInfoDao.update(taskInfo); + } + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void taskExamineNo(String[] noId){ + TaskInfo taskInfo = new TaskInfo(); + for (int i = 0; i < noId.length; i++) { + taskInfo.setId(Long.valueOf(noId[i])); + taskInfo.setIsAudit(2);//审核未通过 + taskInfo.setAuditTime(new Date()); + taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + taskInfoDao.update(taskInfo); + } + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void taskCancelExamine(String[] cancelId){ + TaskInfo taskInfo = new TaskInfo(); + for (int i = 0; i < cancelId.length; i++) { + taskInfo.setId(Long.valueOf(cancelId[i])); + taskInfo.setIsAudit(3);//取消审核通过 + taskInfo.setAuditTime(new Date()); + taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + taskInfoDao.update(taskInfo); + } + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void delete(String[] delId){ + for (int i = 0; i < delId.length; i++) { + taskInfoDao.delete(Long.valueOf(delId[i]));//删除 + } + } +} 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 3f5f04fe8..f74bc07c5 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,8 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < exId.length; i++) { requestInfo.setId(Long.valueOf(exId[i])); requestInfo.setIsAudit(1);//审核通过 + requestInfo.setAuditTime(new Date()); + requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); } } @@ -76,6 +78,8 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < noId.length; i++) { requestInfo.setId(Long.valueOf(noId[i])); requestInfo.setIsAudit(2);//审核未通过 + requestInfo.setAuditTime(new Date()); + requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); } } @@ -85,6 +89,8 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < cancelId.length; i++) { requestInfo.setId(Long.valueOf(cancelId[i])); requestInfo.setIsAudit(3);//取消审核通过 + requestInfo.setAuditTime(new Date()); + requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 8b28fd14e..98734ff32 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -138,6 +138,9 @@ end_date=end date delete=delete special_task=special task cancel_approved=cancel approved +task_name=task name +task_org=task organization +task_time=task time #============laihan end====================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 5a883fd32..953f0d23f 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -138,6 +138,9 @@ end_date=\u7ed3\u675f\u65f6\u95f4 delete=\u5220\u9664 special_task=\u4e13\u9879\u4efb\u52a1 cancel_approved=\u914d\u7f6e\u53d6\u6d88 +task_name=\u4e13\u9879\u540d\u79f0 +task_org=\u62a5\u9001\u5355\u4f4d +task_time=\u62a5\u9001\u65f6\u95f4 #==========laihan end===================== #==========message begin===================== diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp new file mode 100644 index 000000000..800670b2d --- /dev/null +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp @@ -0,0 +1,113 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +专项任务 + + + + +
+
+
+
+
+
+
+
+ +
+ + + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+
+ + +
+ +
+
+
+
+ + + + \ 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 new file mode 100644 index 000000000..df9a34953 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -0,0 +1,267 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +专项任务 + + + + + +
+ + +

+ + +

+ +
+
+
+
+ +
+ +
+ + + + + + + + +
+ +
+ + + + + +
+ +
+
+
+ type="text" value="${taskInfo.taskName }"> +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ + + + +
+ +
    +
    • +
    • +
    • +
+
+
+ + +
+ + + +
+
+ +
+
+ +
+
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+
+ +
+
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+ +
+ +
+
+ +
+
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+
+ +
+
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+
+
+ +
+
+ +
+ + +
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${taskInfo.id }${taskInfo.taskName }${taskInfo.taskOrg } + + + + + + ${taskInfo.creatorName } + + + + + + + + + +
+
${page}
+
+
+
+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 5468db2f2..0c06ec979 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -57,7 +57,7 @@ - type="text" value=""> +
@@ -180,7 +180,7 @@ - +<%-- --%> @@ -213,8 +213,6 @@ ${requestInfo.requestTitle } ${requestInfo.requestContent } ${requestInfo.taskName } - - @@ -229,7 +227,6 @@