1.异地登记增加失能退出功能 2.补卡审核流程增加历史记录

account/account-service/src/main/java/com/hungraim/ltc/account/dao/ChSrvTaskDetailAuditLogMapper.java

+package com.hungraim.ltc.account.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailAuditLog;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListResp;
+import com.hungraim.ltc.pojo.vo.account.SrvTaskDetailAuditLogRespVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Mapper
+@Repository
+public interface ChSrvTaskDetailAuditLogMapper extends BaseMapper<ChSrvTaskDetailAuditLog> {
+    @Select("<script>" +
+            "select f.task_detail_id,f.check_status,f.auditor,                          \n" +
+            " f.audit_remark,to_char(f.check_time,'yyyy-mm-dd hh24:mi:ss') check_time,    \n" +
+            " f.check_num  from Ch_Srv_Task_Detail_audit_log f                           \n" +
+            " where f.task_detail_id=#{taskDetailId}     </script>")
+    List<SrvTaskDetailAuditLogRespVO> getSrvTaskDetailAuditLogList(Long taskDetailId);
+
+}
+
+

account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java

@@ -20,6 +20,7 @@ import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.account.*;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvPlan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailAuditLog;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskFinishItem;
 import com.hungraim.ltc.pojo.vo.account.*;
 import com.hungraim.ltc.pojo.vo.disable.PlaceOtherVO;
@@ -58,6 +59,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
     private final ChDisabAccountsDetailMapper chDisabAccountsDetailMapper;
     private final ChDisabFreeRdInfoMapper chDisabFreeRdInfoMapper;
     private final ChSrvPlanMapper chSrvPlanMapper;
+    private final ChSrvTaskDetailAuditLogMapper chSrvTaskDetailAuditLogMapper;
 
 
     @Autowired
@@ -769,6 +771,10 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         srvTaskCardRespDTO.setTaskDetailId(records.get(0).getTaskDetailId());
         srvTaskCardRespDTO.setDisabInfoId(records.get(0).getDisabInfoId());
         srvTaskCardRespDTO.setSrvTaskId(Long.parseLong(records.get(0).getSrvTaskId()));
+        //查询审核历史记录表数据
+        List<SrvTaskDetailAuditLogRespVO> auditLogList=chSrvTaskDetailAuditLogMapper.
+                getSrvTaskDetailAuditLogList(records.get(0).getTaskDetailId());
+        srvTaskCardRespDTO.setChSrvTaskDetailAuditLogList(auditLogList);//审核记录List
         Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(taskDetailId), AttachType.DISABLE.getUploadType());
         if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
             srvTaskCardRespDTO.setFileDataList(listResult.getData());

account/account-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

@@ -147,7 +147,8 @@
         report.PUBLICITY_START_TIME publicityStartTime,
         report.PUBLICITY_END_TIME  publicityEndTime,
         report.PUBLICITY_TIME  publicityTime,
-        to_char(info.OTHER_APPLY_TIME,'yyyy-MM-dd') otherApplyTime
+        to_char(info.OTHER_APPLY_TIME,'yyyy-MM-dd') otherApplyTime,
+        info.EXIT_FLAG exitFlag
         FROM   CH_DISABLE_INFO info
         LEFT JOIN CH_APR_TASK task ON info.DISAB_INFO_ID = task.DISABLE_INFO_ID
         LEFT JOIN ch_apr_report report ON report.TASK_ID = task.TASK_ID

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvTaskDetailAuditLog.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * CH_SRV_TASK_DETAIL_AUDIT_LOG
+ * @author 
+ */
+@Data
+@TableName("CH_SRV_TASK_DETAIL_AUDIT_LOG")
+@KeySequence("S_SRV_DETIAL_AUDIT_LOG")
+public class ChSrvTaskDetailAuditLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 服务明细id
+     */
+    @TableId(type = IdType.INPUT)
+    private Long logId;
+
+    /**
+     * 对应CH_SRV_TASK_DETAIL表ID
+     */
+    private Long taskDetailId;
+
+    /**
+     * 审核状态
+     */
+    private short checkStatus;
+
+    /**
+     * 审核人
+     */
+    private String auditor;
+
+    /**
+     * 审核备注
+     */
+    private String auditRemark;
+
+    /**
+     * 审核时间
+     */
+    private Date checkTime;
+
+    /**
+     * 审核次数
+     */
+    private Integer checkNum;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvTaskCardRespDTO.java

 package com.hungraim.ltc.pojo.vo.account;
 
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailAuditLog;
 import lombok.Data;
 
 import java.util.List;
