离职交接审批流程以及离职审批流程

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
 import com.jeeplus.sys.utils.StringUtils;
@@ -83,7 +84,9 @@ public class ChangesDimissionController {
     @PreAuthorize("hasAnyAuthority('changes:dimission:save','changes:dimission:edit')")
     @PostMapping("save")
     public ResponseEntity save(@Valid @RequestBody ChangesDimissionDTO changesDimissionDTO) {
-        return changesDimissionService.saveDimission(changesDimissionDTO);
+        changesDimissionService.saveDimission(changesDimissionDTO);
+        return ResponseUtil.newInstance().add("businessTable", "changes_dimission").add("businessId", changesDimissionDTO.getId()).ok ("操作成功");
+
     }
 
     /**
@@ -108,4 +111,15 @@ public class ChangesDimissionController {
     public ResponseEntity updateStatus(String id) {
         return changesDimissionService.updateStatus(id);
     }
+
+    /**
+     * 同意、驳回、撤回   离职审批
+     * @param changesDimissionDTO
+     */
+    @ApiLog(value = "同意/驳回/撤回离职审批", type = LogTypeEnum.SAVE)
+    @PreAuthorize("hasAnyAuthority('changes:dimission:save','changes:dimission:edit')")
+    @PostMapping("updateVettingStatusById")
+    public void updateVettingStatusById(@Valid @RequestBody ChangesDimissionDTO changesDimissionDTO) {
+        changesDimissionService.updateVettingStatusById(changesDimissionDTO);
+    }
 }

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

@@ -99,4 +99,15 @@ public class ChangesDimissionHandoverController {
         return ResponseUtil.newInstance().add("businessTable", "changes_dimission").add("businessId", changesDimissionHandoverDTO.getCdId()).ok ("操作成功");
     }
 
+    /**
+     * 同意、驳回、撤回   离职交接审批
+     * @param changesDimissionDTO
+     */
+    @ApiLog(value = "同意/驳回/撤回离职交接审批", type = LogTypeEnum.SAVE)
+    @PreAuthorize("hasAnyAuthority('changes:dimission:save','changes:dimission:edit')")
+    @PostMapping("updateByCdId")
+    public void updateByCdId(@Valid @RequestBody ChangesDimissionDTO changesDimissionDTO) {
+        changesDimissionHandoverService.updateByCdId(changesDimissionDTO);
+    }
+
 }

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

@@ -86,5 +86,10 @@ public class ChangesDimission extends BaseEntity {
      */
     private String providentFundLast;
 
+    /**
+     * 流程id
+     */
+    private String procInsId;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -31,6 +31,7 @@
             <result column="handover_id" jdbcType="VARCHAR" property="handoverId" />
             <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" />
             <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>
@@ -55,7 +56,8 @@
         cd.request_date,
         cd.handover_id,
         cd.social_security_last,
-        cd.provident_fund_last
+        cd.provident_fund_last,
+        cd.proc_ins_id
     </sql>
     <sql id="Rea_Column_List">
         cdr.id,

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

@@ -89,4 +89,14 @@ public class ChangesDimissionHandoverService extends ServiceImpl<ChangesDimissio
         return changesDimissionHandoverDTOList;
     }
 
+    /**
+     * 根据离职id来修改离职交接状态 handoverStatus的值
+     * @param changesDimissionDTO
+     */
+    public void updateByCdId(ChangesDimissionDTO changesDimissionDTO){
+        ChangesDimission changesDimission = new ChangesDimission();
+        changesDimission.setHandoverStatus(changesDimissionDTO.getHandoverStatus());
+        this.changesDimissionMapper.update(changesDimission,new QueryWrapper<ChangesDimission>().lambda().eq(ChangesDimission::getId,changesDimissionDTO.getId()));
+    }
+
 }

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

@@ -77,10 +77,14 @@ public class ChangesDimissionService extends ServiceImpl<ChangesDimissionMapper,
                     return ResponseEntity.badRequest().body("此员工已提交离职，请勿重复提交");
                 }
             }
+            if(StringUtils.isBlank(changesDimissionDTO.getVettingStatus())){
+                changesDimissionDTO.setVettingStatus("1");
+            }
+            if(StringUtils.isBlank(changesDimissionDTO.getHandoverStatus())){
+                changesDimissionDTO.setHandoverStatus("1");
+            }
         }
         ChangesDimission changesDimission = ChangesDimissionWrapper.INSTANCE.toEntity(changesDimissionDTO);
-        changesDimission.setVettingStatus("1");
-        changesDimission.setHandoverStatus("1");
         this.saveOrUpdate(changesDimission);
         if(ObjectUtil.isNotEmpty(changesDimissionDTO)){
             if(CollectionUtil.isNotEmpty(changesDimissionDTO.getReaTypeList())){
@@ -134,4 +138,14 @@ public class ChangesDimissionService extends ServiceImpl<ChangesDimissionMapper,
         return ResponseEntity.ok ("取消确认成功");
     }
 
+    /**
+     * 根据离职id来修改离职审批状态 vetting_status的值
+     * @param changesDimissionDTO
+     */
+    public void updateVettingStatusById(ChangesDimissionDTO changesDimissionDTO){
+        ChangesDimission changesDimission = new ChangesDimission();
+        changesDimission.setVettingStatus(changesDimissionDTO.getVettingStatus());
+        this.changesDimissionMapper.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/ChangesDimissionDTO.java

@@ -118,6 +118,10 @@ public class ChangesDimissionDTO extends BaseDTO {
      */
     private List<ChangesDimissionFilesDTO> changesDimissionFilesDTOList;
 
+    /**
+     * 流程id
+     */
+    private String procInsId;
 
 
     private static final long serialVersionUID = 1L;