指标库新增web页面树形接口

src/main/java/com/tenlion/twoduty/pojo/bos/indexgeneral/IndexGeneralBO.java

@@ -11,7 +11,7 @@ package com.tenlion.twoduty.pojo.bos.indexgeneral;
 public class IndexGeneralBO {
 
     private String indexGeneralId;
-    private String indexLibId;
+    private String dutyIndexLibId;
     private String indexGeneralTitle;
     private String indexGeneralContent;
     private String indexGeneralFile;
@@ -31,12 +31,12 @@ public class IndexGeneralBO {
         this.indexGeneralId = indexGeneralId;
     }
 
-    public String getIndexLibId() {
+    public String getDutyIndexLibId() {
-        return indexLibId == null ? "" : indexLibId.trim();
+        return dutyIndexLibId;
     }
 
-    public void setIndexLibId(String indexLibId) {
+    public void setDutyIndexLibId(String dutyIndexLibId) {
-        this.indexLibId = indexLibId;
+        this.dutyIndexLibId = dutyIndexLibId;
     }
 
     public String getIndexGeneralTitle() {

src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java

@@ -16,10 +16,10 @@ public class IndexGeneralDTO {
 
     @ApiModelProperty(name = "indexGeneralId", value = "通用上报模板ID")
     private String indexGeneralId;
-    @ApiModelProperty(name = "indexLibId", value = "指标ID")
+    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
-    private String indexLibId;
+    private String dutyIndexLibId;
-    @ApiModelProperty(name = "indexLibName", value = "指标名称")
+    @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称")
-    private String indexLibName;
+    private String dutyIndexLibName;
     @ApiModelProperty(name = "indexGeneralTitle", value = "上报标题")
     private String indexGeneralTitle;
     @ApiModelProperty(name = "indexGeneralContent", value = "上报正文")
@@ -44,20 +44,20 @@ public class IndexGeneralDTO {
         this.indexGeneralId = indexGeneralId;
     }
 
-    public String getIndexLibId() {
+    public String getDutyIndexLibId() {
-        return indexLibId == null ? "" : indexLibId.trim();
+        return dutyIndexLibId;
     }
 
-    public void setIndexLibId(String indexLibId) {
+    public void setDutyIndexLibId(String dutyIndexLibId) {
-        this.indexLibId = indexLibId;
+        this.dutyIndexLibId = dutyIndexLibId;
     }
 
-    public String getIndexLibName() {
+    public String getDutyIndexLibName() {
-        return indexLibName;
+        return dutyIndexLibName;
     }
 
-    public void setIndexLibName(String indexLibName) {
+    public void setDutyIndexLibName(String dutyIndexLibName) {
-        this.indexLibName = indexLibName;
+        this.dutyIndexLibName = dutyIndexLibName;
     }
 
     public String getIndexGeneralTitle() {

src/main/java/com/tenlion/twoduty/pojo/pos/indexgeneral/IndexGeneralPO.java

@@ -11,7 +11,7 @@ package com.tenlion.twoduty.pojo.pos.indexgeneral;
 public class IndexGeneralPO {
 
     private String indexGeneralId;
-    private String indexLibId;
+    private String dutyIndexLibId;
     private String indexGeneralTitle;
     private String indexGeneralContent;
     private String indexGeneralFile;
@@ -31,12 +31,12 @@ public class IndexGeneralPO {
         this.indexGeneralId = indexGeneralId;
     }
 
-    public String getIndexLibId() {
+    public String getDutyIndexLibId() {
-        return indexLibId == null ? "" : indexLibId.trim();
+        return dutyIndexLibId;
     }
 
-    public void setIndexLibId(String indexLibId) {
+    public void setDutyIndexLibId(String dutyIndexLibId) {
-        this.indexLibId = indexLibId;
+        this.dutyIndexLibId = dutyIndexLibId;
     }
 
     public String getIndexGeneralTitle() {

src/main/java/com/tenlion/twoduty/pojo/vos/indexgeneral/IndexGeneralVO.java

@@ -18,10 +18,10 @@ public class IndexGeneralVO {
 
     @ApiModelProperty(name = "indexGeneralId", value = "通用上报模板ID")
     private String indexGeneralId;
-    @ApiModelProperty(name = "indexLibId", value = "指标ID")
+    @ApiModelProperty(name = "dutyIndexLibId", value = "指标ID")
-    private String indexLibId;
+    private String dutyIndexLibId;
-    @ApiModelProperty(name = "indexLibIdName", value = "指标名称")
+    @ApiModelProperty(name = "dutyIndexLibIdName", value = "指标名称")
-    private String indexLibIdName;
+    private String dutyIndexLibIdName;
 
     @ApiModelProperty(name = "indexGeneralTitle", value = "上报标题")
     private String indexGeneralTitle;
@@ -42,20 +42,20 @@ public class IndexGeneralVO {
         this.indexGeneralId = indexGeneralId;
     }
 
-    public String getIndexLibId() {
+    public String getDutyIndexLibId() {
-        return indexLibId == null ? "" : indexLibId.trim();
+        return dutyIndexLibId;
     }
 
-    public void setIndexLibId(String indexLibId) {
+    public void setDutyIndexLibId(String dutyIndexLibId) {
-        this.indexLibId = indexLibId;
+        this.dutyIndexLibId = dutyIndexLibId;
     }
 
-    public String getIndexLibIdName() {
+    public String getDutyIndexLibIdName() {
-        return indexLibIdName;
+        return dutyIndexLibIdName;
     }
 
-    public void setIndexLibIdName(String indexLibIdName) {
+    public void setDutyIndexLibIdName(String dutyIndexLibIdName) {
-        this.indexLibIdName = indexLibIdName;
+        this.dutyIndexLibIdName = dutyIndexLibIdName;
     }
 
     public String getIndexGeneralTitle() {

src/main/java/com/tenlion/twoduty/service/basiccheckpersonaction/impl/BasicCheckPersonActionServiceImpl.java

@@ -148,6 +148,7 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem
 
     @Override
     public List<BasicCheckPersonActionDTO> list(Map<String, Object> params) {
+        params.put("creator",securityComponent.getCurrentUser().getUserId());
         return basicCheckPersonActionDao.list(params);
     }
 

src/main/java/com/tenlion/twoduty/service/basiccheckpersoninfo/impl/BasicCheckPersonInfoServiceImpl.java

@@ -148,6 +148,7 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen
 
     @Override
     public List<BasicCheckPersonInfoDTO> list(Map<String, Object> params) {
+        params.put("creator",securityComponent.getCurrentUser().getUserId());
         return basicCheckPersonInfoDao.list(params);
     }
 

src/main/java/com/tenlion/twoduty/service/dutylistform/impl/DutyListFormServiceImpl.java

@@ -34,6 +34,7 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
     @Override
     public SuccessResultList<List<PartyCleanMeetingDTO>> listPagePartyCleanMeeting(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
+        page.getParams().put("creator",securityComponent.getCurrentUser().getUserId());
         List<PartyCleanMeetingDTO> dtoList = dutyListFormDao.listPartyCleanMeeting(page.getParams());
         PageInfo<PartyCleanMeetingDTO> pageInfo = new PageInfo<>(dtoList);
         return new SuccessResultList<>(dtoList,pageInfo.getPageNum(),pageInfo.getTotal());
@@ -76,6 +77,7 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
     @Override
     public SuccessResultList<List<HeartTalkDTO>> listPageHeartTalk(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
+        page.getParams().put("creator",securityComponent.getCurrentUser().getUserId());
         List<HeartTalkDTO> dtoList = dutyListFormDao.listHeartTalk(page.getParams());
         PageInfo<HeartTalkDTO> pageInfo = new PageInfo<>(dtoList);
         return new SuccessResultList<>(dtoList,pageInfo.getPageNum(),pageInfo.getTotal());

src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java

@@ -1,6 +1,8 @@
 package com.tenlion.twoduty.service.indexgeneral.impl;
 
+import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
+import ink.wgink.common.component.SecurityComponent;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultList;
@@ -33,6 +35,7 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
     @Autowired
     private IIndexGeneralDao indexGeneralDao;
 
+
     @Override
     public void save(IndexGeneralVO indexGeneralVO) {
         saveReturnId(indexGeneralVO);
@@ -50,6 +53,7 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
 
     @Override
     public String saveReturnId(String token, IndexGeneralVO indexGeneralVO) {
+        indexGeneralVO.setAuditStatus(Integer.parseInt(AuditStatusEnum.NORMAL.getAuditStatus()));
         String indexGeneralId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.beanToMap(indexGeneralVO);
         params.put("indexGeneralId", indexGeneralId);
@@ -93,6 +97,7 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
 
     @Override
     public void update(String token, String indexGeneralId, IndexGeneralVO indexGeneralVO) {
+        indexGeneralVO.setAuditStatus(Integer.parseInt(AuditStatusEnum.NORMAL.getAuditStatus()));
         Map<String, Object> params = HashMapUtil.beanToMap(indexGeneralVO);
         params.put("indexGeneralId", indexGeneralId);
         if (StringUtils.isBlank(token)) {
@@ -141,6 +146,7 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde
 
     @Override
     public List<IndexGeneralDTO> list(Map<String, Object> params) {
+        params.put("creator",securityComponent.getCurrentUser().getUserId());
         return indexGeneralDao.list(params);
     }
 

src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java

@@ -5,6 +5,7 @@ import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibZTreeDTO;
 import com.tenlion.twoduty.pojo.dtos.indextemplate.IndexTemplateDTO;
 import com.tenlion.twoduty.service.indextemplate.IIndexTemplateService;
 import ink.wgink.common.base.DefaultBaseService;
+import ink.wgink.common.component.SecurityComponent;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultList;
@@ -39,6 +40,8 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib
     private IIndexLibDao indexLibDao;
     @Autowired
     private IIndexTemplateService indexTemplateService;
+    @Autowired
+    private SecurityComponent securityComponent;
 
     public IndexLibCountDTO countIndexLib(String indexLibParentId){
         Integer count1 = 0;
@@ -57,14 +60,15 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib
             List<IndexLibDTO> list = this.list(params);
             for (IndexLibDTO indexLibDTO : list) {
                 String templateId = indexLibDTO.getIndexTemplateId();
-                if (StringUtils.isBlank(templateId)) {
+                if (!StringUtils.isBlank(templateId)) {
                     IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(templateId);
                     String templateTableName = indexTemplateDTO.getIndexTemplateTableName();
-                    if (StringUtils.isBlank(templateTableName)) {
+                    if (!StringUtils.isBlank(templateTableName)) {
                         //统计
                         Map<String, Object> counts = new HashMap<String, Object>();
                         counts.put("tableName",templateTableName);
-                        counts.put("indexLibId",indexLibZTreeDTO.getId());
+                        counts.put("indexLibId",indexLibDTO.getIndexLibId());
+                        counts.put("creator",securityComponent.getCurrentUser().getUserId());
                         IndexLibCountDTO indexLibCountDTO = indexLibDao.countIndexLibAuditStatusNum(counts);
                         count1 += indexLibCountDTO.getCount1();
                         count2 += indexLibCountDTO.getCount2();

src/main/java/com/tenlion/twoduty/service/partypunishinfo/impl/PartyPunishInfoServiceImpl.java

@@ -148,6 +148,7 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP
 
     @Override
     public List<PartyPunishInfoDTO> list(Map<String, Object> params) {
+        params.put("creator",securityComponent.getCurrentUser().getUserId());
         return partyPunishInfoDao.list(params);
     }
 

src/main/java/com/tenlion/twoduty/service/problemclue/impl/ProblemClueServiceImpl.java

@@ -148,6 +148,7 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl
 
     @Override
     public List<ProblemClueDTO> list(Map<String, Object> params) {
+        params.put("creator",securityComponent.getCurrentUser().getUserId());
         return problemClueDao.list(params);
     }
 

src/main/java/com/tenlion/twoduty/service/supervisecheck/impl/SuperviseCheckServiceImpl.java

@@ -148,6 +148,7 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu
 
     @Override
     public List<SuperviseCheckDTO> list(Map<String, Object> params) {
+        params.put("creator",securityComponent.getCurrentUser().getUserId());
         return superviseCheckDao.list(params);
     }
 

src/main/resources/mybatis/mapper/basicCheckPersonAction/basicCheckPersonAction-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="basicCheckPersonActionDTO" type="com.tenlion.twoduty.pojo.dtos.basiccheckpersonaction.BasicCheckPersonActionDTO">
         <result column="report_id" property="reportId"/>
         <result column="duty_index_lib_id" property="dutyIndexLibId"/>
+        <result column="duty_index_lib_name" property="dutyIndexLibName"/>
         <result column="action_time" property="actionTime"/>
         <result column="street_org_name" property="streetOrgName"/>
         <result column="community_name" property="communityName"/>
@@ -162,9 +163,12 @@
         t1.work_measures,
         t1.complete_info,
         t1.remarks,
-        t1.audit_status
+        t1.audit_status,
+        t2.index_lib_name duty_index_lib_name
         FROM
         t_basic_check_person_action t1
+        LEFT JOIN duty_index_lib t2
+        ON t1.duty_index_lib_id = t2.index_lib_id
         WHERE
         t1.is_delete = 0
         AND
@@ -262,6 +266,10 @@
         <if test="auditStatus != null and auditStatus != ''">
             AND t1.audit_status = #{auditStatus}
         </if>
+        <if test="creator != '1'.toString()">
+            AND t1.creator = #{creator}
+        </if>
+        ORDER BY t1.gmt_create DESC
     </select>
 
     <!-- 列表 -->

src/main/resources/mybatis/mapper/basicCheckPersonInfo/basicCheckPersonInfo-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="basicCheckPersonInfoDTO" type="com.tenlion.twoduty.pojo.dtos.basiccheckpersoninfo.BasicCheckPersonInfoDTO">
         <result column="report_id" property="reportId"/>
         <result column="duty_index_lib_id" property="dutyIndexLibId"/>
+        <result column="duty_index_lib_name" property="dutyIndexLibName"/>
         <result column="org_name" property="orgName"/>
         <result column="note_taker" property="noteTaker"/>
         <result column="note_date_time" property="noteDateTime"/>
@@ -224,9 +225,12 @@
         t1.join_party_time,
         t1.join_work_time,
         t1.remarks,
-        t1.audit_status
+        t1.audit_status,
+        t2.index_lib_name duty_index_lib_name
         FROM
         t_basic_check_person_info t1
+        LEFT JOIN duty_index_lib t2
+        ON t1.duty_index_lib_id = t2.index_lib_id
         WHERE
         t1.is_delete = 0
        AND
@@ -343,6 +347,10 @@
         <if test="auditStatus != null and auditStatus != ''">
             AND t1.audit_status = #{auditStatus}
         </if>
+        <if test="creator != '1'.toString()">
+            AND t1.creator = #{creator}
+        </if>
+        ORDER BY t1.gmt_create DESC
     </select>
 
     <!-- 列表 -->

src/main/resources/mybatis/mapper/dutylistform/dutylistform-mapper.xml

@@ -43,6 +43,10 @@
         <if test="endTime != null and endTime != ''">
             AND LEFT(t1.meeting_time, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="creator != '1'.toString()">
+            AND t1.creator = #{creator}
+        </if>
+        ORDER BY t1.gmt_create DESC
     </select>
 
     <select id="getPartyCleanMeeting" parameterType="map" resultMap="partyCleanMeetingDTO">
@@ -60,7 +64,7 @@
         ) VALUES (
             #{reportId},#{dutyIndexLibId},#{title},#{meetingTime},#{meetingPlace},#{meetingHost},#{noteTaker},
             #{joinPerson},#{joinPersonCount},#{meetingContent},#{meetingArrange},#{meetingAgenda},#{hostContent},
-            #{partySecretaryTalk},#{auditStatus},#{remarks},#{creator},#{gmtCreate},#{modifier},#{gmtModified},#{isDelete}
+            #{partySecretaryTalk},#{remarks},#{auditStatus},#{creator},#{gmtCreate},#{modifier},#{gmtModified},#{isDelete}
         )
     </insert>
 
@@ -174,6 +178,10 @@
         <if test="endTime != null and endTime != ''">
             AND LEFT(t1.talk_date_time, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="creator != '1'.toString()">
+            AND t1.creator = #{creator}
+        </if>
+        ORDER BY t1.gmt_create DESC
     </select>
 
     <select id="getHeartTalk" parameterType="map" resultMap="heartTalkDTO">

src/main/resources/mybatis/mapper/indexGeneral/indexGeneral-mapper.xml

@@ -4,8 +4,8 @@
 
     <resultMap id="indexGeneralDTO" type="com.tenlion.twoduty.pojo.dtos.indexgeneral.IndexGeneralDTO">
         <result column="index_general_id" property="indexGeneralId"/>
-        <result column="index_lib_id" property="indexLibId"/>
+        <result column="duty_index_lib_id" property="dutyIndexLibId"/>
-        <result column="index_lib_name" property="indexLibName"/>
+        <result column="duty_index_lib_name" property="dutyIndexLibName"/>
         <result column="index_general_title" property="indexGeneralTitle"/>
         <result column="index_general_content" property="indexGeneralContent"/>
         <result column="index_general_file" property="indexGeneralFile"/>
@@ -17,7 +17,7 @@
 
     <resultMap id="indexGeneralBO" type="com.tenlion.twoduty.pojo.bos.indexgeneral.IndexGeneralBO">
         <result column="index_general_id" property="indexGeneralId"/>
-        <result column="index_lib_id" property="indexLibId"/>
+        <result column="duty_index_lib_id" property="dutyIndexLibId"/>
         <result column="index_general_title" property="indexGeneralTitle"/>
         <result column="index_general_content" property="indexGeneralContent"/>
         <result column="index_general_file" property="indexGeneralFile"/>
@@ -32,7 +32,7 @@
 
     <resultMap id="indexGeneralPO" type="com.tenlion.twoduty.pojo.pos.indexgeneral.IndexGeneralPO">
         <result column="index_general_id" property="indexGeneralId"/>
-        <result column="index_lib_id" property="indexLibId"/>
+        <result column="duty_index_lib_id" property="dutyIndexLibId"/>
         <result column="index_general_title" property="indexGeneralTitle"/>
         <result column="index_general_content" property="indexGeneralContent"/>
         <result column="index_general_file" property="indexGeneralFile"/>
@@ -49,7 +49,7 @@
     <insert id="save" parameterType="map">
         INSERT INTO duty_index_general(
             index_general_id,
-            index_lib_id,
+            duty_index_lib_id,
             index_general_title,
             index_general_content,
             index_general_file,
@@ -62,7 +62,7 @@
             is_delete
         ) VALUES(
             #{indexGeneralId},
-            #{indexLibId},
+            #{dutyIndexLibId},
             #{indexGeneralTitle},
             #{indexGeneralContent},
             #{indexGeneralFile},
@@ -136,7 +136,7 @@
     <select id="get" parameterType="map" resultMap="indexGeneralDTO">
         SELECT
         t1.index_general_id,
-        t1.index_lib_id,
+        t1.duty_index_lib_id,
         t1.index_general_title,
         t1.index_general_content,
         t1.index_general_file,
@@ -145,11 +145,11 @@
         t1.index_general_id,
         t1.gmt_create,
         t1.creator,
-        t2.index_lib_name
+        t2.index_lib_name duty_index_lib_name
         FROM
         duty_index_general t1
         LEFT JOIN duty_index_lib t2
-        ON t1.index_lib_id = t2.index_lib_id
+        ON t1.duty_index_lib_id = t2.index_lib_id
         WHERE
         t1.is_delete = 0
         <if test="indexGeneralId != null and indexGeneralId != ''">
@@ -162,7 +162,7 @@
     <select id="getBO" parameterType="map" resultMap="indexGeneralBO">
         SELECT
         t1.index_general_id,
-        t1.index_lib_id,
+        t1.duty_index_lib_id,
         t1.index_general_title,
         t1.index_general_content,
         t1.index_general_file,
@@ -187,7 +187,7 @@
     <select id="getPO" parameterType="map" resultMap="indexGeneralPO">
         SELECT
         t1.index_general_id,
-        t1.index_lib_id,
+        t1.duty_index_lib_id,
         t1.index_general_title,
         t1.index_general_content,
         t1.index_general_file,
@@ -212,7 +212,7 @@
     <select id="list" parameterType="map" resultMap="indexGeneralDTO">
         SELECT
         t1.index_general_id,
-        t1.index_lib_id,
+        t1.duty_index_lib_id,
         t1.index_general_title,
         t1.index_general_content,
         t1.index_general_file,
@@ -220,11 +220,11 @@
         t1.audit_status,
         t1.gmt_create,
         t1.creator,
-        t2.index_lib_name
+        t2.index_lib_name duty_index_lib_name
         FROM
         duty_index_general t1
         LEFT JOIN duty_index_lib t2
-        ON t1.index_lib_id = t2.index_lib_id
+        ON t1.duty_index_lib_id = t2.index_lib_id
         WHERE
         t1.is_delete = 0
         <if test="keywords != null and keywords != ''">
@@ -248,11 +248,23 @@
             </foreach>
         </if>
         <if test="indexLibId != null and indexLibId != ''">
-            AND t1.index_lib_id = #{indexLibId}
+            AND t1.duty_index_lib_id = #{indexLibId}
         </if>
          <if test="auditStatus != null and auditStatus != ''">
             AND t1.audit_status = #{auditStatus}
         </if>
+        <if test="creator != '1'.toString()">
+            AND t1.creator = #{creator}
+        </if>
+        <!--<if test="data_authority != null and data_authority == 'self'">-->
+          <!--AND t1.creator = #{data_creator}-->
+        <!--</if>-->
+        <!--<if test="data_authority != null and (data_authority == 'department' or data_authority == 'custom')">-->
+            <!--AND t1.creator IN-->
+            <!--<foreach collection="data_creators" index="index" open="(" separator="," close=")">-->
+                <!--#{data_creators[${index}]}-->
+            <!--</foreach>-->
+        <!--</if>-->
         ORDER BY t1.gmt_create DESC
     </select>
 
@@ -260,7 +272,7 @@
     <select id="listBO" parameterType="map" resultMap="indexGeneralBO">
         SELECT
         t1.index_general_id,
-        t1.index_lib_id,
+        t1.duty_index_lib_id,
         t1.index_general_title,
         t1.index_general_content,
         t1.index_general_file,
@@ -302,7 +314,7 @@
     <select id="listPO" parameterType="map" resultMap="indexGeneralPO">
         SELECT
         t1.index_general_id,
-        t1.index_lib_id,
+        t1.duty_index_lib_id,
         t1.index_general_title,
         t1.index_general_content,
         t1.index_general_file,

src/main/resources/mybatis/mapper/indexLib/indexLib-mapper.xml

@@ -438,7 +438,11 @@
           COUNT(CASE WHEN `audit_status` = -1 THEN 1 ELSE NULL END) AS 'count_4'
           FROM
             ${tableName}
-          WHERE  is_delete = 0 AND index_lib_id = #{indexLibId}
+          WHERE  is_delete = 0 AND duty_index_lib_id = #{indexLibId}
+        <if test="creator != '1'.toString()">
+            AND creator = #{creator}
+        </if>
+
     </select>
 
 </mapper>

src/main/resources/mybatis/mapper/partyPunishInfo/partyPunishInfo-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="partyPunishInfoDTO" type="com.tenlion.twoduty.pojo.dtos.partypunishinfo.PartyPunishInfoDTO">
         <result column="report_id" property="reportId"/>
         <result column="duty_index_lib_id" property="dutyIndexLibId"/>
+        <result column="duty_index_lib_name" property="dutyIndexLibName"/>
         <result column="person_name" property="personName"/>
         <result column="party_org" property="partyOrg"/>
         <result column="party_discipline" property="partyDiscipline"/>
@@ -225,10 +226,13 @@
         t1.year_bonus_info,
         t1.achievement_bouns,
         t1.remarks,
-        t1.audit_status
+        t1.audit_status,
+        t2.index_lib_name duty_index_lib_name
 
         FROM
         t_party_punish_info t1
+        LEFT JOIN duty_index_lib t2
+        ON t1.duty_index_lib_id = t2.index_lib_id
         WHERE
         t1.is_delete = 0
         AND
@@ -347,6 +351,10 @@
         <if test="auditStatus != null and auditStatus != ''">
            AND t1.audit_status = {auditStatus}
         </if>
+        <if test="creator != '1'.toString()">
+            AND t1.creator = #{creator}
+        </if>
+        ORDER BY t1.gmt_create DESC
     </select>
 
     <!-- 列表 -->

src/main/resources/mybatis/mapper/problemClue/problemClue-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="problemClueDTO" type="com.tenlion.twoduty.pojo.dtos.problemclue.ProblemClueDTO">
         <result column="report_id" property="reportId"/>
         <result column="duty_index_lib_id" property="dutyIndexLibId"/>
+        <result column="duty_index_lib_name" property="dutyIndexLibName"/>
         <result column="case_number" property="caseNumber"/>
         <result column="handover_number" property="handoverNumber"/>
         <result column="be_reported_person" property="beReportedPerson"/>
@@ -244,12 +245,16 @@
         t1.over_status,
         t1.case_result,
         t1.remarks,
-        t1.audit_status
+        t1.audit_status,
+        t2.index_lib_name duty_index_lib_name
         FROM
         t_problem_clue t1
+        LEFT JOIN duty_index_lib t2
+        ON t1.duty_index_lib_id = t2.index_lib_id
         WHERE
         t1.is_delete = 0
-        <!-- 添加条件 -->
+        AND
+        t1.report_id = #{reportId}
     </select>
 
     <!-- 详情 -->
@@ -283,7 +288,8 @@
         t_problem_clue t1
         WHERE
         t1.is_delete = 0
-        <!-- 添加条件 -->
+        AND
+        t1.report_id = #{reportId}
     </select>
 
     <!-- 详情 -->
@@ -317,7 +323,8 @@
         t_problem_clue t1
         WHERE
         t1.is_delete = 0
-        <!-- 添加条件 -->
+         AND
+        t1.report_id = #{reportId}
     </select>
 
     <!-- 列表 -->
@@ -368,6 +375,10 @@
         <if test="auditStatus != null and auditStatus != ''">
             AND t1.audit_status = #{auditStatus}
         </if>
+        <if test="creator != '1'.toString()">
+            AND t1.creator = #{creator}
+        </if>
+        ORDER BY t1.gmt_create DESC
     </select>
 
     <!-- 列表 -->

src/main/resources/mybatis/mapper/superviseCheck/superviseCheck-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="superviseCheckDTO" type="com.tenlion.twoduty.pojo.dtos.supervisecheck.SuperviseCheckDTO">
         <result column="report_id" property="reportId"/>
         <result column="duty_index_lib_id" property="dutyIndexLibId"/>
+        <result column="duty_index_lib_name" property="dutyIndexLibName"/>
         <result column="check_photos" property="checkPhotos"/>
         <result column="check_place" property="checkPlace"/>
         <result column="check_person" property="checkPerson"/>
@@ -173,12 +174,16 @@
         t1.check_content,
         t1.check_problem,
         t1.check_result,
-        t1.audit_status
+        t1.audit_status,
+        t2.index_lib_name duty_index_lib_name
         FROM
         t_supervise_check t1
+        LEFT JOIN duty_index_lib t2
+        ON t1.duty_index_lib_id = t2.index_lib_id
         WHERE
         t1.is_delete = 0
-        <!-- 添加条件 -->
+        AND
+          t1.report_id = #{reportId}
     </select>
 
     <!-- 详情 -->
@@ -204,7 +209,8 @@
         t_supervise_check t1
         WHERE
         t1.is_delete = 0
-        <!-- 添加条件 -->
+         AND
+          t1.report_id = #{reportId}
     </select>
 
     <!-- 详情 -->
@@ -230,7 +236,8 @@
         t_supervise_check t1
         WHERE
         t1.is_delete = 0
-        <!-- 添加条件 -->
+         AND
+          t1.report_id = #{reportId}
     </select>
 
     <!-- 列表 -->
@@ -254,7 +261,7 @@
         <if test="keywords != null and keywords != ''">
             AND (
             <!-- 这里添加其他条件 -->
-            t1.id LIKE CONCAT('%', #{keywords}, '%')
+            t1.check_place LIKE CONCAT('%', #{keywords}, '%')
             )
         </if>
         <if test="startTime != null and startTime != ''">
@@ -271,6 +278,9 @@
         <if test="auditStatus != null and auditStatus != ''">
             AND t1.audit_status = #{auditStatus}
         </if>
+        <if test="creator != '1'.toString()">
+            AND t1.creator = #{creator}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -299,7 +309,7 @@
         <if test="keywords != null and keywords != ''">
             AND (
             <!-- 这里添加其他条件 -->
-            t1.id LIKE CONCAT('%', #{keywords}, '%')
+            t1.check_place LIKE CONCAT('%', #{keywords}, '%')
             )
         </if>
         <if test="startTime != null and startTime != ''">
@@ -341,7 +351,7 @@
         <if test="keywords != null and keywords != ''">
             AND (
             <!-- 这里添加其他条件 -->
-            t1.id LIKE CONCAT('%', #{keywords}, '%')
+            t1.check_place LIKE CONCAT('%', #{keywords}, '%')
             )
         </if>
         <if test="startTime != null and startTime != ''">

src/main/resources/static/route/basicCheckPersonAction/list.html

@@ -84,12 +84,7 @@
                 },
                 cols: [
                     [
-                        {width:80, title: '操作', fixed: 'left', align:'center',
+
-                            templet: function(row){
-                                let dom = '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">详情</a>'
-                                return dom;
-                            }
-                        },
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
 
                         {field: 'streetOrgName', width: 180, title: '街道办事处', align:'center',
@@ -155,6 +150,12 @@
                                 return rowData;
                             }
                         },
+                        {width:80, title: '操作', fixed: 'right', align:'center',
+                            templet: function(row){
+                                let dom = '<a type="button" class="layui-btn layui-btn-xs" lay-event="showEvent">详情</a>'
+                                return dom;
+                            }
+                        },
                     ]
                 ],
                 page: true,

src/main/resources/static/route/basicCheckPersonInfo/list.html

@@ -84,12 +84,7 @@
                 },
                 cols: [
                     [
-                        {width:80, title: '操作', fixed: 'left', align:'center',
+
-                            templet: function(row){
-                                let dom = '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">详情</a>'
-                                return dom;
-                            }
-                        },
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
                         {field: 'orgName', width: 180, title: '单位名称', align:'center',
                             templet: function(row) {
@@ -217,6 +212,12 @@
                                 return rowData;
                             }
                         },
+                        {width:80, title: '操作', fixed: 'right', align:'center',
+                            templet: function(row){
+                                let dom = '<a type="button" class="layui-btn layui-btn-xs" lay-event="showEvent">详情</a>'
+                                return dom;
+                            }
+                        },
                     ]
                 ],
                 page: true,

src/main/resources/static/route/indexGeneral/list.html

@@ -83,7 +83,7 @@
                     [
                         /*{type:'checkbox', fixed: 'left'},*/
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                        {field: 'indexLibName', width: 250, title: '指标名称', align:'center',
+                        {field: 'dutyIndexLibName', width: 250, title: '指标名称', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@@ -188,7 +188,7 @@
                                 if (auditStatus === -1) {
                                     rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="update">编辑</button>';
                                 }
-                                rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="audithistory">审核记录</button>'
+                                // rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="audithistory">审核记录</button>'
                                 rowData +='</div>';
                                 return rowData;
                             }

src/main/resources/static/route/indexGeneral/save.html

@@ -25,8 +25,8 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">所属指标</label>
                     <div class="layui-input-block">
-                        <input type="hidden" id="indexLibId" name="indexLibId">
+                        <input type="hidden" id="dutyIndexLibId" name="dutyIndexLibId">
-                        <input type="text" id="indexLibName" name="indexLibName" class="layui-input" readonly="readonly">
+                        <input type="text" id="dutyIndexLibName" name="dutyIndexLibName" class="layui-input" readonly="readonly">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -330,8 +330,8 @@
             var loadLayerIndex;
             top.restAjax.get(top.restAjax.path('api/indexlib/get/{indexLibId}', [indexLibId]), {}, null, function(code, data) {
                 var dataFormData = {};
-                dataFormData['indexLibId'] = data.indexLibId;
+                dataFormData['dutyIndexLibId'] = data.indexLibId;
-                dataFormData['indexLibName'] = data.indexLibName;
+                dataFormData['dutyIndexLibName'] = data.indexLibName;
                 form.val('dataForm', dataFormData);
                 form.render(null, 'dataForm');
                 initIndexGeneralFileUploadFile();

src/main/resources/static/route/indexGeneral/show.html

@@ -25,8 +25,8 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">所属指标</label>
                     <div class="layui-input-block">
-                        <input type="hidden" id="indexLibId" name="indexLibId">
+                        <input type="hidden" id="dutyIndexLibId" name="dutyIndexLibId">
-                        <input type="text" id="indexLibName" name="indexLibName" class="layui-input" readonly="readonly">
+                        <input type="text" id="dutyIndexLibName" name="dutyIndexLibName" class="layui-input" readonly="readonly">
                     </div>
                 </div>
                 <div class="layui-form-item">

src/main/resources/static/route/indexGeneral/update.html

@@ -25,8 +25,8 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">所属指标</label>
                     <div class="layui-input-block">
-                        <input type="hidden" id="indexLibId" name="indexLibId">
+                        <input type="hidden" id="dutyIndexLibId" name="dutyIndexLibId">
-                        <input type="text" id="indexLibName" name="indexLibName" class="layui-input" readonly="readonly">
+                        <input type="text" id="dutyIndexLibName" name="dutyIndexLibName" class="layui-input" readonly="readonly">
                     </div>
                 </div>
                 <div class="layui-form-item">

src/main/resources/static/route/partyPunishInfo/list.html

@@ -84,12 +84,7 @@
                 },
                 cols: [
                     [
-                        {width:80, title: '操作', fixed: 'left', align:'center',
+
-                            templet: function(row){
-                                let dom = '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">详情</a>'
-                                return dom;
-                            }
-                        },
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
                         {field: 'personName', width: 180, title: '姓名', align:'center',
                             templet: function(row) {
@@ -154,6 +149,12 @@
                                 return rowData;
                             }
                         },
+                        {width:80, title: '操作', fixed: 'right', align:'center',
+                            templet: function(row){
+                                let dom = '<a type="button" class="layui-btn layui-btn-xs" lay-event="showEvent">详情</a>'
+                                return dom;
+                            }
+                        },
                     ]
                 ],
                 page: true,

src/main/resources/static/route/partycleanmeeting/list-party-clean-meeting.html

@@ -103,12 +103,7 @@
                 },
                 cols: [
                     [
-                        {width:80, title: '操作', fixed: 'left', align:'center',
+
-                            templet: function(row){
-                                let dom = '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">详情</a>'
-                                return dom;
-                            }
-                        },
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
                         {field: 'title', width: 250, title: '标题', align:'center',
                             templet: function(row) {
@@ -218,6 +213,12 @@
                                 return rowData;
                             }
                         },
+                        {width:80, title: '操作', fixed: 'right', align:'center',
+                            templet: function(row){
+                                let dom = '<a type="button" class="layui-btn layui-btn-xs" lay-event="showEvent">详情</a>'
+                                return dom;
+                            }
+                        },
                     ]
                 ],
                 page: true,

src/main/resources/static/route/problemClue/list.html

@@ -84,12 +84,6 @@
                 },
                 cols: [
                     [
-                        {width:80, title: '操作', fixed: 'left', align:'center',
-                            templet: function(row){
-                                let dom = '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">详情</a>'
-                                return dom;
-                            }
-                        },
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
                         {field: 'caseNumber', width: 180, title: '案件号', align:'center',
                             templet: function(row) {
@@ -253,6 +247,12 @@
                                 return rowData;
                             }
                         },
+                        {width:80, title: '操作', fixed: 'right', align:'center',
+                            templet: function(row){
+                                let dom = '<a type="button" class="layui-btn layui-btn-xs" lay-event="showEvent">详情</a>'
+                                return dom;
+                            }
+                        },
                     ]
                 ],
                 page: true,

src/main/resources/static/route/superviseCheck/list.html

@@ -84,12 +84,7 @@
                 },
                 cols: [
                     [
-                        {width:80, title: '操作', fixed: 'left', align:'center',
+
-                            templet: function(row){
-                                let dom = '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">详情</a>'
-                                return dom;
-                            }
-                        },
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
                         {field: 'checkPlace', width: 180, title: '检查地点', align:'center',
                             templet: function(row) {
@@ -154,6 +149,12 @@
                                 return rowData;
                             }
                         },
+                        {width:80, title: '操作', fixed: 'right', align:'center',
+                            templet: function(row){
+                                let dom = '<a type="button" class="layui-btn layui-btn-xs" lay-event="showEvent">详情</a>'
+                                return dom;
+                            }
+                        },
                     ]
                 ],
                 page: true,

src/main/resources/static/route/superviseCheck/show.html

@@ -17,9 +17,10 @@
         <div class="layui-card-body" style="padding: 15px;">
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
                 <div class="layui-form-item">
-                    <label class="layui-form-label">指标ID</label>
+                    <label class="layui-form-label">所属指标</label>
                     <div class="layui-input-block">
-                        <input type="text" id="dutyIndexLibId" name="dutyIndexLibId" class="layui-input" value="" placeholder="请输入指标ID"  maxlength="36">
+                        <input type="hidden" id="dutyIndexLibId" name="dutyIndexLibId">
+                        <input type="text" id="dutyIndexLibName" name="dutyIndexLibName" class="layui-input" value="" placeholder="所属指标"  maxlength="36">
                     </div>
                 </div>
                 <div class="layui-form-item">