Sfoglia il codice sorgente

离职申请bug+档案bug

jzh 10 mesi fa
parent
commit
7f579091bd

+ 19 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/event/ResignApplyEvent.java

@@ -121,6 +121,25 @@ public class ResignApplyEvent extends BaseController {
         }
     }
 
+    @PostMapping("/location/{type}")
+    public String existLocation(@ParamModel Map flowInstance, @PathVariable String type) {
+        try {
+            String flowInstanceId = flowInstance.get("id").toString();
+
+            ResignApplyDO entity = resignApplyService.findByInstanceId(flowInstanceId);
+
+            if (type.equals(entity.getLzygszd())) {
+                return "true";
+            } else {
+                return "false";
+            }
+
+
+        } catch (Exception ex) {
+            return error(ex.getMessage(), ErrorCode.DEFAULT);
+        }
+    }
+
     /**
      * 作废事件
      *

+ 3 - 1
zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/StaffController.java

@@ -132,7 +132,9 @@ public class StaffController extends BaseController {
     @GetMapping("/getStaffDetail")
     @Operation(summary = "根据用户id获取职工详情")
     public CommonResult<StaffRecordsDTO> getStaffDetail(@RequestParam("userId") String userId) {
-        return CommonResult.success(staffService.getStaffResignDetail(userId));
+        StaffRecordsDTO dto = staffService.getStaffResignDetail(userId);
+        System.out.println(dto);
+        return CommonResult.success(dto);
     }
 
 }