修改流程状态

zjugis-business/src/main/java/com/zjugis/business/flow/attendancenote/event/AttendanceNoteEvent.java

@@ -25,6 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static com.zjugis.business.constants.FlowStatusConstants.*;
+
 /**
  * @Author 陈俊
  * @Date 2023/11/28 14:49
@@ -66,7 +68,7 @@ public class AttendanceNoteEvent extends BaseController {
                     flowDesc += "/" + entity.getAttendanceNoteReason();
                 }
 
-                entity.setFlowStatus(1);
+                entity.setFlowStatus(FLOW_PROCESS);
                 attendanceNoteService.updateAttendanceNote(AttendanceNoteConvert.INSTANCE.convert(entity));
                 flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId,flowDesc);
@@ -94,7 +96,7 @@ public class AttendanceNoteEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 AttendanceNoteDO entity = attendanceNoteService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(90);
+                entity.setFlowStatus(FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDate.now());
                 attendanceNoteService.updateAttendanceNote(AttendanceNoteConvert.INSTANCE.convert(entity));
                 //考勤说明条修改考勤状态为正常
@@ -129,7 +131,7 @@ public class AttendanceNoteEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 AttendanceNoteDO entity = attendanceNoteService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(20);
+                entity.setFlowStatus(FLOW_NULLY);
                 entity.setIsvalid(0);
                 attendanceNoteService.updateAttendanceNote(AttendanceNoteConvert.INSTANCE.convert(entity));
                 return ok("true");
@@ -157,7 +159,7 @@ public class AttendanceNoteEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 AttendanceNoteDO entity = attendanceNoteService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(1);
+                entity.setFlowStatus(FLOW_PROCESS);
                 entity.setIsvalid(1);
                 attendanceNoteService.updateAttendanceNote(AttendanceNoteConvert.INSTANCE.convert(entity));
                 return ok("true");

zjugis-business/src/main/java/com/zjugis/business/flow/businesstravel/event/TravelEvent.java

@@ -1,10 +1,7 @@
 package com.zjugis.business.flow.businesstravel.event;
 
 import com.google.common.base.Strings;
-import com.zjugis.business.converter.attendancenote.AttendanceNoteConvert;
 import com.zjugis.business.converter.businesstravel.TravelConvert;
-import com.zjugis.business.flow.attendancenote.entity.AttendanceNoteDO;
-import com.zjugis.business.flow.attendancenote.entity.AttendanceNoteTimeDO;
 import com.zjugis.business.flow.businesstravel.entity.TravelDO;
 import com.zjugis.business.flow.businesstravel.entity.TravelTimeDO;
 import com.zjugis.business.flow.businesstravel.service.TravelService;
@@ -28,6 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static com.zjugis.business.constants.FlowStatusConstants.*;
+
 /**
  * @Author 陈俊
  * @Date 2023/12/8 11:14
@@ -69,7 +68,7 @@ public class TravelEvent extends BaseController {
                     flowDesc += "/" + entity.getTravelReason();
                 }
 
-                entity.setFlowStatus(1);
+                entity.setFlowStatus(FLOW_PROCESS);
                 travelService.updateTravel(TravelConvert.INSTANCE.convert(entity));
                 flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId, flowDesc);
@@ -97,7 +96,7 @@ public class TravelEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 TravelDO entity = travelService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(90);
+                entity.setFlowStatus(FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDate.now());
                 travelService.updateTravel(TravelConvert.INSTANCE.convert(entity));
                 List<TravelTimeDO> travelTimeDOS = travelTimeService.getListByTravelId(entity.getId());
@@ -138,7 +137,7 @@ public class TravelEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 TravelDO entity = travelService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(20);
+                entity.setFlowStatus(FLOW_NULLY);
                 entity.setIsvalid(0);
                 travelService.updateTravel(TravelConvert.INSTANCE.convert(entity));
                 return ok("true");
@@ -166,7 +165,7 @@ public class TravelEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 TravelDO entity = travelService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(1);
+                entity.setFlowStatus(FLOW_PROCESS);
                 entity.setIsvalid(1);
                 travelService.updateTravel(TravelConvert.INSTANCE.convert(entity));
                 return ok("true");

zjugis-business/src/main/java/com/zjugis/business/flow/leave/event/LeaveEvent.java

@@ -13,7 +13,6 @@ import com.zjugis.framework.workflow.spring.resovler.ParamModel;
 import com.zjugis.module.adm.api.attendance.AttendanceSheetApi;
 import com.zjugis.module.system.api.permission.RoleApi;
 import com.zjugis.module.system.api.permission.dto.RoleRespDto;
-import com.zjugis.module.system.api.user.AdminUserApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +24,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 
+import static com.zjugis.business.constants.FlowStatusConstants.*;
 import static com.zjugis.framework.common.util.collection.CollectionUtils.convertSet;
 
 /**
@@ -72,7 +72,7 @@ public class LeaveEvent extends BaseController {
                 if (!Strings.isNullOrEmpty(entity.getLeaveReason())) {
                     flowDesc += "/" + entity.getLeaveReason();
                 }
-                entity.setFlowStatus(1);
+                entity.setFlowStatus(FLOW_PROCESS);
                 leaveService.updateLeave(LeaveConvert.INSTANCE.convert(entity));
                 flowDesc = flowDesc.length() > 1 ? flowDesc.substring(1) : flowDesc;
                 workflowClient.saveFlowDescribe(flowInstanceId,flowDesc);
@@ -100,7 +100,7 @@ public class LeaveEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 LeaveDO entity = leaveService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(90);
+                entity.setFlowStatus(FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDate.now());
                 leaveService.updateLeave(LeaveConvert.INSTANCE.convert(entity));
                 //根据请假情况修改考勤表
@@ -135,7 +135,7 @@ public class LeaveEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 LeaveDO entity = leaveService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(20);
+                entity.setFlowStatus(FLOW_NULLY);
                 entity.setIsvalid(0);
                 leaveService.updateLeave(LeaveConvert.INSTANCE.convert(entity));
                 return ok("true");
@@ -163,7 +163,7 @@ public class LeaveEvent extends BaseController {
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 LeaveDO entity = leaveService.findByInstanceId(flowInstanceId);
-                entity.setFlowStatus(1);
+                entity.setFlowStatus(FLOW_PROCESS);
                 entity.setIsvalid(1);
                 leaveService.updateLeave(LeaveConvert.INSTANCE.convert(entity));
                 return ok("true");

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/enums/ErrorCodeConstants.java

@@ -23,6 +23,9 @@ public interface ErrorCodeConstants {
     ErrorCode REPORT_RECEIVE_NOT_EXISTS = new ErrorCode(1-003-000-004, "行政管理_工作报告接收不存在");
 
     ErrorCode REPORT_WORKLOAD_NOT_EXISTS = new ErrorCode(1-003-000-005, "行政管理_工作报告项目工作量不存在");
-    // ========== ATTENDANCE 考勤模块 1-003-001-000 ==========
+    // ========== ATTENDANCE 工作日模块 1-003-001-000 ==========
     ErrorCode WORKDAY_NOT_EXISTS = new ErrorCode(1-003-001-000, "工作日不存在");
+
+    // ========== ATTENDANCE 通知公告\学习中心模块 1-003-001-000 ==========
+    ErrorCode NOTICE_NOT_EXISTS = new ErrorCode(1-003-002-000, "通知公告\\学习中心不存在");
 }