diff --git a/src/main/java/com/nis/domain/configuration/RequestInfo.java b/src/main/java/com/nis/domain/configuration/RequestInfo.java new file mode 100644 index 000000000..45239f3a1 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/RequestInfo.java @@ -0,0 +1,195 @@ +package com.nis.domain.configuration; + +import java.util.Date; + +import com.nis.domain.BaseEntity; + +public class RequestInfo extends BaseEntity{ + + private String requestNumber; + + private String requestOrg; + + private Date requestTime; + + private String requestTitle; + + private String requestContent; + + private Integer isValid; + + private Integer isAudit; + + private Integer creatorId; + + private Date createTime; + + private Integer editorId; + + private Date editTime; + + private Integer auditorId; + + private Date auditTime; + + //自定义 创建人员 修改人员 审核人员 + private String creatorName; + private String editorName; + private String auditorName; + private Date beginDate;//开始时间 + private Date endDate;//结束时间 + private String timeType;//时间类型 + + public String getRequestNumber() { + return requestNumber; + } + + public void setRequestNumber(String requestNumber) { + this.requestNumber = requestNumber == null ? null : requestNumber.trim(); + } + + public String getRequestOrg() { + return requestOrg; + } + + public void setRequestOrg(String requestOrg) { + this.requestOrg = requestOrg == null ? null : requestOrg.trim(); + } + + public Date getRequestTime() { + return requestTime; + } + + public void setRequestTime(Date requestTime) { + this.requestTime = requestTime; + } + + public String getRequestTitle() { + return requestTitle; + } + + public void setRequestTitle(String requestTitle) { + this.requestTitle = requestTitle == null ? null : requestTitle.trim(); + } + + public String getRequestContent() { + return requestContent; + } + + public void setRequestContent(String requestContent) { + this.requestContent = requestContent == null ? null : requestContent.trim(); + } + + 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; + } + + 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 getTimeType() { + return timeType; + } + + public void setTimeType(String timeType) { + this.timeType = timeType; + } + +} \ 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 6506f1ba7..bb7f9106b 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -1,9 +1,20 @@ package com.nis.web.controller.configuration; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; +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.RequestInfo; +import com.nis.util.StringUtils; import com.nis.web.controller.BaseController; +import com.nis.web.service.configuration.RequestInfoService; /** * 测试类 @@ -13,18 +24,105 @@ import com.nis.web.controller.BaseController; @RequestMapping("${adminPath}/cfg/request") public class RequestInfoController extends BaseController{ + @Autowired + private RequestInfoService requestInfoService; - @RequestMapping(value = {"list"}) - public String list() { - return "/cfg/requestList"; + + /** + *来函列表 + */ + @RequestMapping(value = {"list",""}) + public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) { + Page page = requestInfoService.findRequestInfo(new Page(request, response), requestInfo); + model.addAttribute("page", page); + return "/cfg/requestList"; } - - - @RequestMapping(value = {"form"}) - public String form() { + /** + * 进入用户添加或修改页面 + */ + @RequestMapping(value={"form"}) + public String form(RequestInfo requestInfo, Model model) { + if(StringUtils.isNotEmpty(requestInfo.getRequestNumber())){ + requestInfo = requestInfoService.getRequestInfoByRequestNumber(requestInfo.getRequestNumber()); + model.addAttribute("requestInfo", requestInfo); + } + model.addAttribute("requestInfo", requestInfo); return "/cfg/requestForm"; } + + /** + * 新增/修改 + */ + @RequestMapping(value = "saveOrUpdate") + public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) { + try { + if(requestInfo.getId()!=null){ + // 保存用户信息 + requestInfoService.saveOrUpdate(requestInfo); + addMessage(redirectAttributes, "success"); + }else{ + if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ + addMessage(model, "error"); + return form(requestInfo, model); + } + // 保存用户信息 + requestInfoService.saveOrUpdate(requestInfo); + addMessage(redirectAttributes, "success"); + } + } catch (Exception e) { + e.printStackTrace(); + addMessage(model, "error"); + } + return "redirect:" + adminPath + "/cfg/request/list?repage"; + } - + /** + * 验证是否有效 + */ + @ResponseBody + @RequestMapping(value = "checkRequestNumber") + public String checkRequestNumber(String requestNumber) { + if (requestNumber !=null && requestInfoService.getRequestInfoByRequestNumber(requestNumber) == null) { + return "true"; + } + return "false"; + } + + /** + * 审核 + * @param requestInfo + * @param model + * @return + */ + @RequestMapping(value = "requestExamine") + public String requestExamine(RequestInfo requestInfo, Model model){ + requestInfoService.requestExamine(requestInfo); + return "redirect:" + adminPath + "/cfg/request/list?repage"; + + } + /** + * 取消审核 + * @param requestInfo + * @param model + * @return + */ + @RequestMapping(value = "requestCancelExamine") + public String requestCancelExamine(RequestInfo requestInfo, Model model){ + requestInfoService.requestCancelExamine(requestInfo); + return "redirect:" + adminPath + "/cfg/request/list?repage"; + + } + /** + * 删除 + * @param requestInfo + * @param model + * @return + */ + @RequestMapping(value = "delete") + public String delete(RequestInfo requestInfo, Model model){ + requestInfoService.delete(requestInfo); + return "redirect:" + adminPath + "/cfg/request/list?repage"; + + } } diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java new file mode 100644 index 000000000..eec37e91e --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java @@ -0,0 +1,34 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.RequestInfo; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface RequestInfoDao extends CrudDao { + + List findRequestInfo(RequestInfo requestInfo); + + RequestInfo getRequestInfoByRequestNumber(@Param("requestNumber") String requestNumber); + + RequestInfo getRequestInfoById(@Param("id") Long id); + + int deleteByPrimaryKey(Long id); + + + 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 new file mode 100644 index 000000000..bc6b47ee4 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + id, request_number, request_org, request_time, request_title, request_content, is_valid, + is_audit, creator_id, create_time, editor_id, edit_time, auditor_id, audit_time + + + + + + + + + + insert into request_info ( + request_number, + request_org, + request_time, + request_title, + request_content, + is_valid, + is_audit, + creator_id, + create_time, + editor_id, + edit_time, + auditor_id, + audit_time + ) + 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}) + + + + 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}, + + + 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 request_info + + + is_valid=#{isValid} + + + where id = #{id,jdbcType=BIGINT} and is_audit !=1 + + + + + + insert into request_info + + + id, + + + request_number, + + + request_org, + + + request_time, + + + request_title, + + + request_content, + + + is_valid, + + + is_audit, + + + creator_id, + + + create_time, + + + editor_id, + + + edit_time, + + + auditor_id, + + + audit_time, + + + + + #{id,jdbcType=BIGINT}, + + + #{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}, + + + + + + 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} + + \ 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 new file mode 100644 index 000000000..7c98ec5c2 --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -0,0 +1,72 @@ +package com.nis.web.service.configuration; + +import java.util.Date; + +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.RequestInfo; +import com.nis.util.StringUtil; +import com.nis.web.dao.configuration.RequestInfoDao; +import com.nis.web.security.UserUtils; +import com.nis.web.service.BaseService; + +@Service +@Transactional(readOnly=true) +public class RequestInfoService extends BaseService{ + + @Autowired + private RequestInfoDao requestInfoDao; + + public Page findRequestInfo(Page page, RequestInfo requestInfo) { + // 设置分页参数 + requestInfo.setPage(page); + // 执行分页查询 + page.setList(requestInfoDao.findRequestInfo(requestInfo)); + return page; + } + + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void saveOrUpdate(RequestInfo requestInfo) { + if (StringUtil.isEmpty(requestInfo.getId())) { + //设置默认参数值 + requestInfo.setIsValid(1);//有效 + requestInfo.setIsAudit(0);//未审核 + requestInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员 + requestInfo.setCreateTime(new Date());//创建时间 + requestInfoDao.insert(requestInfo); + }else{ + requestInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员 + requestInfo.setEditTime(new Date());//修改时间 + requestInfoDao.update(requestInfo); + } + + } + + public RequestInfo getRequestInfoByRequestNumber(String requestNumber) { + + return requestInfoDao.getRequestInfoByRequestNumber(requestNumber); + } + public RequestInfo getRequestInfoById(Long id) { + + return requestInfoDao.getRequestInfoById(id); + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void requestExamine(RequestInfo requestInfo){ + requestInfo.setIsAudit(1);//审核通过 + requestInfoDao.update(requestInfo); + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void requestCancelExamine(RequestInfo requestInfo){ + requestInfo.setIsAudit(3);//取消审核通过 + int update = requestInfoDao.update(requestInfo); + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void delete(RequestInfo requestInfo){ + requestInfo.setIsValid(-1); + requestInfoDao.delete(requestInfo);//删除 + } +} diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index a3f23d0f7..3e0e43dfc 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -124,4 +124,10 @@ operator=operator content=content remarks=remarks update_request=update request +operation=operation +submit=submit +cancel=cancel +begin_date=begin date +end_date=end date +delete=delete #============laihan 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 a3f23d0f7..3e0e43dfc 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -124,4 +124,10 @@ operator=operator content=content remarks=remarks update_request=update request +operation=operation +submit=submit +cancel=cancel +begin_date=begin date +end_date=end date +delete=delete #============laihan 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 9c045a997..5f358cc63 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -123,5 +123,10 @@ operator=\u64CD\u4F5C\u5458 content=\u5185\u5BB9 remarks=\u5907\u6CE8 update_request=\u4FEE\u6539\u6765\u51FD - +operation=\u64CD\u4F5C +submit=\u63D0\u4EA4 +cancel=\u53D6\u6D88 +begin_date=\u5F00\u59CB\u65F6\u95F4 +end_date=\u7ED3\u675F\u65F6\u95F4 +delete=\u5220\u9664 #==========yewu zidian end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index 78ccaa2f3..a58efe05c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -29,62 +29,65 @@
-
+ + +
- +
- +
- +
- +
- +
- + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
- +
- +
-
+ +
- +
- +
- - + +
- +
@@ -92,5 +95,15 @@
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 2293c09a3..8685b995b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -5,14 +5,15 @@ 来函信息 +

@@ -24,7 +25,7 @@
- 来函函号 +
- + + +
- - 状态: + + -       +     + +   + + :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - -
- +
+ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +
序号来函函号来函单位来函时间状态任务操作员操作时间标题内容备注
120181720函号来函单位 - 2018-01-06 21:57:03 通过 - 七五专项Admin2018-01-06 21:57:03标题testtest
220181720函号来函单位 - 2018-01-06 21:57:03 通过 - 七五专项Admin2018-01-06 21:57:03标题testtest
320181720函号来函单位 - 2018-01-06 21:57:03 通过 - 七五专项Admin2018-01-06 21:57:03标题testtest
420181720函号来函单位 - 2018-01-06 21:57:03 通过 - 七五专项Admin2018-01-06 21:57:03标题testtest
520181720函号来函单位 - 2018-01-06 21:57:03 通过 - 七五专项Admin2018-01-06 21:57:03标题testtest${requestInfo.id }${requestInfo.requestNumber }${requestInfo.requestOrg } + + + + + + ${requestInfo.creatorName } + + + + + + + + + + ${requestInfo.requestTitle }${requestInfo.requestContent } +
+ +
    + + + +
    • +     + +
    • +
    • +
    • +     +     +
+
+
+
${page}
+

+ + + + \ No newline at end of file