指标模板添加审核状态

src/main/java/com/tenlion/twoduty/pojo/bos/basiccheckpersonaction/BasicCheckPersonActionBO.java

@@ -24,6 +24,7 @@ public class BasicCheckPersonActionBO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private Integer auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -137,5 +138,11 @@ public class BasicCheckPersonActionBO {
         this.isDelete = isDelete;
     }
 
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
 
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/bos/basiccheckpersoninfo/BasicCheckPersonInfoBO.java

@@ -31,6 +31,7 @@ public class BasicCheckPersonInfoBO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private Integer auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -200,5 +201,11 @@ public class BasicCheckPersonInfoBO {
         this.isDelete = isDelete;
     }
 
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
 
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/bos/partypunishinfo/PartyPunishInfoBO.java

@@ -31,6 +31,7 @@ public class PartyPunishInfoBO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -200,5 +201,11 @@ public class PartyPunishInfoBO {
         this.isDelete = isDelete;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/bos/problemclue/ProblemClueBO.java

@@ -33,6 +33,7 @@ public class ProblemClueBO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -218,5 +219,11 @@ public class ProblemClueBO {
         this.isDelete = isDelete;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/bos/supervisecheck/SuperviseCheckBO.java

@@ -25,6 +25,7 @@ public class SuperviseCheckBO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -146,5 +147,11 @@ public class SuperviseCheckBO {
         this.isDelete = isDelete;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersonaction/BasicCheckPersonActionDTO.java

@@ -36,6 +36,8 @@ public class BasicCheckPersonActionDTO {
     private String completeInfo;
     @ApiModelProperty(name = "remarks", value = "备注")
     private String remarks;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
 
     public String getReportId() {
@@ -118,5 +120,11 @@ public class BasicCheckPersonActionDTO {
         this.remarks = remarks;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersoninfo/BasicCheckPersonInfoDTO.java

@@ -50,6 +50,8 @@ public class BasicCheckPersonInfoDTO {
     private String joinWorkTime;
     @ApiModelProperty(name = "remarks", value = "备注")
     private String remarks;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -188,5 +190,11 @@ public class BasicCheckPersonInfoDTO {
         this.remarks = remarks;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/partypunishinfo/PartyPunishInfoDTO.java

@@ -54,6 +54,8 @@ public class PartyPunishInfoDTO {
     private String creator;
     @ApiModelProperty(name = "gmtCreate", value = "创建时间")
     private String gmtCreate;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -207,5 +209,11 @@ public class PartyPunishInfoDTO {
         this.gmtCreate = gmtCreate;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/problemclue/ProblemClueDTO.java

@@ -59,6 +59,8 @@ public class ProblemClueDTO {
     private String creator;
     @ApiModelProperty(name = "gmtCreate", value = "")
     private String gmtCreate;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -228,5 +230,11 @@ public class ProblemClueDTO {
         this.gmtCreate = gmtCreate;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/dtos/supervisecheck/SuperviseCheckDTO.java

@@ -38,6 +38,8 @@ public class SuperviseCheckDTO {
     private String checkProblem;
     @ApiModelProperty(name = "checkResult", value = "处理结果")
     private String checkResult;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -127,5 +129,11 @@ public class SuperviseCheckDTO {
         this.checkResult = checkResult;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/pos/basiccheckpersonaction/BasicCheckPersonActionPO.java

@@ -24,6 +24,7 @@ public class BasicCheckPersonActionPO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private Integer auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -137,5 +138,11 @@ public class BasicCheckPersonActionPO {
         this.isDelete = isDelete;
     }
 
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
 
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/pos/basiccheckpersoninfo/BasicCheckPersonInfoPO.java

@@ -31,6 +31,7 @@ public class BasicCheckPersonInfoPO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private Integer auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -200,5 +201,11 @@ public class BasicCheckPersonInfoPO {
         this.isDelete = isDelete;
     }
 
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
 
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/pos/partypunishinfo/PartyPunishInfoPO.java

@@ -31,6 +31,7 @@ public class PartyPunishInfoPO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -200,5 +201,11 @@ public class PartyPunishInfoPO {
         this.isDelete = isDelete;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/pos/problemclue/ProblemCluePO.java

@@ -33,6 +33,7 @@ public class ProblemCluePO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -218,5 +219,11 @@ public class ProblemCluePO {
         this.isDelete = isDelete;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/pos/supervisecheck/SuperviseCheckPO.java

@@ -25,6 +25,7 @@ public class SuperviseCheckPO {
     private String modifier;
     private String gmtModified;
     private Integer isDelete;
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -146,5 +147,11 @@ public class SuperviseCheckPO {
         this.isDelete = isDelete;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/vos/basiccheckpersonaction/BasicCheckPersonActionVO.java

@@ -37,6 +37,8 @@ public class BasicCheckPersonActionVO {
     private String completeInfo;
     @ApiModelProperty(name = "remarks", value = "备注")
     private String remarks;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -118,5 +120,11 @@ public class BasicCheckPersonActionVO {
         this.remarks = remarks;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/vos/basiccheckpersoninfo/BasicCheckPersonInfoVO.java

@@ -55,6 +55,8 @@ public class BasicCheckPersonInfoVO {
     private String joinWorkTime;
     @ApiModelProperty(name = "remarks", value = "备注")
     private String remarks;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -192,5 +194,11 @@ public class BasicCheckPersonInfoVO {
         this.remarks = remarks;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/vos/partypunishinfo/PartyPunishInfoVO.java

@@ -53,6 +53,8 @@ public class PartyPunishInfoVO {
     private String achievementBouns;
     @ApiModelProperty(name = "remarks", value = "备注")
     private String remarks;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -190,5 +192,11 @@ public class PartyPunishInfoVO {
         this.remarks = remarks;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/vos/problemclue/ProblemClueVO.java

@@ -58,6 +58,8 @@ public class ProblemClueVO {
     private String caseResult;
     @ApiModelProperty(name = "remarks", value = "备注")
     private String remarks;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -211,5 +213,11 @@ public class ProblemClueVO {
         this.remarks = remarks;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

src/main/java/com/tenlion/twoduty/pojo/vos/supervisecheck/SuperviseCheckVO.java

@@ -41,6 +41,8 @@ public class SuperviseCheckVO {
     private String checkProblem;
     @ApiModelProperty(name = "checkResult", value = "处理结果")
     private String checkResult;
+    @ApiModelProperty(name = "auditStatus", value = "审核状态")
+    private String auditStatus;
 
     public String getReportId() {
         return reportId == null ? "" : reportId.trim();
@@ -130,5 +132,11 @@ public class SuperviseCheckVO {
         this.checkResult = checkResult;
     }
 
+    public String getAuditStatus() {
+        return auditStatus == null ? "" : auditStatus;
+    }
 
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.tenlion.twoduty.service.basiccheckpersonaction.impl;
 
+import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -58,6 +59,9 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem
         } else {
             setAppSaveInfo(token, params);
         }
+        if(StringUtils.isBlank(basicCheckPersonActionVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         basicCheckPersonActionDao.save(params);
         return reportId;
     }
@@ -100,6 +104,9 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem
         } else {
             setAppUpdateInfo(token, params);
         }
+        if(StringUtils.isBlank(basicCheckPersonActionVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         basicCheckPersonActionDao.update(params);
     }
 

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

@@ -1,5 +1,6 @@
 package com.tenlion.twoduty.service.basiccheckpersoninfo.impl;
 
+import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -58,6 +59,9 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen
         } else {
             setAppSaveInfo(token, params);
         }
+        if(StringUtils.isBlank(basicCheckPersonInfoVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         basicCheckPersonInfoDao.save(params);
         return reportId;
     }
@@ -100,6 +104,9 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen
         } else {
             setAppUpdateInfo(token, params);
         }
+        if(StringUtils.isBlank(basicCheckPersonInfoVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         basicCheckPersonInfoDao.update(params);
     }
 

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

@@ -60,6 +60,9 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
     public void updatePartyCleanMeeting(PartyCleanMeetingVO partyCleanMeetingVO) {
         Map<String,Object> params = HashMapUtil.beanToMap(partyCleanMeetingVO);
         setUpdateInfo(params);
+        if(StringUtils.isBlank(partyCleanMeetingVO.getAuditStatus())){
+            params.put("auditStatus",AuditStatusEnum.NORMAL);
+        }
         dutyListFormDao.updatePartyCleanMeeting(params);
     }
 
@@ -99,6 +102,9 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
     public void updateHeartTalk(HeartTalkDTO heartTalkDTO) {
         Map<String,Object> params = HashMapUtil.beanToMap(heartTalkDTO);
         setUpdateInfo(params);
+        if(StringUtils.isBlank(heartTalkDTO.getAuditStatus())){
+            params.put("auditStatus",AuditStatusEnum.NORMAL);
+        }
         dutyListFormDao.updateHeartTalk(params);
     }
 

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

@@ -1,5 +1,6 @@
 package com.tenlion.twoduty.service.partypunishinfo.impl;
 
+import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -58,6 +59,9 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP
         } else {
             setAppSaveInfo(token, params);
         }
+        if(StringUtils.isBlank(partyPunishInfoVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         partyPunishInfoDao.save(params);
         return reportId;
     }
@@ -100,6 +104,9 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP
         } else {
             setAppUpdateInfo(token, params);
         }
+        if(StringUtils.isBlank(partyPunishInfoVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         partyPunishInfoDao.update(params);
     }
 

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

@@ -1,5 +1,6 @@
 package com.tenlion.twoduty.service.problemclue.impl;
 
+import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -58,6 +59,9 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl
         } else {
             setAppSaveInfo(token, params);
         }
+        if(StringUtils.isBlank(problemClueVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         problemClueDao.save(params);
         return reportId;
     }
@@ -100,6 +104,9 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl
         } else {
             setAppUpdateInfo(token, params);
         }
+        if(StringUtils.isBlank(problemClueVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         problemClueDao.update(params);
     }
 

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

@@ -1,5 +1,6 @@
 package com.tenlion.twoduty.service.supervisecheck.impl;
 
+import com.tenlion.twoduty.utils.AuditStatusEnum;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -58,6 +59,9 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu
         } else {
             setAppSaveInfo(token, params);
         }
+        if(StringUtils.isBlank(superviseCheckVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         superviseCheckDao.save(params);
         return reportId;
     }
@@ -100,6 +104,9 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu
         } else {
             setAppUpdateInfo(token, params);
         }
+        if(StringUtils.isBlank(superviseCheckVO.getAuditStatus())){
+            params.put("auditStatus", AuditStatusEnum.NORMAL);
+        }
         superviseCheckDao.update(params);
     }
 

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

@@ -12,6 +12,8 @@
         <result column="work_measures" property="workMeasures"/>
         <result column="complete_info" property="completeInfo"/>
         <result column="remarks" property="remarks"/>
+        <result column="remarks" property="remarks"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="basicCheckPersonActionBO" type="com.tenlion.twoduty.pojo.bos.basiccheckpersonaction.BasicCheckPersonActionBO">
@@ -29,6 +31,7 @@
         <result column="modifier" property="modifier"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="basicCheckPersonActionPO" type="com.tenlion.twoduty.pojo.pos.basiccheckpersonaction.BasicCheckPersonActionPO">
@@ -46,6 +49,7 @@
         <result column="modifier" property="modifier"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <!-- 新增 -->
@@ -60,6 +64,7 @@
             work_measures,
             complete_info,
             remarks,
+            audit_status,
             creator,
             gmt_create,
             modifier,
@@ -75,6 +80,7 @@
             #{workMeasures},
             #{completeInfo},
             #{remarks},
+            #{auditStatus},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -135,6 +141,9 @@
         <if test="remarks != null and remarks != ''">
             remarks = #{remarks},
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            audit_status = #{auditStatus},
+        </if>
         gmt_modified = #{gmtModified},
         modifier = #{modifier}
         WHERE
@@ -152,7 +161,8 @@
         t1.work_require,
         t1.work_measures,
         t1.complete_info,
-        t1.remarks
+        t1.remarks,
+        t1.audit_status
         FROM
         t_basic_check_person_action t1
         WHERE
@@ -174,6 +184,7 @@
         t1.work_measures,
         t1.complete_info,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -200,6 +211,7 @@
         t1.work_measures,
         t1.complete_info,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -224,7 +236,8 @@
         t1.work_require,
         t1.work_measures,
         t1.complete_info,
-        t1.remarks
+        t1.remarks,
+        t1.audit_status
         FROM
         t_basic_check_person_action t1
         WHERE
@@ -246,6 +259,9 @@
         <if test="indexLibId != null and indexLibId != ''">
             AND t1.duty_index_lib_id = #{indexLibId}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -260,6 +276,7 @@
         t1.work_measures,
         t1.complete_info,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -283,6 +300,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -297,6 +317,7 @@
         t1.work_measures,
         t1.complete_info,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -320,6 +341,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 统计  -->

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

@@ -19,6 +19,7 @@
         <result column="join_party_time" property="joinPartyTime"/>
         <result column="join_work_time" property="joinWorkTime"/>
         <result column="remarks" property="remarks"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="basicCheckPersonInfoBO" type="com.tenlion.twoduty.pojo.bos.basiccheckpersoninfo.BasicCheckPersonInfoBO">
@@ -43,6 +44,7 @@
         <result column="modifier" property="modifier"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="basicCheckPersonInfoPO" type="com.tenlion.twoduty.pojo.pos.basiccheckpersoninfo.BasicCheckPersonInfoPO">
@@ -88,6 +90,7 @@
             join_party_time,
             join_work_time,
             remarks,
+            audit_status,
             creator,
             gmt_create,
             modifier,
@@ -110,6 +113,7 @@
             #{joinPartyTime},
             #{joinWorkTime},
             #{remarks},
+            #{auditStatus},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -191,6 +195,9 @@
         <if test="remarks != null and remarks != ''">
             remarks = #{remarks},
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            audit_status = #{auditStatus},
+        </if>
         gmt_modified = #{gmtModified},
         modifier = #{modifier}
         WHERE
@@ -216,7 +223,8 @@
         t1.college_name,
         t1.join_party_time,
         t1.join_work_time,
-        t1.remarks
+        t1.remarks,
+        t1.audit_status
         FROM
         t_basic_check_person_info t1
         WHERE
@@ -244,6 +252,7 @@
         t1.join_party_time,
         t1.join_work_time,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -276,6 +285,7 @@
         t1.join_party_time,
         t1.join_work_time,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -307,7 +317,8 @@
         t1.college_name,
         t1.join_party_time,
         t1.join_work_time,
-        t1.remarks
+        t1.remarks,
+        t1.audit_status
         FROM
         t_basic_check_person_info t1
         WHERE
@@ -326,9 +337,12 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
-         <if test="indexLibId != null and indexLibId != ''">
+        <if test="indexLibId != null and indexLibId != ''">
             AND t1.duty_index_lib_id = #{indexLibId}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -350,6 +364,7 @@
         t1.join_party_time,
         t1.join_work_time,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -373,6 +388,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -394,6 +412,7 @@
         t1.join_party_time,
         t1.join_work_time,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -417,6 +436,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 统计  -->

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

@@ -21,6 +21,7 @@
         <result column="remarks" property="remarks"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="partyPunishInfoBO" type="com.tenlion.twoduty.pojo.bos.partypunishinfo.PartyPunishInfoBO">
@@ -45,6 +46,7 @@
         <result column="modifier" property="modifier"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="partyPunishInfoPO" type="com.tenlion.twoduty.pojo.pos.partypunishinfo.PartyPunishInfoPO">
@@ -90,6 +92,7 @@
             year_bonus_info,
             achievement_bouns,
             remarks,
+            audit_status,
             creator,
             gmt_create,
             modifier,
@@ -112,6 +115,7 @@
             #{yearBonusInfo},
             #{achievementBouns},
             #{remarks},
+            #{auditStatus},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -193,6 +197,9 @@
         <if test="remarks != null and remarks != ''">
             remarks = #{remarks},
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            audit_status = #{auditStatus},
+        </if>
         gmt_modified = #{gmtModified},
         modifier = #{modifier}
         WHERE
@@ -217,7 +224,8 @@
         t1.year_examine_level,
         t1.year_bonus_info,
         t1.achievement_bouns,
-        t1.remarks
+        t1.remarks,
+        t1.audit_status
 
         FROM
         t_party_punish_info t1
@@ -246,6 +254,7 @@
         t1.year_bonus_info,
         t1.achievement_bouns,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -278,6 +287,7 @@
         t1.year_bonus_info,
         t1.achievement_bouns,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -310,6 +320,7 @@
         t1.year_bonus_info,
         t1.achievement_bouns,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create
         FROM
@@ -330,9 +341,12 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
-         <if test="indexLibId != null and indexLibId != ''">
+        <if test="indexLibId != null and indexLibId != ''">
            AND t1.duty_index_lib_id = {indexLibId}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+           AND t1.audit_status = {auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -354,6 +368,7 @@
         t1.year_bonus_info,
         t1.achievement_bouns,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -377,6 +392,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -398,6 +416,7 @@
         t1.year_bonus_info,
         t1.achievement_bouns,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -421,6 +440,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 统计  -->

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

@@ -23,6 +23,7 @@
         <result column="remarks" property="remarks"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="problemClueBO" type="com.tenlion.twoduty.pojo.bos.problemclue.ProblemClueBO">
@@ -49,6 +50,7 @@
         <result column="modifier" property="modifier"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="problemCluePO" type="com.tenlion.twoduty.pojo.pos.problemclue.ProblemCluePO">
@@ -75,6 +77,7 @@
         <result column="modifier" property="modifier"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <!-- 新增 -->
@@ -98,6 +101,7 @@
             over_status,
             case_result,
             remarks,
+            audit_status,
             creator,
             gmt_create,
             modifier,
@@ -122,6 +126,7 @@
             #{overStatus},
             #{caseResult},
             #{remarks},
+            #{auditStatus},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -209,6 +214,9 @@
         <if test="remarks != null and remarks != ''">
             remarks = #{remarks},
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            audit_status = #{auditStatus},
+        </if>
         gmt_modified = #{gmtModified},
         modifier = #{modifier}
         WHERE
@@ -235,7 +243,8 @@
         t1.may_result_opinion,
         t1.over_status,
         t1.case_result,
-        t1.remarks
+        t1.remarks,
+        t1.audit_status
         FROM
         t_problem_clue t1
         WHERE
@@ -264,6 +273,7 @@
         t1.over_status,
         t1.case_result,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -297,6 +307,7 @@
         t1.over_status,
         t1.case_result,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -330,6 +341,7 @@
         t1.over_status,
         t1.case_result,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create
         FROM
@@ -350,9 +362,12 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
-         <if test="indexLibId != null and indexLibId != ''">
+        <if test="indexLibId != null and indexLibId != ''">
             AND t1.duty_index_lib_id = #{indexLibId}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -376,6 +391,7 @@
         t1.over_status,
         t1.case_result,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -399,6 +415,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -422,6 +441,7 @@
         t1.over_status,
         t1.case_result,
         t1.remarks,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -445,6 +465,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 统计  -->

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

@@ -13,6 +13,7 @@
         <result column="check_content" property="checkContent"/>
         <result column="check_problem" property="checkProblem"/>
         <result column="check_result" property="checkResult"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="superviseCheckBO" type="com.tenlion.twoduty.pojo.bos.supervisecheck.SuperviseCheckBO">
@@ -31,6 +32,7 @@
         <result column="modifier" property="modifier"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <resultMap id="superviseCheckPO" type="com.tenlion.twoduty.pojo.pos.supervisecheck.SuperviseCheckPO">
@@ -49,6 +51,7 @@
         <result column="modifier" property="modifier"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
     <!-- 新增 -->
@@ -64,6 +67,7 @@
             check_content,
             check_problem,
             check_result,
+            audit_status,
             creator,
             gmt_create,
             modifier,
@@ -80,6 +84,7 @@
             #{checkContent},
             #{checkProblem},
             #{checkResult},
+            #{auditStatus},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -146,6 +151,9 @@
         <if test="checkResult != null and checkResult != ''">
             check_result = #{checkResult},
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            audit_status = #{auditStatus},
+        </if>
         gmt_modified = #{gmtModified},
         modifier = #{modifier}
         WHERE
@@ -165,7 +173,7 @@
         t1.check_content,
         t1.check_problem,
         t1.check_result,
-        1
+        t1.audit_status
         FROM
         t_supervise_check t1
         WHERE
@@ -186,6 +194,7 @@
         t1.check_content,
         t1.check_problem,
         t1.check_result,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -211,6 +220,7 @@
         t1.check_content,
         t1.check_problem,
         t1.check_result,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -235,7 +245,8 @@
         t1.check_info,
         t1.check_content,
         t1.check_problem,
-        t1.check_result
+        t1.check_result,
+        t1.audit_status
         FROM
         t_supervise_check t1
         WHERE
@@ -254,9 +265,12 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
-         <if test="indexLibId != null and indexLibId != ''">
+        <if test="indexLibId != null and indexLibId != ''">
             AND t1.duty_index_lib_id = #{indexLibId}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -272,6 +286,7 @@
         t1.check_content,
         t1.check_problem,
         t1.check_result,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -295,6 +310,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -310,6 +328,7 @@
         t1.check_content,
         t1.check_problem,
         t1.check_result,
+        t1.audit_status,
         t1.creator,
         t1.gmt_create,
         t1.modifier,
@@ -333,6 +352,9 @@
             AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND t1.audit_status = #{auditStatus}
+        </if>
     </select>
 
     <!-- 统计  -->