个人意见模板调整

src/main/java/com/jeeplus/modules/identification/dao/PersonAuditTemplateDao.java

@@ -0,0 +1,19 @@
+package com.jeeplus.modules.identification.dao;
+
+import com.jeeplus.common.persistence.CrudDao;
+import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.identification.entity.PersonAuditTemplate;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@MyBatisDao
+public interface PersonAuditTemplateDao extends CrudDao<PersonAuditTemplate> {
+    List<PersonAuditTemplate> getIdentificationFirst();
+    //根据value获取模板信息
+    PersonAuditTemplate getByValue(@Param("value")String value);
+    //根据父级id获取模板集合
+    List<PersonAuditTemplate> getByParentId(@Param("id") String id,@Param("level") String level);
+    //根据id获取模板信息
+    PersonAuditTemplate getById(String s);
+}

src/main/java/com/jeeplus/modules/identification/entity/AuditTemplate.java

@@ -9,6 +9,33 @@ public class AuditTemplate extends DataEntity<AuditTemplate> {
     private String content; //模板内容
     private String name; //模板标识名称
     private String officeId; //部门id
+    private String identificationFirst;     //一级模板标识
+    private String identificationSecond;     //二级模板标识
+    private String identificationThird;     //三级模板标识
+
+    public String getIdentificationFirst() {
+        return identificationFirst;
+    }
+
+    public void setIdentificationFirst(String identificationFirst) {
+        this.identificationFirst = identificationFirst;
+    }
+
+    public String getIdentificationSecond() {
+        return identificationSecond;
+    }
+
+    public void setIdentificationSecond(String identificationSecond) {
+        this.identificationSecond = identificationSecond;
+    }
+
+    public String getIdentificationThird() {
+        return identificationThird;
+    }
+
+    public void setIdentificationThird(String identificationThird) {
+        this.identificationThird = identificationThird;
+    }
 
     public String getIdentification() {
         return identification;

src/main/java/com/jeeplus/modules/identification/entity/PersonAuditTemplate.java

@@ -0,0 +1,63 @@
+package com.jeeplus.modules.identification.entity;
+
+/**
+ * 个人意见模板类型
+ */
+public class PersonAuditTemplate {
+
+    private String id;
+    private String parentId;    //父级id
+    private String parentIds;   //父级id集合
+    private String value;       //默认值
+    private String label;       //显示值
+    private String level;       //层级
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getParentIds() {
+        return parentIds;
+    }
+
+    public void setParentIds(String parentIds) {
+        this.parentIds = parentIds;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+}

src/main/java/com/jeeplus/modules/identification/service/PersonOpinionService.java

@@ -3,16 +3,21 @@ package com.jeeplus.modules.identification.service;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.MenuStatusEnum;
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.identification.dao.AuditTemplateDao;
+import com.jeeplus.modules.identification.dao.PersonAuditTemplateDao;
 import com.jeeplus.modules.identification.dao.PersonOpinionDao;
 import com.jeeplus.modules.identification.entity.AuditTemplate;
+import com.jeeplus.modules.identification.entity.PersonAuditTemplate;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional(readOnly = true)
@@ -21,6 +26,9 @@ public class PersonOpinionService extends CrudService<PersonOpinionDao, AuditTem
     @Autowired
     private PersonOpinionDao personOpinionDao;
 
+    @Autowired
+    private PersonAuditTemplateDao personAuditTemplateDao;
+
 
     /**
      * 查询列表
@@ -36,6 +44,13 @@ public class PersonOpinionService extends CrudService<PersonOpinionDao, AuditTem
 //            auditTemplate.getSqlMap().put("dsf", dataScopeFilter(auditTemplate.getCurrentUser(), "o", "u", "s", MenuStatusEnum.PERSON_OPINION.getValue()));
             auditTemplate.setCreateBy(UserUtils.getUser());
         }
+        //查询模板类型 从前端传过来的模板类型查询进行重新赋值
+        if (StringUtils.isNotBlank(auditTemplate.getIdentificationSecond())){
+            auditTemplate.setIdentification(auditTemplate.getIdentificationSecond());
+        }
+        if (StringUtils.isNotBlank(auditTemplate.getIdentificationThird())){
+            auditTemplate.setIdentification(auditTemplate.getIdentificationThird());
+        }
         int count = dao.queryCount(auditTemplate);
         page.setCount(count);
         page.setCountFlag(false);
@@ -54,4 +69,48 @@ public class PersonOpinionService extends CrudService<PersonOpinionDao, AuditTem
         return personOpinionDao.delete(auditTemplate);
     }
 
+    /**
+     * 获取一级审核类型
+     * @return
+     */
+    public List<PersonAuditTemplate> getIdentificationFirst() {
+        List<PersonAuditTemplate> list = personAuditTemplateDao.getIdentificationFirst();
+        return list;
+    }
+
+    /**
+     * 获取二级审核类型
+     * @param value
+     * @return
+     */
+    public List<PersonAuditTemplate> getSortMessage(String value) {
+        //根据value获取id
+        PersonAuditTemplate personAuditTemplate=personAuditTemplateDao.getByValue(value);
+        //判断获取到的层级为一级还是二级
+        String level = "";
+        List<PersonAuditTemplate> list = null;
+        if (personAuditTemplate.getLevel().equals("1")){
+            level = "2";
+            //然后根据id获取二级审核类型
+            list = personAuditTemplateDao.getByParentId(personAuditTemplate.getId(),level);
+        }
+        if (personAuditTemplate.getLevel().equals("2")){
+            level = "3";
+            //然后根据id获取三级审核类型
+            list = personAuditTemplateDao.getByParentId(personAuditTemplate.getId(),level);
+        }
+        return list;
+
+
+    }
+
+    //根据value获取模板单条类型
+    public PersonAuditTemplate getTemplate(String identification) {
+        return personAuditTemplateDao.getByValue(identification);
+    }
+
+    //根据id获取模板类型
+    public PersonAuditTemplate getById(String id) {
+        return personAuditTemplateDao.getById(id);
+    }
 }

src/main/java/com/jeeplus/modules/identification/web/PersonOpinionController.java

@@ -5,7 +5,9 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.identification.entity.AuditTemplate;
+import com.jeeplus.modules.identification.entity.PersonAuditTemplate;
 import com.jeeplus.modules.identification.service.PersonOpinionService;
+import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping(value = "${adminPath}/personOpinion/personOpinion")
@@ -44,9 +48,33 @@ public class PersonOpinionController extends BaseController {
      */
     @RequestMapping(value = {"list",""})
     public String list(AuditTemplate auditTemplate, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //进行查询之后进行任何操作，返回还是查询之后的数据页面
+        if (StringUtils.isNotBlank(auditTemplate.getToflag())){
+            request.getSession().removeAttribute("searchAuditTemplate");
+            AuditTemplate search=auditTemplate;
+            request.getSession().setAttribute("searchAuditTemplate",search);
+        }else{
+            if (request.getSession().getAttribute("searchAuditTemplate")!=null){
+                auditTemplate= (AuditTemplate) request.getSession().getAttribute("searchAuditTemplate");
+                model.addAttribute("searchAuditTemplate", auditTemplate);
+            }
+        }
         Page<AuditTemplate> page=personOpinionService.findPage(new Page<AuditTemplate>(request, response),auditTemplate);
         model.addAttribute("page",page);
         model.addAttribute("auditTemplate",auditTemplate);
+        //获取一级审核类型
+        List<PersonAuditTemplate> list=personOpinionService.getIdentificationFirst();
+        model.addAttribute("identificationFirstList",list);
+        //获取二级审核类型集合
+        if (StringUtils.isNotBlank(auditTemplate.getIdentificationFirst())){
+            List<PersonAuditTemplate> second = personOpinionService.getSortMessage(auditTemplate.getIdentificationFirst());
+            model.addAttribute("identificationSecondList",second);
+        }
+        //获取三级审核类型集合
+        if (StringUtils.isNotBlank(auditTemplate.getIdentificationSecond())){
+            List<PersonAuditTemplate> third = personOpinionService.getSortMessage(auditTemplate.getIdentificationSecond());
+            model.addAttribute("identificationThirdList",third);
+        }
         return "modules/personOpinion/personOpinionList";
     }
 
@@ -58,8 +86,52 @@ public class PersonOpinionController extends BaseController {
     @RequestMapping(value = "toAddSave")
     public String toAddSave(AuditTemplate auditTemplate, HttpServletRequest request, HttpServletResponse response, Model model) {
         auditTemplate.setCreateBy(UserUtils.getUser());
-        model.addAttribute("auditTemplate",auditTemplate);
-        return "modules/personOpinion/personOpinionAddForm";
+        //获取一级模板标识
+        List<PersonAuditTemplate> list=personOpinionService.getIdentificationFirst();
+        if (StringUtils.isNotBlank(auditTemplate.getId())){
+            //修改时数据回显
+            if (StringUtils.isNotBlank(auditTemplate.getIdentification())){
+                PersonAuditTemplate sortMessage = personOpinionService.getTemplate(auditTemplate.getIdentification());
+                if (sortMessage.getLevel().equals("3")){
+                    String[] split = sortMessage.getParentIds().split(",");
+                    for (String s : split) {
+                        PersonAuditTemplate personAuditTemplate=personOpinionService.getById(s);
+                        if (personAuditTemplate.getLevel().equals("1")){
+                            //二级类型集合
+                            List<PersonAuditTemplate> second = personOpinionService.getSortMessage(personAuditTemplate.getValue());
+                            model.addAttribute("identificationSecondList",second);
+
+                            auditTemplate.setIdentificationFirst(personAuditTemplate.getValue());
+                        }
+                        if (personAuditTemplate.getLevel().equals("2")){
+                            //三级类型集合
+                            List<PersonAuditTemplate> third = personOpinionService.getSortMessage(personAuditTemplate.getValue());
+                            model.addAttribute("identificationThirdList",third);
+
+                            auditTemplate.setIdentificationSecond(personAuditTemplate.getValue());
+                        }
+                    }
+                    auditTemplate.setIdentificationThird(auditTemplate.getIdentification());
+                }
+                if (sortMessage.getLevel().equals("2")){
+                    PersonAuditTemplate personAuditTemplate=personOpinionService.getById(sortMessage.getParentId());
+                    //二级类型集合
+                    List<PersonAuditTemplate> second = personOpinionService.getSortMessage(personAuditTemplate.getValue());
+                    model.addAttribute("identificationSecondList",second);
+
+                    auditTemplate.setIdentificationFirst(personAuditTemplate.getValue());
+                    auditTemplate.setIdentificationSecond(auditTemplate.getIdentification());
+                }
+            }
+            model.addAttribute("identificationFirstList",list);
+            model.addAttribute("auditTemplate",auditTemplate);
+            return "modules/personOpinion/personOpinionEditForm";
+        }else {
+            model.addAttribute("identificationFirstList",list);
+            model.addAttribute("auditTemplate",auditTemplate);
+            return "modules/personOpinion/personOpinionAddForm";
+        }
+
     }
     /**
      * 增加模板信息
@@ -68,6 +140,14 @@ public class PersonOpinionController extends BaseController {
      */
     @RequestMapping(value = "save")
     public String save(AuditTemplate auditTemplate, Model model) {
+        //获取审核类型
+        if (StringUtils.isNotBlank(auditTemplate.getIdentificationSecond())){
+            auditTemplate.setIdentification(auditTemplate.getIdentificationSecond());
+        }
+        if (StringUtils.isNotBlank(auditTemplate.getIdentificationThird())){
+            auditTemplate.setIdentification(auditTemplate.getIdentificationThird());
+        }
+
         personOpinionService.save(auditTemplate);
         return "redirect:"+ Global.getAdminPath()+"/personOpinion/personOpinion/?repage";
     }
@@ -88,5 +168,18 @@ public class PersonOpinionController extends BaseController {
         return "删除成功";
     }
 
+    /**
+     * 获取二级审核模板类型
+     * @param value
+     * @return
+     */
+    @RequestMapping("getMessage")
+    @ResponseBody
+    public List<PersonAuditTemplate> getMessage(String value){
+        List<PersonAuditTemplate> map = personOpinionService.getSortMessage(value);
+        return  map;
+    }
+
+
 
 }

src/main/resources/mappings/modules/identification/PersonAuditTemplateDao.xml

@@ -0,0 +1,58 @@
+<?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.jeeplus.modules.identification.dao.PersonAuditTemplateDao">
+
+    <select id="getIdentificationFirst" resultType="com.jeeplus.modules.identification.entity.PersonAuditTemplate">
+        select
+            id,
+            parent_id,
+            parent_ids,
+            value,
+            label,
+            level
+        from
+            person_audit_template
+        where level = '1'
+    </select>
+
+    <select id="getByValue" resultType="com.jeeplus.modules.identification.entity.PersonAuditTemplate">
+        select
+            id,
+            parent_id,
+            parent_ids,
+            value,
+            label,
+            level
+        from
+            person_audit_template
+        where value = #{value} limit 1
+    </select>
+
+    <select id="getByParentId" resultType="com.jeeplus.modules.identification.entity.PersonAuditTemplate">
+        select
+            id,
+            parent_id,
+            parent_ids,
+            value,
+            label,
+            level
+        from
+            person_audit_template
+        where parent_id = #{id} and level = #{level}
+    </select>
+
+    <select id="getById" resultType="com.jeeplus.modules.identification.entity.PersonAuditTemplate">
+        select
+            id,
+            parent_id,
+            parent_ids,
+            value,
+            label,
+            level
+        from
+            person_audit_template
+        where id = #{id}
+    </select>
+
+
+</mapper>

src/main/resources/mappings/modules/identification/PersonOpinionDao.xml

@@ -32,6 +32,9 @@
             <if test="name !=null and name != ''">
                 and a.name like concat('%',#{name},'%')
             </if>
+            <if test="identification !=null and identification != ''">
+                and a.identification = #{identification}
+            </if>
             <if test="content !=null and content != ''">
                 and a.content like concat('%',#{content},'%')
             </if>
@@ -62,6 +65,9 @@
             <if test="name !=null and name != ''">
                 and a.name like concat('%',#{name},'%')
             </if>
+            <if test="identification !=null and identification != ''">
+                and a.identification = #{identification}
+            </if>
             <if test="content !=null and content != ''">
                 and a.content like concat('%',#{content},'%')
             </if>

src/main/webapp/webpage/modules/personOpinion/personOpinionAddForm.jsp

@@ -21,17 +21,112 @@
         var validateForm;
         function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-                $("#inputForm").submit();
-                return true;
+                var third = $("#identificationThird").val()
+                var identificationFirst = $("#identificationFirst").val()
+                var identificationSecond = $("#identificationSecond").val()
+                var res = false
+                var res1 = false
+                if (identificationSecond == ""){
+                    $.ajax({
+                        type:"post",
+                        url:'${ctx}/personOpinion/personOpinion/getMessage',
+                        data:{"type":identificationFirst},
+                        dataType:"json",
+                        async: false,
+                        success:function(data){
+                            if(data.length != 0) {
+                                res1 = true
+                            }
+                        }
+                    })
+                }
+                if (res1){
+                    top.layer.msg('存在二级审核类型，请选择！', {icon: 0});
+                    return;
+                }
+                if (third == ""){
+                    $.ajax({
+                        type:"post",
+                        url:'${ctx}/personOpinion/personOpinion/getMessage',
+                        data:{"type":identificationSecond},
+                        dataType:"json",
+                        async: false,
+                        success:function(data){
+                            if(data.length != 0) {
+                                res = true
+
+                            }
+                        }
+                    })
+                }
+                if (res){
+                    top.layer.msg('存在三级审核类型，请选择！', {icon: 0});
+                    return;
+                }else {
+                    $("#inputForm").submit();
+                    return true;
+                }
+
             }
             return false;
         }
         $(document).ready(function() {
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
-                form.on('select(identification)', function(data){
+                form.on('select(firstFilter)',function (data) {
+                    if (data.value == "") {
+                        $('#identificationSecond').html('<option value=""></option>');
+                        $('#identificationThird').html('<option value=""></option>');
+                        layui.form.render("select");
+                    } else {
+                        $('#identificationThird').html('<option value=""></option>');
+                        $('#identificationSecond').html('<option value=""></option>')
+                        $.ajax({
+                            type:"post",
+                            url:'${ctx}/personOpinion/personOpinion/getMessage',
+                            data:{"value":data.value},
+                            dataType:"json",
+                            async: false,
+                            success:function(data){
+                                if(data) {
+                                    for (var info in data){
+                                        $('#identificationSecond').append(new Option(data[info].label,data[info].value));
+                                    }
+                                }
+                            }
+                        })
+                        layui.form.render("select");
+                    }
+                })
+                form.on('select(secondFilter)',function (data) {
+                    console.log(this.innerHTML)
+                    $("#name").val(this.innerHTML)
+                    if (data.value == "") {
+                        $('#identificationThird').html('<option value=""></option>');
+                        layui.form.render("select");
+                    } else {
+                        $('#identificationThird').html('<option value=""></option>')
+                        $.ajax({
+                            type:"post",
+                            url:'${ctx}/personOpinion/personOpinion/getMessage',
+                            data:{"value":data.value},
+                            dataType:"json",
+                            async: false,
+                            success:function(data){
+                                if(data) {
+                                    for (var info in data){
+                                        $('#identificationThird').append(new Option(data[info].label,data[info].value));
+                                    }
+                                }
+                            }
+                        })
+                        layui.form.render("select");
+                    }
+                })
+                form.on('select(thirdFilter)',function (data) {
+                    console.log(this.innerHTML)
                     $("#name").val(this.innerHTML)
-                });
+                })
             });
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -65,24 +160,44 @@
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>审核模板信息</h2></div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">模板类型：</label>
-                    <div class="layui-input-block">
-                        <select name="identification" lay-filter="identification" >
+                    <label class="layui-form-label double-line">一级模板类型：</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select class="form-control judgment layui-input" lay-filter="firstFilter" id="identificationFirst" name="identificationFirst">
                             <option value=""></option>
-                            <option value="workreimbursement" <c:if test="${auditTemplate.identification=='workreimbursement'}">selected</c:if> >报销审核意见</option>
-                            <option value="workinvoice" <c:if test="${auditTemplate.identification=='workinvoice'}">selected</c:if> >发票审核意见</option>
-                            <option value="oaNotify" <c:if test="${auditTemplate.identification=='oaNotify'}">selected</c:if> >公告审核意见</option>
-                            <option value="workContractInfo" <c:if test="${auditTemplate.identification=='workContractInfo'}">selected</c:if> >合同审核意见</option>
-                            <option value="workContractRecord" <c:if test="${auditTemplate.identification=='workContractRecord'}">selected</c:if> >合同归档审核意见</option>
-                            <option value="workContractBorrow" <c:if test="${auditTemplate.identification=='workContractBorrow'}">selected</c:if> >合同借用审核意见</option>
-                            <option value="ruralprojectrecords" <c:if test="${auditTemplate.identification=='ruralprojectrecords'}">selected</c:if> >项目登记审核意见</option>
-                            <option value="projectReportDataLeader" <c:if test="${auditTemplate.identification=='projectReportDataLeader'}">selected</c:if> >新增报告项目组成员审核意见</option>
-                            <option value="projectReportData" <c:if test="${auditTemplate.identification=='projectReportData'}">selected</c:if> >报告审核意见</option>
-                            <option value="projectcontentinfoFile"<c:if test="${auditTemplate.identification=='projectcontentinfoFile'}">selected</c:if>>归档审核意见</option>
-                            <option value="ruralprojectrecordsCheck" <c:if test="${auditTemplate.identification=='ruralprojectrecordsCheck'}">selected</c:if> >选查审核意见</option>
-                            <option value="projectFilingBatch" <c:if test="${auditTemplate.identification=='projectFilingBatch'}">selected</c:if> >批量归档审核意见</option>
+                            <c:forEach items="${identificationFirstList}" var="type">
+                                <option value="${type.value}" <c:if test="${auditTemplate.identificationFirst eq type.value }">selected</c:if>>${type.label}</option>
+                            </c:forEach>
                         </select>
                     </div>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <select name="identification" lay-filter="identification" >--%>
+<%--                            <option value=""></option>--%>
+<%--                            <option value="workreimbursement" <c:if test="${auditTemplate.identification=='workreimbursement'}">selected</c:if> >报销审核意见</option>--%>
+<%--                            <option value="workinvoice" <c:if test="${auditTemplate.identification=='workinvoice'}">selected</c:if> >发票审核意见</option>--%>
+<%--                            <option value="oaNotify" <c:if test="${auditTemplate.identification=='oaNotify'}">selected</c:if> >公告审核意见</option>--%>
+<%--                            <option value="workContractInfo" <c:if test="${auditTemplate.identification=='workContractInfo'}">selected</c:if> >合同审核意见</option>--%>
+<%--                            <option value="workContractRecord" <c:if test="${auditTemplate.identification=='workContractRecord'}">selected</c:if> >合同归档审核意见</option>--%>
+<%--                            <option value="workContractBorrow" <c:if test="${auditTemplate.identification=='workContractBorrow'}">selected</c:if> >合同借用审核意见</option>--%>
+<%--                            <option value="ruralprojectrecords" <c:if test="${auditTemplate.identification=='ruralprojectrecords'}">selected</c:if> >项目登记审核意见</option>--%>
+<%--                            <option value="projectReportDataLeader" <c:if test="${auditTemplate.identification=='projectReportDataLeader'}">selected</c:if> >新增报告项目组成员审核意见</option>--%>
+<%--                            <option value="projectReportData" <c:if test="${auditTemplate.identification=='projectReportData'}">selected</c:if> >报告审核意见</option>--%>
+<%--                            <option value="projectcontentinfoFile"<c:if test="${auditTemplate.identification=='projectcontentinfoFile'}">selected</c:if>>归档审核意见</option>--%>
+<%--                            <option value="ruralprojectrecordsCheck" <c:if test="${auditTemplate.identification=='ruralprojectrecordsCheck'}">selected</c:if> >选查审核意见</option>--%>
+<%--                            <option value="projectFilingBatch" <c:if test="${auditTemplate.identification=='projectFilingBatch'}">selected</c:if> >批量归档审核意见</option>--%>
+<%--                        </select>--%>
+<%--                    </div>--%>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label double-line">二级模板类型：</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select id="identificationSecond" name="identificationSecond" lay-filter="secondFilter" value = ""></select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label double-line">三级模板类型：</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select id="identificationThird" name="identificationThird" lay-filter="thirdFilter" value = ""></select>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm12 with-textarea">
                     <label class="layui-form-label ">模板信息：</label>

src/main/webapp/webpage/modules/personOpinion/personOpinionEditForm.jsp

@@ -0,0 +1,227 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>复核标准管理</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+    <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+    <style>
+        label.error{
+            top:40px;
+            left:0;
+        }
+        #standardDetail-error{
+            top:82px;
+            left:0;
+        }
+    </style>
+    <script type="text/javascript">
+        var validateForm;
+        function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            if(validateForm.form()){
+                var third = $("#identificationThird").val()
+                var identificationFirst = $("#identificationFirst").val()
+                var identificationSecond = $("#identificationSecond").val()
+                var res = false
+                var res1 = false
+                if (identificationSecond == ""){
+                    $.ajax({
+                        type:"post",
+                        url:'${ctx}/personOpinion/personOpinion/getMessage',
+                        data:{"type":identificationFirst},
+                        dataType:"json",
+                        async: false,
+                        success:function(data){
+                            if(data.length != 0) {
+                                res1 = true
+                            }
+                        }
+                    })
+                }
+                if (res1){
+                    top.layer.msg('存在二级审核类型，请选择！', {icon: 0});
+                    return;
+                }
+                if (third == ""){
+                    $.ajax({
+                        type:"post",
+                        url:'${ctx}/personOpinion/personOpinion/getMessage',
+                        data:{"type":identificationSecond},
+                        dataType:"json",
+                        async: false,
+                        success:function(data){
+                            if(data.length != 0) {
+                                res = true
+
+                            }
+                        }
+                    })
+                }
+                if (res){
+                    top.layer.msg('存在三级审核类型，请选择！', {icon: 0});
+                    return;
+                }else {
+                    $("#inputForm").submit();
+                    return true;
+                }
+
+            }
+            return false;
+        }
+        $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+
+                form.on('select(firstFilter)',function (data) {
+                    if (data.value == "") {
+                        $('#identificationSecond').html('<option value=""></option>');
+                        $('#identificationThird').html('<option value=""></option>');
+                        layui.form.render("select");
+                    } else {
+                        $('#identificationThird').html('<option value=""></option>');
+                        $('#identificationSecond').html('<option value=""></option>')
+                        $.ajax({
+                            type:"post",
+                            url:'${ctx}/personOpinion/personOpinion/getMessage',
+                            data:{"value":data.value},
+                            dataType:"json",
+                            async: false,
+                            success:function(data){
+                                if(data) {
+                                    for (var info in data){
+                                        $('#identificationSecond').append(new Option(data[info].label,data[info].value));
+                                    }
+                                }
+                            }
+                        })
+                        layui.form.render("select");
+                    }
+                })
+                form.on('select(secondFilter)',function (data) {
+                    console.log(this.innerHTML)
+                    $("#name").val(this.innerHTML)
+                    if (data.value == "") {
+                        $('#identificationThird').html('<option value=""></option>');
+                        layui.form.render("select");
+                    } else {
+                        $('#identificationThird').html('<option value=""></option>')
+                        $.ajax({
+                            type:"post",
+                            url:'${ctx}/personOpinion/personOpinion/getMessage',
+                            data:{"value":data.value},
+                            dataType:"json",
+                            async: false,
+                            success:function(data){
+                                if(data) {
+                                    for (var info in data){
+                                        $('#identificationThird').append(new Option(data[info].label,data[info].value));
+                                    }
+                                }
+                            }
+                        })
+                        layui.form.render("select");
+                    }
+                })
+                form.on('select(thirdFilter)',function (data) {
+                    console.log(this.innerHTML)
+                    $("#name").val(this.innerHTML)
+                })
+            });
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    // loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+            var edit = "${workReviewStandard.id}";
+            if(edit!=null && edit!=''){
+                $("#reviewParentButton").attr("disabled","disabled");
+            }
+        });
+    </script>
+</head>
+<body>
+<div class="single-form">
+    <div class="container">
+        <form:form id="inputForm" modelAttribute="auditTemplate" action="${ctx}/personOpinion/personOpinion/save" method="post" class="form-horizontal layui-form">
+            <form:hidden path="id"/>
+            <form:hidden path="createBy.name" readonly="true"  htmlEscape="false" class="form-control layui-input"/>
+            <form:hidden path="name" id="name" readonly="true" htmlEscape="false"  class="form-control layui-input"/>
+            <div class="form-group layui-row first">
+                <div class="form-group-label"><h2>审核模板信息</h2></div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label double-line">一级模板类型：</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select class="form-control judgment layui-input" lay-filter="firstFilter" id="identificationFirst" name="identificationFirst">
+                            <option value=""></option>
+                            <c:forEach items="${identificationFirstList}" var="type">
+                                <option value="${type.value}" <c:if test="${auditTemplate.identificationFirst eq type.value }">selected</c:if>>${type.label}</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <select name="identification" lay-filter="identification" >--%>
+<%--                            <option value=""></option>--%>
+<%--                            <option value="workreimbursement" <c:if test="${auditTemplate.identification=='workreimbursement'}">selected</c:if> >报销审核意见</option>--%>
+<%--                            <option value="workinvoice" <c:if test="${auditTemplate.identification=='workinvoice'}">selected</c:if> >发票审核意见</option>--%>
+<%--                            <option value="oaNotify" <c:if test="${auditTemplate.identification=='oaNotify'}">selected</c:if> >公告审核意见</option>--%>
+<%--                            <option value="workContractInfo" <c:if test="${auditTemplate.identification=='workContractInfo'}">selected</c:if> >合同审核意见</option>--%>
+<%--                            <option value="workContractRecord" <c:if test="${auditTemplate.identification=='workContractRecord'}">selected</c:if> >合同归档审核意见</option>--%>
+<%--                            <option value="workContractBorrow" <c:if test="${auditTemplate.identification=='workContractBorrow'}">selected</c:if> >合同借用审核意见</option>--%>
+<%--                            <option value="ruralprojectrecords" <c:if test="${auditTemplate.identification=='ruralprojectrecords'}">selected</c:if> >项目登记审核意见</option>--%>
+<%--                            <option value="projectReportDataLeader" <c:if test="${auditTemplate.identification=='projectReportDataLeader'}">selected</c:if> >新增报告项目组成员审核意见</option>--%>
+<%--                            <option value="projectReportData" <c:if test="${auditTemplate.identification=='projectReportData'}">selected</c:if> >报告审核意见</option>--%>
+<%--                            <option value="projectcontentinfoFile"<c:if test="${auditTemplate.identification=='projectcontentinfoFile'}">selected</c:if>>归档审核意见</option>--%>
+<%--                            <option value="ruralprojectrecordsCheck" <c:if test="${auditTemplate.identification=='ruralprojectrecordsCheck'}">selected</c:if> >选查审核意见</option>--%>
+<%--                            <option value="projectFilingBatch" <c:if test="${auditTemplate.identification=='projectFilingBatch'}">selected</c:if> >批量归档审核意见</option>--%>
+<%--                        </select>--%>
+<%--                    </div>--%>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label double-line">二级模板类型：</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select id="identificationSecond" name="identificationSecond" lay-filter="secondFilter">
+                            <c:forEach items="${identificationSecondList}" var="type">
+                                <option value="${type.value}" <c:if test="${auditTemplate.identificationSecond eq type.value }">selected</c:if>>${type.label}</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label double-line">三级模板类型：</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select id="identificationThird" name="identificationThird" lay-filter="thirdFilter">
+                            <c:forEach items="${identificationThirdList}" var="type">
+                                <option value="${type.value}" <c:if test="${auditTemplate.identificationThird eq type.value }">selected</c:if>>${type.label}</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12 with-textarea">
+                    <label class="layui-form-label ">模板信息：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="content" placeholder="请输入模板信息" id="content" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                    </div>
+                </div>
+            </div>
+        </form:form>
+    </div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/personOpinion/personOpinionList.jsp