@@ -55,4 +56,7 @@ public class SrvTaskCardRespDTO {
 
 
     private List<ChFndAttach> fileDataList;
+
+    //审核记录表
+    private List<SrvTaskDetailAuditLogRespVO> chSrvTaskDetailAuditLogList;
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvTaskDetailAuditLogRespVO.java

+package com.hungraim.ltc.pojo.vo.account;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zwl
+ **/
+
+@Data
+public class SrvTaskDetailAuditLogRespVO {
+    /**
+     * 对应CH_SRV_TASK_DETAIL表ID
+     */
+    private Long taskDetailId;
+
+    /**
+     * 审核状态
+     */
+    private short checkStatus;
+
+    /**
+     * 审核人
+     */
+    private String auditor;
+
+    /**
+     * 审核备注
+     */
+    private String auditRemark;
+
+    /**
+     * 审核时间
+     */
+    private String checkTime;
+
+    /**
+     * 审核次数
+     */
+    private Integer checkNum;
+
+
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/PlaceOtherVO.java

@@ -16,4 +16,6 @@ public class PlaceOtherVO {
     private String riskLevel;
     private String diseTypeS;
     private String otherApplyTime;
+
+    private Integer exitFlag;//退出标识，如果已退出，则不用点击退出
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/ChSrvTaskDetailAuditLogMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailAuditLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+
+@Mapper
+@Repository
+public interface ChSrvTaskDetailAuditLogMapper extends BaseMapper<ChSrvTaskDetailAuditLog> {
+
+}
+
+

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

@@ -18,6 +18,7 @@ import com.hungraim.ltc.pojo.entity.governance.ChSrvPlan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailAuditLog;
 import com.hungraim.ltc.pojo.vo.governance.*;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
 import com.hungraim.ltc.util.AttachType;
@@ -52,7 +53,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
     private final ChSrvProgramMapper chSrvProgramMapper;
     private final ChSrvSendMapper chSrvSendMapper;
     private final SrvSendService sendService;
-
+    private final ChSrvTaskDetailAuditLogMapper chSrvTaskDetailAuditLogMapper;
     /**
      * 服务计划制定列表
      *
@@ -448,6 +449,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
 
 
 
+
     @Override
     public Result auditingCard(AuditingCardVO auditingCardVO){
         log.info("SrvTaskServiceImpl=======auditingCard:{}",JSON.toJSONString(auditingCardVO));
@@ -465,8 +467,19 @@ public class SrvTaskServiceImpl implements SrvTaskService {
             chSrvPlanMapper.update(null, updateWrapper);
         }
         int result = chSrvTaskDetailMapper.updateById(chSrvTaskDetailDTO);
-        if(result>0){
+        //增加审核记录
+        int count= chSrvTaskDetailAuditLogMapper.selectCount(new LambdaQueryWrapper<ChSrvTaskDetailAuditLog>()//计划次数
+                .eq(ChSrvTaskDetailAuditLog::getTaskDetailId, auditingCardVO.getTaskDetailId()));
+        ChSrvTaskDetailAuditLog auditLog=new ChSrvTaskDetailAuditLog();
+        auditLog.setTaskDetailId(auditingCardVO.getTaskDetailId());
+        auditLog.setAuditor(auditingCardVO.getAuditor());//审核人
+        auditLog.setCheckStatus(auditingCardVO.getStatus());//审核状态
+        auditLog.setAuditRemark(auditingCardVO.getAuditRemark());//审核原因
+        auditLog.setCheckTime(chSrvTaskDetailDTO.getAuditDate());//审核时间
+        auditLog.setCheckNum(count+1);//审核次数
+        chSrvTaskDetailAuditLogMapper.insert(auditLog);
 
+        if(result>0){
             return Result.success();
         }else {
             return Result.failed("补卡审核失败！");