Merge branch 'master' of e.coding.net:tsteam/zhonglijianduyulianggezhairen/twoduty

2021-03-31 11:37:24 +08:00 · 2021-03-31 11:37:24 +08:00 · 54e30716e6
commit 54e30716e6
parent d87757a164 54066b5a20
26 changed files with 282 additions and 143 deletions
--- a/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersonaction/BasicCheckPersonActionDTO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersonaction/BasicCheckPersonActionDTO.java
@ -18,6 +18,10 @@ public class BasicCheckPersonActionDTO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
+
    @ApiModelProperty(name = "actionTime", value = "时间")
    private String actionTime;
    @ApiModelProperty(name = "streetOrgName", value = "街道办事处")
@ -50,6 +54,14 @@ public class BasicCheckPersonActionDTO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getActionTime() {
        return actionTime == null ? "" : actionTime.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersoninfo/BasicCheckPersonInfoDTO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersoninfo/BasicCheckPersonInfoDTO.java
@ -18,6 +18,10 @@ public class BasicCheckPersonInfoDTO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
+
    @ApiModelProperty(name = "orgName", value = "单位名称")
    private String orgName;
    @ApiModelProperty(name = "noteTaker", value = "填表人")
@ -63,6 +67,15 @@ public class BasicCheckPersonInfoDTO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+
+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getOrgName() {
        return orgName == null ? "" : orgName.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java
@ -18,6 +18,8 @@ public class IndexGeneralDTO {
    private String indexGeneralId;
    @ApiModelProperty(name = "indexLibId", value = "指标ID")
    private String indexLibId;
+    @ApiModelProperty(name = "indexLibName", value = "指标名称")
+    private String indexLibName;
    @ApiModelProperty(name = "indexGeneralTitle", value = "上报标题")
    private String indexGeneralTitle;
    @ApiModelProperty(name = "indexGeneralContent", value = "上报正文")
@ -44,6 +46,14 @@ public class IndexGeneralDTO {
        this.indexLibId = indexLibId;
    }

+    public String getIndexLibName() {
+        return indexLibName;
+    }
+
+    public void setIndexLibName(String indexLibName) {
+        this.indexLibName = indexLibName;
+    }
+
    public String getIndexGeneralTitle() {
        return indexGeneralTitle == null ? "" : indexGeneralTitle.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/dtos/partypunishinfo/PartyPunishInfoDTO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/partypunishinfo/PartyPunishInfoDTO.java
@ -18,6 +18,10 @@ public class PartyPunishInfoDTO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
+
    @ApiModelProperty(name = "personName", value = "姓名")
    private String personName;
    @ApiModelProperty(name = "partyOrg", value = "所属社区党支部")
@ -67,6 +71,14 @@ public class PartyPunishInfoDTO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getPersonName() {
        return personName == null ? "" : personName.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/dtos/problemclue/ProblemClueDTO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/problemclue/ProblemClueDTO.java
@ -18,6 +18,11 @@ public class ProblemClueDTO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+
+
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
+
    @ApiModelProperty(name = "caseNumber", value = "案件号")
    private String caseNumber;
    @ApiModelProperty(name = "handoverNumber", value = "交办文号")
@ -71,6 +76,14 @@ public class ProblemClueDTO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getCaseNumber() {
        return caseNumber == null ? "" : caseNumber.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/dtos/supervisecheck/SuperviseCheckDTO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/supervisecheck/SuperviseCheckDTO.java
@ -18,6 +18,10 @@ public class SuperviseCheckDTO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
+
    @ApiModelProperty(name = "checkPhotos", value = "附加图片")
    private String checkPhotos;
    @ApiModelProperty(name = "checkPlace", value = "检查地点")
@ -51,6 +55,14 @@ public class SuperviseCheckDTO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getCheckPhotos() {
        return checkPhotos == null ? "" : checkPhotos.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/vos/basiccheckpersonaction/BasicCheckPersonActionVO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/vos/basiccheckpersonaction/BasicCheckPersonActionVO.java
@ -20,6 +20,8 @@ public class BasicCheckPersonActionVO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
    @ApiModelProperty(name = "actionTime", value = "时间")
    @CheckEmptyAnnotation(name = "时间", verifyType = "datetime")
    private String actionTime;
@ -52,6 +54,14 @@ public class BasicCheckPersonActionVO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getActionTime() {
        return actionTime == null ? "" : actionTime.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/vos/basiccheckpersoninfo/BasicCheckPersonInfoVO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/vos/basiccheckpersoninfo/BasicCheckPersonInfoVO.java
@ -20,6 +20,9 @@ public class BasicCheckPersonInfoVO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
+
    @ApiModelProperty(name = "orgName", value = "单位名称")
    private String orgName;
    @ApiModelProperty(name = "noteTaker", value = "填表人")
@ -69,6 +72,14 @@ public class BasicCheckPersonInfoVO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getOrgName() {
        return orgName == null ? "" : orgName.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/vos/indexgeneral/IndexGeneralVO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/vos/indexgeneral/IndexGeneralVO.java
@ -20,6 +20,9 @@ public class IndexGeneralVO {
    private String indexGeneralId;
    @ApiModelProperty(name = "indexLibId", value = "指标ID")
    private String indexLibId;
+    @ApiModelProperty(name = "indexLibIdName", value = "指标名称")
+    private String indexLibIdName;
+
    @ApiModelProperty(name = "indexGeneralTitle", value = "上报标题")
    private String indexGeneralTitle;
    @ApiModelProperty(name = "indexGeneralContent", value = "上报正文")
@ -47,6 +50,14 @@ public class IndexGeneralVO {
        this.indexLibId = indexLibId;
    }

+    public String getIndexLibIdName() {
+        return indexLibIdName;
+    }
+
+    public void setIndexLibIdName(String indexLibIdName) {
+        this.indexLibIdName = indexLibIdName;
+    }
+
    public String getIndexGeneralTitle() {
        return indexGeneralTitle == null ? "" : indexGeneralTitle.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/vos/partypunishinfo/PartyPunishInfoVO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/vos/partypunishinfo/PartyPunishInfoVO.java
@ -20,6 +20,8 @@ public class PartyPunishInfoVO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
    @ApiModelProperty(name = "personName", value = "姓名")
    private String personName;
    @ApiModelProperty(name = "partyOrg", value = "所属社区党支部")
@ -68,6 +70,14 @@ public class PartyPunishInfoVO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getPersonName() {
        return personName == null ? "" : personName.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/vos/problemclue/ProblemClueVO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/vos/problemclue/ProblemClueVO.java
@ -20,6 +20,8 @@ public class ProblemClueVO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
    @ApiModelProperty(name = "caseNumber", value = "案件号")
    private String caseNumber;
    @ApiModelProperty(name = "handoverNumber", value = "交办文号")
@ -73,6 +75,14 @@ public class ProblemClueVO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getCaseNumber() {
        return caseNumber == null ? "" : caseNumber.trim();
    }
--- a/src/main/java/com/tenlion/twoduty/pojo/vos/supervisecheck/SuperviseCheckVO.java
+++ b/src/main/java/com/tenlion/twoduty/pojo/vos/supervisecheck/SuperviseCheckVO.java
@ -20,6 +20,10 @@ public class SuperviseCheckVO {
    private String reportId;
    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
    private String dutyIndexLibId;
+
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
+    private String dutyIndexLibName;
+
    @ApiModelProperty(name = "checkPhotos", value = "附加图片")
    private String checkPhotos;
    @ApiModelProperty(name = "checkPlace", value = "检查地点")
@ -54,6 +58,14 @@ public class SuperviseCheckVO {
        this.dutyIndexLibId = dutyIndexLibId;
    }

+    public String getDutyIndexLibName() {
+        return dutyIndexLibName;
+    }
+
+    public void setDutyIndexLibName(String dutyIndexLibName) {
+        this.dutyIndexLibName = dutyIndexLibName;
+    }
+
    public String getCheckPhotos() {
        return checkPhotos == null ? "" : checkPhotos.trim();
    }
--- a/src/main/resources/mybatis/mapper/basicCheckPersonAction/basicCheckPersonAction-mapper.xml
+++ b/src/main/resources/mybatis/mapper/basicCheckPersonAction/basicCheckPersonAction-mapper.xml
@ -114,9 +114,6 @@
        UPDATE
        t_basic_check_person_action
        SET
-        <if test="dutyIndexLibId != null and dutyIndexLibId != ''">
-            duty_index_lib_id = #{dutyIndexLibId},
-        </if>
        <if test="actionTime != null and actionTime != ''">
            action_time = #{actionTime},
        </if>
@ -246,6 +243,9 @@
            AND
            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
        </if>
+        <if test="indexLibId != null and indexLibId != ''">
+            AND t1.duty_index_lib_id = #{indexLibId}
+        </if>
    </select>

    <!-- 列表 -->
--- a/src/main/resources/mybatis/mapper/basicCheckPersonInfo/basicCheckPersonInfo-mapper.xml
+++ b/src/main/resources/mybatis/mapper/basicCheckPersonInfo/basicCheckPersonInfo-mapper.xml
@ -149,9 +149,6 @@
        UPDATE
        t_basic_check_person_info
        SET
-        <if test="dutyIndexLibId != null and dutyIndexLibId != ''">
-            duty_index_lib_id = #{dutyIndexLibId},
-        </if>
        <if test="orgName != null and orgName != ''">
            org_name = #{orgName},
        </if>
@ -329,6 +326,9 @@
            AND
            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
        </if>
+         <if test="indexLibId != null and indexLibId != ''">
+            AND t1.duty_index_lib_id = #{indexLibId}
+        </if>
    </select>

    <!-- 列表 -->
--- a/src/main/resources/mybatis/mapper/indexGeneral/indexGeneral-mapper.xml
+++ b/src/main/resources/mybatis/mapper/indexGeneral/indexGeneral-mapper.xml
@ -223,6 +223,9 @@
                #{indexGeneralIds[${index}]}
            </foreach>
        </if>
+        <if test="indexLibId != null and indexLibId != ''">
+            AND t1.index_lib_id = #{indexLibId}
+        </if>
    </select>

    <!-- 列表 -->
--- a/src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml
+++ b/src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml
@ -85,8 +85,8 @@
        is_delete = 1
        WHERE
        index_template_id IN
-        <foreach collection="indexLibIds" index="index" open="(" separator="," close=")">
-            #{indexLibIds[${index}]}
+        <foreach collection="indexTemplateIds" index="index" open="(" separator="," close=")">
+            #{indexTemplateIds[${index}]}
        </foreach>
    </update>

--- a/src/main/resources/mybatis/mapper/partyPunishInfo/partyPunishInfo-mapper.xml
+++ b/src/main/resources/mybatis/mapper/partyPunishInfo/partyPunishInfo-mapper.xml
@ -151,9 +151,6 @@
        UPDATE
          t_party_punish_info
        SET
-        <if test="dutyIndexLibId != null and dutyIndexLibId != ''">
-            duty_index_lib_id = #{dutyIndexLibId},
-        </if>
        <if test="personName != null and personName != ''">
            person_name = #{personName},
        </if>
@ -196,12 +193,8 @@
        <if test="remarks != null and remarks != ''">
            remarks = #{remarks},
        </if>
-        <if test="creator != null and creator != ''">
-            creator = #{creator},
-        </if>
-        <if test="gmtCreate != null and gmtCreate != ''">
-            gmt_create = #{gmtCreate},
-        </if>
+        gmt_modified = #{gmtModified},
+        modifier = #{modifier}
        WHERE
          report_id = #{reportId}
    </update>
@ -319,7 +312,6 @@
        t1.remarks,
        t1.creator,
        t1.gmt_create
-
        FROM
        t_party_punish_info t1
        WHERE
@ -338,6 +330,9 @@
            AND
            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
        </if>
+         <if test="indexLibId != null and indexLibId != ''">
+           AND t1.duty_index_lib_id = {indexLibId}
+        </if>
    </select>

    <!-- 列表 -->
--- a/src/main/resources/mybatis/mapper/problemClue/problemClue-mapper.xml
+++ b/src/main/resources/mybatis/mapper/problemClue/problemClue-mapper.xml
@ -161,9 +161,6 @@
        UPDATE
        t_problem_clue
        SET
-        <if test="dutyIndexLibId != null and dutyIndexLibId != ''">
-            duty_index_lib_id = #{dutyIndexLibId},
-        </if>
        <if test="caseNumber != null and caseNumber != ''">
            case_number = #{caseNumber},
        </if>
@ -334,8 +331,7 @@
        t1.case_result,
        t1.remarks,
        t1.creator,
-        t1.gmt_create,
-        1
+        t1.gmt_create
        FROM
        t_problem_clue t1
        WHERE
@ -354,6 +350,9 @@
            AND
            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
        </if>
+         <if test="indexLibId != null and indexLibId != ''">
+            AND t1.duty_index_lib_id = #{indexLibId}
+        </if>
    </select>

    <!-- 列表 -->
--- a/src/main/resources/mybatis/mapper/superviseCheck/superviseCheck-mapper.xml
+++ b/src/main/resources/mybatis/mapper/superviseCheck/superviseCheck-mapper.xml
@ -235,8 +235,7 @@
        t1.check_info,
        t1.check_content,
        t1.check_problem,
-        t1.check_result,
-        1
+        t1.check_result
        FROM
        t_supervise_check t1
        WHERE
@ -255,6 +254,9 @@
            AND
            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
        </if>
+         <if test="indexLibId != null and indexLibId != ''">
+            AND t1.duty_index_lib_id = #{indexLibId}
+        </if>
    </select>

    <!-- 列表 -->
--- a/src/main/resources/static/route/basicCheckPersonAction/list.html
+++ b/src/main/resources/static/route/basicCheckPersonAction/list.html
@ -86,33 +86,7 @@
                    [
                        {type:'checkbox', fixed: 'left'},
                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                        {field: 'reportId', width: 180, title: '主键ID', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'dutyIndexLibId', width: 180, title: '指标ID', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'actionTime', width: 180, title: '时间', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
+
                        {field: 'streetOrgName', width: 180, title: '街道办事处', align:'center',
                            templet: function(row) {
                                var rowData = row[this.field];
@ -158,6 +132,15 @@
                                return rowData;
                            }
                        },
+                        {field: 'actionTime', width: 180, title: '时间', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
                        {field: 'remarks', width: 180, title: '备注', align:'center',
                            templet: function(row) {
                                var rowData = row[this.field];
--- a/src/main/resources/static/route/basicCheckPersonInfo/list.html
+++ b/src/main/resources/static/route/basicCheckPersonInfo/list.html
@ -86,24 +86,6 @@
                    [
                        {type:'checkbox', fixed: 'left'},
                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                        {field: 'reportId', width: 180, title: '主键ID', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'dutyIndexLibId', width: 180, title: '指标ID', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
                        {field: 'orgName', width: 180, title: '单位名称', align:'center',
                            templet: function(row) {
                                var rowData = row[this.field];
--- a/src/main/resources/static/route/basicCheckPersonInfo/save.html
+++ b/src/main/resources/static/route/basicCheckPersonInfo/save.html
@ -29,12 +29,7 @@
                        <input type="text" id="dutyIndexLibName" name="dutyIndexLibName" class="layui-input" readonly="readonly">
                    </div>
                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">姓名</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="personName" name="personName" class="layui-input" value="" placeholder="请输入姓名"  maxlength="255">
-                    </div>
-                </div>
+
                <div class="layui-form-item">
                    <label class="layui-form-label">单位名称</label>
                    <div class="layui-input-block">
@ -53,17 +48,33 @@
                        <input type="text" id="orgAttribute" name="orgAttribute" class="layui-input" value="" placeholder="请输入单位性质"  maxlength="255">
                    </div>
                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">姓名</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="personName" name="personName" class="layui-input" value="" placeholder="请输入姓名"  maxlength="255">
+                    </div>
+                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">性别</label>
                    <div class="layui-input-block">
-                        <input type="text" id="gender" name="gender" class="layui-input" value="" placeholder="请输入性别"  maxlength="2">
+                        <select name="gender" lay-verify="required">
+                            <option value=""></option>
+                            <option value="1">男</option>
+                            <option value="2">女</option>
+                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">民族</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="nation" name="nation" class="layui-input" value="" placeholder="请输入民族"  maxlength="255">
-                    </div>
+                    <div class="layui-input-block layui-form" id="nationTemplateBox" lay-filter="nationTemplateBox"></div>
+                    <script id="nationTemplate" type="text/html">
+                        <select name="nation">
+                            <option value="">请选择</option>
+                            {{# for(var i = 0, item; item = d[i++];) { }}
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
+                            {{# } }}
+                        </select>
+                    </script>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">出生年月</label>
@ -73,9 +84,15 @@
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">学历</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="education" name="education" class="layui-input" value="" placeholder="请输入学历"  maxlength="50">
-                    </div>
+                    <div class="layui-input-block layui-form" id="educationTemplateBox" lay-filter="educationTemplateBox"></div>
+                    <script id="educationTemplate" type="text/html">
+                        <select name="education">
+                            <option value="">请选择</option>
+                            {{# for(var i = 0, item; item = d[i++];) { }}
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
+                            {{# } }}
+                        </select>
+                    </script>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">毕业院校</label>
@ -241,6 +258,27 @@
            });
        }

+        //初始化民族数据字典
+        function initNationTemplate(){
+            top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",['5b6f16c5-6c5f-4314-b4cd-8b594187e2c8']),{},null,function (code,data,args) {
+                laytpl(document.getElementById('nationTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('nationTemplateBox').innerHTML = html;
+                });
+                form.render('select', 'nationTemplateBox');
+            });
+        }
+
+        //初始化学历数据字典
+        function initEducationTemplate(){
+            top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",['3d9fa108-b20b-458a-91ee-2529bb4c8581']),{},null,function (code,data,args) {
+                laytpl(document.getElementById('educationTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('educationTemplateBox').innerHTML = html;
+                });
+                form.render('select', 'educationTemplateBox');
+            });
+        }
+
+

        // 初始化内容
        function initData() {
@ -255,6 +293,8 @@
                initBirthDateDateTime();
                initJoinPartyTimeDateTime();
                initJoinWorkTimeDateTime();
+                initNationTemplate();
+                initEducationTemplate();
            }, function(code, data) {
                top.dialog.msg(data.msg);
            }, function() {
--- a/src/main/resources/static/route/basicCheckPersonInfo/update.html
+++ b/src/main/resources/static/route/basicCheckPersonInfo/update.html
@ -29,12 +29,6 @@
                        <input type="text" id="dutyIndexLibName" name="dutyIndexLibName" class="layui-input" readonly="readonly">
                    </div>
                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">姓名</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="personName" name="personName" class="layui-input" value="" placeholder="请输入姓名"  maxlength="255">
-                    </div>
-                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">单位名称</label>
                    <div class="layui-input-block">
@ -53,17 +47,33 @@
                        <input type="text" id="orgAttribute" name="orgAttribute" class="layui-input" value="" placeholder="请输入单位性质"  maxlength="255">
                    </div>
                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">姓名</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="personName" name="personName" class="layui-input" value="" placeholder="请输入姓名"  maxlength="255">
+                    </div>
+                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">性别</label>
                    <div class="layui-input-block">
-                        <input type="text" id="gender" name="gender" class="layui-input" value="" placeholder="请输入性别"  maxlength="2">
+                        <select name="gender" lay-verify="required">
+                            <option value=""></option>
+                            <option value="1">男</option>
+                            <option value="2">女</option>
+                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">民族</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="nation" name="nation" class="layui-input" value="" placeholder="请输入民族"  maxlength="255">
-                    </div>
+                    <div class="layui-input-block layui-form" id="nationTemplateBox" lay-filter="nationTemplateBox"></div>
+                    <script id="nationTemplate" type="text/html">
+                        <select name="nation">
+                            <option value="">请选择</option>
+                            {{# for(var i = 0, item; item = d[i++];) { }}
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
+                            {{# } }}
+                        </select>
+                    </script>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">出生年月</label>
@ -73,9 +83,15 @@
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">学历</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="education" name="education" class="layui-input" value="" placeholder="请输入学历"  maxlength="50">
-                    </div>
+                    <div class="layui-input-block layui-form" id="educationTemplateBox" lay-filter="educationTemplateBox"></div>
+                    <script id="educationTemplate" type="text/html">
+                        <select name="education">
+                            <option value="">请选择</option>
+                            {{# for(var i = 0, item; item = d[i++];) { }}
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
+                            {{# } }}
+                        </select>
+                    </script>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">毕业院校</label>
@ -230,7 +246,7 @@
        }

        // 初始化参加工作时间时间戳
-        function initJoinWorkTimeDateTime() {
+        function initJoinWorkTimeDateTime(v) {
            laydate.render({
                elem: '#joinWorkTime',
                type: 'datetime',
@ -239,6 +255,32 @@
            });
        }

+        //初始化民族数据字典
+        function initNationTemplate(v){
+            top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",['5b6f16c5-6c5f-4314-b4cd-8b594187e2c8']),{},null,function (code,data,args) {
+                laytpl(document.getElementById('nationTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('nationTemplateBox').innerHTML = html;
+                });
+                form.render('select', 'nationTemplateBox');
+                var selectObj = {};
+                selectObj['nation'] = v;
+                form.val('dataForm', selectObj);
+            });
+        }
+
+        //初始化学历数据字典
+        function initEducationTemplate(v){
+            top.restAjax.get(top.restAjax.path("api/data/listbyparentid/{dataParentId}",['3d9fa108-b20b-458a-91ee-2529bb4c8581']),{},null,function (code,data,args) {
+                laytpl(document.getElementById('educationTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('educationTemplateBox').innerHTML = html;
+                });
+                form.render('select', 'educationTemplateBox');
+                var selectObj = {};
+                selectObj['education'] = v;
+                form.val('dataForm', selectObj);
+            });
+        }
+

        // 初始化内容
        function initData() {
@ -254,6 +296,8 @@
                initBirthDateDateTime(data.birthDate);
                initJoinPartyTimeDateTime(data.joinPartyTime);
                initJoinWorkTimeDateTime(data.joinWorkTime);
+                initNationTemplate(data.nation);
+                initEducationTemplate(data.education);
            }, function(code, data) {
                top.dialog.msg(data.msg);
            }, function() {
--- a/src/main/resources/static/route/indexGeneral/list.html
+++ b/src/main/resources/static/route/indexGeneral/list.html
@ -86,7 +86,7 @@
                    [
                        {type:'checkbox', fixed: 'left'},
                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                        {field: 'indexLibId', width: 180, title: '指标', align:'center',
+                        {field: 'indexLibId', width: 180, title: '指标名称', align:'center',
                            templet: function(row) {
                                var rowData = row[this.field];
                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
--- a/src/main/resources/static/route/problemClue/list.html
+++ b/src/main/resources/static/route/problemClue/list.html
@ -86,24 +86,6 @@
                    [
                        {type:'checkbox', fixed: 'left'},
                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                        {field: 'reportId', width: 180, title: '主键ID', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'dutyIndexLibId', width: 180, title: '指标ID', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
                        {field: 'caseNumber', width: 180, title: '案件号', align:'center',
                            templet: function(row) {
                                var rowData = row[this.field];
--- a/src/main/resources/static/route/superviseCheck/list.html
+++ b/src/main/resources/static/route/superviseCheck/list.html
@ -86,33 +86,6 @@
                    [
                        {type:'checkbox', fixed: 'left'},
                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                        {field: 'reportId', width: 180, title: '主键ID', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'dutyIndexLibId', width: 180, title: '指标ID', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'checkPhotos', width: 180, title: '附加图片', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
                        {field: 'checkPlace', width: 180, title: '检查地点', align:'center',
                            templet: function(row) {
                                var rowData = row[this.field];