@@ -29,6 +29,47 @@
         $(document).ready(function() {
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
+                var identificationFirst = $("#identificationFirst").val();
+                var identificationSecond = $("#identificationSecond").val();
+                var identificationThird = $("#identificationThird").val();
+                console.log('identificationFirst',identificationFirst)
+                console.log('identificationSecond',identificationSecond)
+                console.log('identificationThird',identificationThird)
+                if (undefined != identificationFirst && null != identificationFirst && "" != identificationFirst){
+                    $.ajax({
+                        type:"post",
+                        url:'${ctx}/personOpinion/personOpinion/getMessage',
+                        data:{"value":identificationFirst},
+                        dataType:"json",
+                        async: false,
+                        success:function(data){
+                            if(data) {
+                                for (var info in data){
+                                    $('#identificationSecond').append(new Option(data[info].label,data[info].value));
+                                }
+                            }
+                        }
+                    })
+                    layui.form.render("select");
+                }
+                if (undefined != identificationSecond && null != identificationSecond && "" != identificationSecond){
+                    $.ajax({
+                        type:"post",
+                        url:'${ctx}/personOpinion/personOpinion/getMessage',
+                        data:{"value":identificationSecond},
+                        dataType:"json",
+                        async: false,
+                        success:function(data){
+                            if(data) {
+                                for (var info in data){
+                                    $('#identificationThird').append(new Option(data[info].label,data[info].value));
+                                }
+                            }
+                        }
+                    })
+                    layui.form.render("select");
+                }
+
             });
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -130,75 +171,182 @@
     </script>
 </head>
 <body>
