离职流程无法查看问题修复

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/controller/ChangesDimissionController.java

@@ -97,7 +97,7 @@ public class ChangesDimissionController {
     @PostMapping("saveCheck")
     public ResponseEntity saveCheck(@Valid @RequestBody ChangesDimissionDTO changesDimissionDTO) {
         changesDimissionService.saveDimission(changesDimissionDTO);
-        return ResponseUtil.newInstance().add("businessTable", "changes_dimission").add("businessId", changesDimissionDTO.getId()).ok ("操作成功");
+        return ResponseUtil.newInstance().add("businessTable", "changes_dimission_audit").add("businessId", changesDimissionDTO.getId()).ok ("操作成功");
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/domain/ChangesDimissionAudit.java

@@ -0,0 +1,32 @@
+package com.jeeplus.test.changes.dimission.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ * @TableName changes_dimission_audit
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("changes_dimission_audit")
+public class ChangesDimissionAudit extends BaseEntity {
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 审核状态
+     */
+    private String vettingStatus;
+
+    /**
+     * 流程id
+     */
+    private String procInsId;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/mapper/ChangesDimissionAuditMapper.java

@@ -0,0 +1,14 @@
+package com.jeeplus.test.changes.dimission.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimissionAudit;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @Entity com.jeeplus.test.changes.dimission.domain.ChangesDimissionAudit
+*/
+@Mapper
+public interface ChangesDimissionAuditMapper extends BaseMapper<ChangesDimissionAudit> {
+
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/mapper/xml/ChangesDimissionAuditMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.test.changes.dimission.mapper.ChangesDimissionAuditMapper">
+
+    <resultMap id="BaseResultMap" type="com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionAuditDTO">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="createBy.id" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
+            <result property="updateBy.id" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
+            <result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
+            <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
+            <result property="vettingStatus" column="vetting_status" jdbcType="VARCHAR"/>
+            <result property="procInsId" column="proc_ins_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        cda.id,
+        cda.create_by,
+        cda.create_date,
+        cda.update_by,
+        cda.update_date,
+        cda.del_flag,
+        cda.remarks,
+        cda.vetting_status,
+        cda.proc_ins_id
+    </sql>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/mapper/xml/ChangesDimissionMapper.xml

@@ -32,6 +32,7 @@
             <result column="social_security_last" jdbcType="TIMESTAMP" property="socialSecurityLast" />
             <result column="provident_fund_last" jdbcType="TIMESTAMP" property="providentFundLast" />
             <result column="proc_ins_id" jdbcType="VARCHAR" property="procInsId" />
+            <association property="changesDimissionAuditDTO" column="id" javaType="com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionAuditDTO" select="getAudit"></association>
             <collection property="changesDimissionReaDTOList" ofType="com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionReaDTO" column="id" select="getRea"></collection>
             <collection property="changesDimissionFilesDTOList" ofType="com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionFilesDTO" column="id" select="getFiles"></collection>
     </resultMap>
@@ -82,8 +83,24 @@
         cdf.url,
         cdf.name
     </sql>
+    <sql id="Audit_Column_List">
+        cda.id,
+        cda.create_by,
+        cda.create_date,
+        cda.update_by,
+        cda.update_date,
+        cda.del_flag,
+        cda.remarks,
+        cda.vetting_status,
+        cda.proc_ins_id
+    </sql>
 
-
+    <select id="getAudit" resultType="com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionAuditDTO">
+        select
+        <include refid="Audit_Column_List"></include>
+        from changes_dimission_audit cda
+        where cda.del_flag = '0' and cda.id = #{id}
+    </select>
     <select id="getRea" resultType="com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionReaDTO">
         select
         <include refid="Rea_Column_List"></include>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/ChangesDimissionAuditService.java

@@ -0,0 +1,38 @@
+package com.jeeplus.test.changes.dimission.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimission;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimissionAudit;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimissionFiles;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimissionRea;
+import com.jeeplus.test.changes.dimission.mapper.ChangesDimissionAuditMapper;
+import com.jeeplus.test.changes.dimission.mapper.ChangesDimissionMapper;
+import com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionDTO;
+import com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionFilesDTO;
+import com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionReaDTO;
+import com.jeeplus.test.changes.dimission.service.mapstruct.ChangesDimissionFilesWrapper;
+import com.jeeplus.test.changes.dimission.service.mapstruct.ChangesDimissionWrapper;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ChangesDimissionAuditService extends ServiceImpl<ChangesDimissionAuditMapper, ChangesDimissionAudit> {
+
+
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/ChangesDimissionHandoverService.java

@@ -49,7 +49,21 @@ public class ChangesDimissionHandoverService extends ServiceImpl<ChangesDimissio
 
         if(ObjectUtil.isNotEmpty(changesDimissionHandoverDTO)){
             if(StringUtils.isNotBlank(changesDimissionHandoverDTO.getCdId())){
-                this.remove(new QueryWrapper<ChangesDimissionHandover>().lambda().eq(ChangesDimissionHandover::getCdId,changesDimissionHandoverDTO.getCdId()));
+                if(CollectionUtil.isNotEmpty(changesDimissionHandoverDTO.getHandoverDTOList())){
+                    List<String> ids  = changesDimissionHandoverDTO.getHandoverDTOList().stream().distinct().filter(item -> {
+                        if (StringUtils.isNotBlank(item.getId())) {
+                            return true;
+                        }
+                        return false;
+                    }).map(ChangesDimissionHandoverDTO::getId).collect(Collectors.toList());
+                    if(CollectionUtil.isNotEmpty(ids)){
+                        this.remove(new QueryWrapper<ChangesDimissionHandover>().lambda()
+                                .eq(ChangesDimissionHandover::getCdId,changesDimissionHandoverDTO.getCdId())
+                                .notIn(ChangesDimissionHandover::getId,ids));
+                    }else{
+                        this.remove(new QueryWrapper<ChangesDimissionHandover>().lambda().eq(ChangesDimissionHandover::getCdId,changesDimissionHandoverDTO.getCdId()));
+                    }
+                }
             }
             if(CollectionUtil.isNotEmpty(changesDimissionHandoverDTO.getHandoverDTOList())){
                 List<ChangesDimissionHandover> changesDimissionHandoverList = new ArrayList<>();

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/ChangesDimissionService.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.changes.dimission.domain.ChangesDimission;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimissionAudit;
 import com.jeeplus.test.changes.dimission.domain.ChangesDimissionFiles;
 import com.jeeplus.test.changes.dimission.domain.ChangesDimissionRea;
 import com.jeeplus.test.changes.dimission.mapper.ChangesDimissionMapper;
@@ -39,6 +40,8 @@ public class ChangesDimissionService extends ServiceImpl<ChangesDimissionMapper,
     private ChangesDimissionReaService changesDimissionReaService;
     @Resource
     private ChangesDimissionFilesService changesDimissionFilesService;
+    @Resource
+    private ChangesDimissionAuditService changesDimissionAuditService;
 
     public IPage<ChangesDimissionDTO> findList(Page<ChangesDimissionDTO> page, QueryWrapper<ChangesDimission> queryWrapper){
         queryWrapper.eq("cd.del_flag","0");
@@ -86,7 +89,17 @@ public class ChangesDimissionService extends ServiceImpl<ChangesDimissionMapper,
         }
         ChangesDimission changesDimission = ChangesDimissionWrapper.INSTANCE.toEntity(changesDimissionDTO);
         this.saveOrUpdate(changesDimission);
+
         if(ObjectUtil.isNotEmpty(changesDimissionDTO)){
+            ChangesDimissionAudit audit = new ChangesDimissionAudit();
+            audit.setVettingStatus(changesDimissionDTO.getVettingStatus());
+            List<ChangesDimissionAudit> list = changesDimissionAuditService.list(new QueryWrapper<ChangesDimissionAudit>().lambda().eq(ChangesDimissionAudit::getId, changesDimission.getId()));
+            if(CollectionUtil.isNotEmpty(list)){
+                changesDimissionAuditService.update(audit,new QueryWrapper<ChangesDimissionAudit>().lambda().eq(ChangesDimissionAudit::getId,changesDimission.getId()));
+            }else{
+                audit.setId(changesDimission.getId());
+                changesDimissionAuditService.save(audit);
+            }
             if(CollectionUtil.isNotEmpty(changesDimissionDTO.getReaTypeList())){
                 changesDimissionReaService.remove(new QueryWrapper<ChangesDimissionRea>().lambda()
                         .eq(ChangesDimissionRea::getCdId,changesDimission.getId())
@@ -130,7 +143,7 @@ public class ChangesDimissionService extends ServiceImpl<ChangesDimissionMapper,
         this.removeByIds (Lists.newArrayList (idArray));
         changesDimissionFilesService.remove(new QueryWrapper<ChangesDimissionFiles>().lambda().in(ChangesDimissionFiles::getCdId,Lists.newArrayList (idArray)));
         changesDimissionReaService.remove(new QueryWrapper<ChangesDimissionRea>().lambda().in(ChangesDimissionRea::getCdId,Lists.newArrayList (idArray)));
-        return ResponseEntity.ok ("删除离职成功");
+        return ResponseEntity.ok ("放弃离职成功");
     }
 
     public ResponseEntity updateStatus(String id){
@@ -143,9 +156,12 @@ public class ChangesDimissionService extends ServiceImpl<ChangesDimissionMapper,
      * @param changesDimissionDTO
      */
     public void updateVettingStatusById(ChangesDimissionDTO changesDimissionDTO){
+        ChangesDimissionAudit changesDimissionAudit = new ChangesDimissionAudit();
+        changesDimissionAudit.setVettingStatus(changesDimissionDTO.getVettingStatus());
+        this.changesDimissionAuditService.update(changesDimissionAudit,new QueryWrapper<ChangesDimissionAudit>().lambda().eq(ChangesDimissionAudit::getId,changesDimissionDTO.getId()));
         ChangesDimission changesDimission = new ChangesDimission();
         changesDimission.setVettingStatus(changesDimissionDTO.getVettingStatus());
-        this.changesDimissionMapper.update(changesDimission,new QueryWrapper<ChangesDimission>().lambda().eq(ChangesDimission::getId,changesDimissionDTO.getId()));
+        this.update(changesDimission,new QueryWrapper<ChangesDimission>().lambda().eq(ChangesDimission::getId,changesDimissionDTO.getId()));
     }
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/dto/ChangesDimissionAuditDTO.java

@@ -0,0 +1,31 @@
+package com.jeeplus.test.changes.dimission.service.dto;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ * @TableName changes_dimission_audit
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ChangesDimissionAuditDTO extends BaseDTO {
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 审核状态
+     */
+    private String vettingStatus;
+
+    /**
+     * 流程id
+     */
+    private String procInsId;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/dto/ChangesDimissionDTO.java

@@ -3,6 +3,7 @@ package com.jeeplus.test.changes.dimission.service.dto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.service.dto.BaseDTO;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimissionAudit;
 import com.jeeplus.test.roster.domain.RosterBase;
 import com.jeeplus.test.roster.service.dto.RosterBaseDTO;
 import lombok.Data;
@@ -123,6 +124,10 @@ public class ChangesDimissionDTO extends BaseDTO {
      */
     private String procInsId;
 
+    /**
+     * 离职审批数据
+     */
+    private ChangesDimissionAuditDTO changesDimissionAuditDTO;
 
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/mapstruct/ChangesDimissionAuditWrapper.java

@@ -0,0 +1,15 @@
+package com.jeeplus.test.changes.dimission.service.mapstruct;
+
+import com.jeeplus.core.mapstruct.EntityWrapper;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimissionAudit;
+import com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionAuditDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = {})
+public interface ChangesDimissionAuditWrapper extends EntityWrapper<ChangesDimissionAuditDTO, ChangesDimissionAudit>{
+
+        ChangesDimissionAuditWrapper INSTANCE = Mappers.getMapper(ChangesDimissionAuditWrapper.class);
+
+}