离职申请为提交 离职交接拦截

zjugis-business/src/main/java/com/zjugis/business/enums/ErrorCodeConstants.java

@@ -30,6 +30,8 @@ public interface ErrorCodeConstants {
     ErrorCode RESIGN_DETAIL_NOT_EXISTS = new ErrorCode(3-001-004-006, "工作交接人不能为空");
 
     ErrorCode RESIGN_APPLY_NOT_EXISTS = new ErrorCode(3-001-004-007, "离职申请记录不存在");
+
+    ErrorCode RESIGN_APPLY_FIRST = new ErrorCode(3-001-004-010, "请先办理离职申请");
     ErrorCode ID_CARD_EXIST = new ErrorCode(3-001-005-001, "身份证号已经存在");
     ErrorCode MOBILE_EXIST = new ErrorCode(3-001-005-003, "手机号已经存在");
     ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(3-001-003-000, "供应商入库申请记录不存在");

zjugis-business/src/main/java/com/zjugis/business/flow/resign/controller/ResignController.java

@@ -45,7 +45,7 @@ public class ResignController extends BaseController {
     @GetMapping("/index")
     @Operation(summary = "离职办理表单生成")
     public String index(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
-        Map<String, Object> map = resignService.getFormParams(flowInstanceId);
+        Map<String, Object> map = resignService.getFormParams(flowInstanceId,userId);
         return resultPage(map);
     }
 
@@ -57,17 +57,7 @@ public class ResignController extends BaseController {
         return CommonResult.success(resignService.flowAdd(flowInstanceId, userId));
     }
 
-    /**
-     * 离职办理需求表单生成
-     */
-    @WorkFlowMobile(isReceiveMaterial = true, isReceiveOpinion = true)
-    @ResponseBody
-    @GetMapping("/mobileIndex")
-    @Operation(summary = "离职办理表单生成")
-    public String mobileIndex(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
-        Map<String, Object> map = resignService.getFormParams(flowInstanceId);
-        return resultPage(map);
-    }
+
 
     /**
      * 离职办理申请列表查询

zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/ResignService.java

@@ -11,7 +11,7 @@ import com.zjugis.framework.common.pojo.PageResult;
 import java.util.Map;
 
 public interface ResignService {
-    Map<String, Object> getFormParams(String flowInstanceId);
+    Map<String, Object> getFormParams(String flowInstanceId,String userId);
 
     PageResult<ResignPageReqVO> getPage(ResignPageVO pageReqVO);
 

zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/impl/ResignServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zjugis.business.flow.resign.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.zjugis.business.constants.DictConstants;
 import com.zjugis.business.constants.FlowStatusConstants;
@@ -73,8 +74,10 @@ public class ResignServiceImpl implements ResignService {
 
 
     @Override
-    public Map<String, Object> getFormParams(String flowInstanceId) {
-        String userId = SecurityFrameworkUtils.getLoginUserId();
+    public Map<String, Object> getFormParams(String flowInstanceId, String userId) {
+        if (StrUtil.isEmpty(userId)) {
+            userId = SecurityFrameworkUtils.getLoginUserId();
+        }
         CommonResult<IFlowInstance> flowResult = workflowClient.flowInstance(flowInstanceId);
         if (flowResult.isSuccess()) {
             ResignDO entity = resignDAO.findByInstanceId(flowInstanceId);
@@ -95,7 +98,10 @@ public class ResignServiceImpl implements ResignService {
                 entity.setDrzw(dto.getPostName());
 
                 ResignApplyDO resignApplyDO = resignApplyService.findByUserId(userId);
-                entity.setLzygszd(resignApplyDO.getLzygszd());
+                if (resignApplyDO != null) {
+                    entity.setLzygszd(resignApplyDO.getLzygszd());
+                }
+
                 resignDAO.insert(entity);
             }
             return createMap(flowInstanceId, entity, userId);
@@ -125,9 +131,17 @@ public class ResignServiceImpl implements ResignService {
     @Override
     public void update(ResignPageReqVO vo) {
         validateExists(vo.getId());
+
+        ResignApplyDO resignApplyDO = resignApplyService.findByUserId(vo.getUserId());
+        if(resignApplyDO==null){
+            throw exception(RESIGN_APPLY_FIRST);
+        }
+
         if (CollectionUtil.isEmpty(vo.getFinishedList()) || CollectionUtil.isEmpty(vo.getUnfinishedList())) {
             throw exception(RESIGN_DETAIL_NOT_EXISTS);
         }
+
+
         ResignDO resignDO = ResignConvert.INSTANCE.convert(vo);
         resignDAO.updateById(resignDO);
         Set<String> idList = convertSet(resignDetailDAO.selectList(new LambdaQueryWrapperX<ResignDetailDO>()

zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/dao/ResignApplyDAO.java

@@ -37,9 +37,9 @@ public interface ResignApplyDAO extends BaseMapperX<ResignApplyDO> {
         vo.setPageSize(1);
         vo.setUserId(userId);
         vo.setStatus(90);
-        PageResult<ResignApplyDO>page=getPage(vo);
-        if(page.getTotal()==0){
-            throw new BusinessException("请先提交离职申请！");
+        PageResult<ResignApplyDO> page = getPage(vo);
+        if (page.getTotal() == 0) {
+            return null;
         }
         return getPage(vo).getList().get(0);
     }

zjugis-business/src/main/resources/templates/Resign/js/index.js

@@ -153,6 +153,8 @@
         var html = "";
         if (lzsq && lzsq.instanceId) {
             html = "<a onclick=goAsset1('" + lzsq.instanceId + "')>" + lzsq.nickname + "(" + lzsq.createTime.substring(0, 10) + ")</a>";
+        }else {
+            z.ui.alertWarning("请先办理离职申请");
         }
 
         $("#lzsqhtml").html(html);
@@ -192,6 +194,8 @@
         postData.createReqVO.unfinishedList = unfinished;
         postData.createReqVO.finishedList = finished;
 
+
+
         z.ui.ajax({
             type: "post",
             url: "/resign/update",