+<div class="wrapper wrapper-content">
+    <sys:message content="${message}"/>
+    <div class="layui-row">
+        <div class="full-width fl">
+            <div class="layui-row contentShadow shadowLR" id="queryDiv">
+                <form:form id="inputForm"  modelAttribute="auditTemplate"  action="${ctx}/personOpinion/personOpinion/" method="post" class="form-horizontal layui-form">
+                    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+                    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+                    <input id="toflag" name="toflag" type="hidden" value="1"/>
+                    <div class="commonQuery lw12" style="margin-bottom: 20px;">
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">一级模板类型：</label>
+                            <div class="layui-input-block readOnlyFFF">
+                                    <%--                <form:input path="name" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>--%>
+                                <select class="form-control  simple-select" lay-filter="firstFilter" id="identificationFirst" name="identificationFirst">
+                                    <option value=""></option>
+                                    <c:forEach items="${identificationFirstList}" var="type">
+                                        <option value="${type.value}" <c:if test="${auditTemplate.identificationFirst eq type.value }">selected</c:if>>${type.label}</option>
+                                    </c:forEach>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label double-line">二级模板类型：</label>
+                            <div class="layui-input-block readOnlyFFF">
+                                <select class="form-control  simple-select" id="identificationSecond" name="identificationSecond" lay-filter="secondFilter">
+                                    <option value=""></option>
+                                    <c:forEach items="${identificationSecondList}" var="type">
+                                        <option value="${type.value}" <c:if test="${auditTemplate.identificationSecond eq type.value }">selected</c:if>>${type.label}</option>
+                                    </c:forEach>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-item athird">
+                            <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+                            <div class="layui-btn-group search-spacing">
+                                <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                <button id="searchReset" class="layui-btn layui-btn-sm " onclick="rereset()">重置</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="moresees" class="commonQuery lw12" style="clear:both;display:none;">
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label double-line">三级模板类型：</label>
+                            <div class="layui-input-block readOnlyFFF">
+                                <select class="form-control  simple-select" id="identificationThird" name="identificationThird" lay-filter="thirdFilter" >
+                                    <option value=""></option>
+                                    <c:forEach items="${identificationThirdList}" var="type">
+                                        <option value="${type.value}" <c:if test="${auditTemplate.identificationThird eq type.value }">selected</c:if>>${type.label}</option>
+                                    </c:forEach>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">模板内容：</label>
+                            <div class="layui-input-block">
+                                <form:input path="content" htmlEscape="false" maxlength="64"   class=" form-control layui-input"/>
+                            </div>
+                        </div>
 
-<form:form id="inputForm"  modelAttribute="auditTemplate"  action="${ctx}/personOpinion/personOpinion/" method="post" class="form-inline">
-    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-    <div class="commonQuery lw6" style="margin-bottom: 20px;">
-        <div class="layui-item query athird">
-            <label class="layui-form-label">模板类型：</label>
-            <div class="layui-input-block">
-                <form:input path="name" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
-            </div>
-        </div>
-        <div class="layui-item query athird">
-            <label class="layui-form-label">模板内容：</label>
-            <div class="layui-input-block">
-                <form:input path="content" htmlEscape="false" maxlength="64"   class=" form-control layui-input"/>
-            </div>
-        </div>
-        <div class="layui-item athird">
-            <div class="layui-btn-group search-spacing">
-                <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
-                <button id="searchReset" class="layui-btn layui-btn-sm " onclick="rereset()">重置</button>
+                        <div style="clear:both;"></div>
+                    </div>
+                </form:form>
             </div>
         </div>
-        <div style="clear:both;"></div>
-    </div>
-    <div class="single-form">
-        <div class="container" style="width: 98%">
-            <div class="nav-btns">
-                <div class="layui-btn-group" style="float: left">
-                    <button class="layui-btn layui-btn-sm layui-bg-blue" onclick="openDialogre('添加模板', '${ctx}/personOpinion/personOpinion/toAddSave','95%', '95%','','添加,关闭')">&nbsp;添加</button>
-                    <button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+        <div class="full-width fl">
+            <div class="layui-form contentDetails contentShadow shadowLBR">
+                <div class="nav-btns">
+                    <div class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" onclick="openDialogre('添加模板', '${ctx}/personOpinion/personOpinion/toAddSave','95%', '95%','','添加,关闭')">&nbsp;添加</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+                    <div style="clear: both;"></div>
                 </div>
-                <div style="clear: both;"></div>
-            </div>
-            <table class="oa-table layui-table">
-                <thead>
+
+                <table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
+                    <thead>
                     <th width="20%">模板类型</th>
                     <th width="40%">模板</th>
-                    <th width="20%">创建人</th>
+                    <th width="10%">创建人</th>
+                    <th width="10%">创建时间</th>
                     <th width="20%">操作</th>
-                </thead>
-                <tbody>
+                    </thead>
+                    <tbody>
                     <c:forEach items="${page.list}" var="tem">
                         <tr align="center" >
                             <td>${tem.name}</td>
-                            <td><span title="${tem.content}">${tem.content}</span></td>
+                            <td><span title="${tem.content}" style="width:200px;display:block;overflow:hidden;word-break:keep-all;white-space:nowrap;text-overflow:ellipsis;">${tem.content}</span></td>
                             <td>${tem.createBy.name}</td>
+                            <td><fmt:formatDate value="${tem.createDate}" pattern="yyyy-MM-dd"/></td>
                             <td>
                                 <div class="layui-btn-group">
                                     <div class="op-btn-box">
                                         <a href="${ctx}/personOpinion/personOpinion/delete?id=${tem.id}" onclick="return deleteByid('确认要删除该审核模板吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
                                     </div>
                                     <div class="op-btn-box">
-                                        <a style="color: white" onclick="openDialogre('修改模板', '${ctx}/personOpinion/personOpinion/toAddSave?id=${tem.id}','80%', '70%','','修改,关闭')" class="layui-btn layui-btn-xs" >修改</a>
+                                            <a style="color: white" onclick="openDialogre('修改模板', '${ctx}/personOpinion/personOpinion/toAddSave?id=${tem.id}','80%', '70%','','修改,关闭')" class="layui-btn layui-btn-xs" >修改</a>
                                     </div>
                                 </div>
                             </td>
                         </tr>
                     </c:forEach>
-                </tbody>
-            </table>
-            <!-- 分页代码 -->
-            <table:page page="${page}"></table:page>
+                    </tbody>
+                </table>
+
+                <!-- 分页代码 -->
+                <table:page page="${page}"></table:page>
+                <div style="clear: both;"></div>
+            </div>
         </div>
     </div>
-</form:form>
+</div>
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
 
+    /*使用模块加载的方式 加载文件*/
+    layui.config({
+        base: '${ctx}/resoueces/css/layui/module/'
+    }).use(['layer', 'table'], function () {
+
+        layui.form.on('select(firstFilter)',function (data) {
+            console.log(data.value)
+            if (data.value == "") {
+                $('#identificationSecond').html('<option value=""></option>');
+                $('#identificationThird').html('<option value=""></option>');
+                layui.form.render("select");
+            } else {
+                $('#identificationThird').html('<option value=""></option>');
+                $('#identificationSecond').html('<option value=""></option>')
+                $.ajax({
+                    type:"post",
+                    url:'${ctx}/personOpinion/personOpinion/getMessage',
+                    data:{"value":data.value},
+                    dataType:"json",
+                    async: false,
+                    success:function(data){
+                        if(data) {
+                            for (var info in data){
+                                $('#identificationSecond').append(new Option(data[info].label,data[info].value));
+                            }
+                        }
+                    }
+                })
+                layui.form.render("select");
+            }
+        })
+        layui.form.on('select(secondFilter)',function (data) {
+            console.log(this.innerHTML)
+            $("#name").val(this.innerHTML)
+            if (data.value == "") {
+                $('#identificationThird').html('<option value=""></option>');
+                layui.form.render("select");
+            } else {
+                $('#identificationThird').html('<option value=""></option>')
+                $.ajax({
+                    type:"post",
+                    url:'${ctx}/personOpinion/personOpinion/getMessage',
+                    data:{"value":data.value},
+                    dataType:"json",
+                    async: false,
+                    success:function(data){
+                        if(data) {
+                            for (var info in data){
+                                $('#identificationThird').append(new Option(data[info].label,data[info].value));
+                            }
+                        }
+                    }
+                })
+                layui.form.render("select");
+            }
+        })
+    });
 
 </script>
 </body>