Merge branch 'huangzqa-add-20231120' into 'develop'

feat: 优化新的bu字段

See merge request dcuc-tjdsj/approve-core!107

approve-api/src/main/java/com/dragonsoft/dcuc/approve/enumresources/bu/TaskStatusEnum.java

@@ -0,0 +1,41 @@
+package com.dragonsoft.dcuc.approve.enumresources.bu;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * <p>
+ * 任务状态
+ * </p>
+ *
+ * @author huangzqa
+ * @date 2023/11/20
+ */
+public enum TaskStatusEnum implements ICodeEnum {
+
+    /**
+     * 启用
+     */
+    ENABLE("1", "启用"),
+    /**
+     * 废弃
+     */
+    DISABLE("0", "废弃");
+
+    public final String value;
+    public final String label;
+
+    TaskStatusEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/bu/BuApproveSyncBizApproveGridReqVO.java

@@ -28,26 +28,18 @@ public class BuApproveSyncBizApproveGridReqVO {
 
     @NotBlank
     @ApiModelProperty(value = "业务数据类型")
-    private String bizDataType;
+    private String dataType;
 
-    @NotBlank
-    @ApiModelProperty(value = "任务ID")
-    private String bizId;
-
-    @NotBlank
-    @ApiModelProperty(value = "任务审批模式")
-    private String approveMode;
-
-    @ApiModelProperty(value = "要素内容，bizDataType为02时必填")
-    private String elementNumber;
+    @ApiModelProperty(value = "要素内容，dataType为02时必填")
+    private String elementContent;
 
-    @ApiModelProperty(value = "要素类型编码，bizDataType为02时必填")
+    @ApiModelProperty(value = "要素类型编码，dataType为02时必填")
     private String elementType;
 
-    @ApiModelProperty(value = "要素有效期开始时间，bizDataType为02时必填")
+    @ApiModelProperty(value = "要素有效期开始时间，dataType为02时必填")
     private String elementTermStart;
 
-    @ApiModelProperty(value = "要素有效期结束时间，bizDataType为02时必填")
+    @ApiModelProperty(value = "要素有效期结束时间，dataType为02时必填")
     private String elementTermEnd;
 
     @ApiModelProperty(value = "承办单位编码")

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/bu/BuApproveSyncBizApproveReqVO.java

@@ -25,31 +25,27 @@ import java.util.Date;
 @ApiModel(value = "流程业务数据")
 public class BuApproveSyncBizApproveReqVO {
 
-    @NotBlank
-    @ApiModelProperty(value = "任务ID")
-    private String bizId;
-
     @NotBlank
     @ApiModelProperty(value = "任务名称")
-    private String bizTitle;
+    private String title;
 
     @NotBlank
     @ApiModelProperty(value = "任务类型编码")
     private String taskClass;
 
-    @NotBlank
-    @ApiModelProperty(value = "任务审批方式")
-    private String approveMode;
-
     @NotNull
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "任务有效期开始时间")
-    private Date bizTermStart;
+    private Date taskTermStart;
 
     @NotNull
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "任务有效期结束时间")
-    private Date bizTermEnd;
+    private Date taskTermEnd;
+
+    @NotBlank
+    @ApiModelProperty(value = "任务状态(0废弃、1在用)")
+    private String taskStatus;
 
 
 }

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/bu/BuApproveSyncBizDataReqVO.java

@@ -27,10 +27,10 @@ public class BuApproveSyncBizDataReqVO {
     @NotNull
     @Valid
     @ApiModelProperty(value = "任务数据")
-    private BuApproveSyncBizApproveReqVO bizApprove;
+    private BuApproveSyncBizApproveReqVO taskInfo;
 
     @Valid
     @ApiModelProperty(value = "要素/承办人数据")
-    private List<BuApproveSyncBizApproveGridReqVO> bizApproveGrid;
+    private List<BuApproveSyncBizApproveGridReqVO> approveGrid;
 
 }

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/bu/BuApproveSyncReqVO.java

@@ -44,11 +44,16 @@ public class BuApproveSyncReqVO {
     @ApiModelProperty(value = "任务审批结束时间")
     private Date finishTime;
 
+    @NotBlank
+    @ApiModelProperty(value = "任务编号")
+    private String taskId;
+
     @NotBlank
     @ApiModelProperty(value = "任务创建人ID")
-    private String pid;
+    private String createrId;
 
-    // todo 任务最终审批人
+    @ApiModelProperty(value = "任务最终审批人Id")
+    private String lastReviewerId;
 
     @NotBlank
     @ApiModelProperty(value = "任务最终审批人身份证编号")
@@ -64,7 +69,7 @@ public class BuApproveSyncReqVO {
 
     @NotBlank
     @ApiModelProperty(value = "任务最终审批人单位名称")
-    private String lastReviewerUnit;
+    private String lastReviewerUnitName;
 
     @NotNull
     @Valid

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/BuSyncBusinessImpl.java

@@ -7,7 +7,7 @@ import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.dcuc.approve.business.api.IApproveApiBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IBuSyncBusiness;
 import com.dragonsoft.dcuc.approve.business.external.INoticeBusiness;
-import com.dragonsoft.dcuc.approve.enumresources.bu.ApproveModeEnum;
+import com.dragonsoft.dcuc.approve.enumresources.bu.TaskStatusEnum;
 import com.dragonsoft.dcuc.approve.model.ApproveCirculationInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
@@ -124,7 +124,7 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
         buApproveSyncReqVO.setLastReviewerIdCard(approveCirculationInfo.getOperateUserId());
         buApproveSyncReqVO.setLastReviewerName(approveCirculationInfo.getOperateUserName());
         buApproveSyncReqVO.setLastReviewerUnitCode(approveCirculationInfo.getOperateUserOrgId());
-        buApproveSyncReqVO.setLastReviewerUnit(approveCirculationInfo.getOperateUserOrg());
+        buApproveSyncReqVO.setLastReviewerUnitName(approveCirculationInfo.getOperateUserOrg());
 
         return syncToBu(id, buApproveSyncReqVO, approvalInfoDTO);
     }
@@ -144,7 +144,9 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
         buApproveSyncReqVO.setLastReviewerIdCard(securityUser.getIdcard());
         buApproveSyncReqVO.setLastReviewerName(securityUser.getName());
         buApproveSyncReqVO.setLastReviewerUnitCode(securityUser.getSecurityOrg());
-        buApproveSyncReqVO.setLastReviewerUnit(securityUser.getSecurityOrgName());
+        buApproveSyncReqVO.setLastReviewerUnitName(securityUser.getSecurityOrgName());
+        buApproveSyncReqVO.setTaskId(approvalInfoDTO.getApproveNo());
+        buApproveSyncReqVO.setCreaterId(approvalInfoDTO.getApplicantIdcard());
 
         return syncToBu(id, buApproveSyncReqVO, approvalInfoDTO);
     }
@@ -162,12 +164,14 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
         buApproveSyncReqVO.setAppName(approvalInfoDTO.getAppName());
         buApproveSyncReqVO.setCreateTime(approvalInfoDTO.getCreateTime());
         buApproveSyncReqVO.setFinishTime(approvalInfoDTO.getUpdateTime());
-        buApproveSyncReqVO.setPid(approvalInfoDTO.getApplicantIdcard());
+        buApproveSyncReqVO.setCreaterId(approvalInfoDTO.getApplicantIdcard());
+        buApproveSyncReqVO.setTaskId(approvalInfoDTO.getApproveNo());
+        buApproveSyncReqVO.setCreaterId(approvalInfoDTO.getApplicantIdcard());
 
         BuApproveSyncBizApproveReqVO buApproveSyncBizApproveReqVO = parseApprovalInfoDTO(approvalInfoDTO);
 
         BuApproveSyncBizDataReqVO buApproveSyncBizDataReqVO = new BuApproveSyncBizDataReqVO();
-        buApproveSyncBizDataReqVO.setBizApprove(buApproveSyncBizApproveReqVO);
+        buApproveSyncBizDataReqVO.setTaskInfo(buApproveSyncBizApproveReqVO);
         buApproveSyncReqVO.setBizData(buApproveSyncBizDataReqVO);
 
 
@@ -188,12 +192,11 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
      */
     protected BuApproveSyncBizApproveReqVO parseApprovalInfoDTO(ApprovalInfoDTO approvalInfoDTO) {
         BuApproveSyncBizApproveReqVO buApproveSyncBizApproveReqVO = new BuApproveSyncBizApproveReqVO();
-        buApproveSyncBizApproveReqVO.setBizId(approvalInfoDTO.getApproveNo());
-        buApproveSyncBizApproveReqVO.setBizTitle(approvalInfoDTO.getProcessTitle());
+        buApproveSyncBizApproveReqVO.setTitle(approvalInfoDTO.getProcessTitle());
         buApproveSyncBizApproveReqVO.setTaskClass(approvalInfoDTO.getApproveTaskClass());
-        buApproveSyncBizApproveReqVO.setApproveMode(ApproveModeEnum.NORMAL.value);
-        buApproveSyncBizApproveReqVO.setBizTermStart(approvalInfoDTO.getStartTime());
-        buApproveSyncBizApproveReqVO.setBizTermEnd(approvalInfoDTO.getEndTime());
+        buApproveSyncBizApproveReqVO.setTaskStatus(TaskStatusEnum.ENABLE.value);
+        buApproveSyncBizApproveReqVO.setTaskTermStart(approvalInfoDTO.getStartTime());
+        buApproveSyncBizApproveReqVO.setTaskTermEnd(approvalInfoDTO.getEndTime());
         return buApproveSyncBizApproveReqVO;
     }
 

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/impl/NoticeBusinessImplTest.java

@@ -32,14 +32,14 @@ import static com.github.dreamhead.moco.Moco.*;
  */
 public class NoticeBusinessImplTest {
     static int port = 19001;
-
-    public static void main(String[] args) {
-        try {
-            NoticeBusinessImplTest.before();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+//
+//    public static void main(String[] args) {
+//        try {
+//            NoticeBusinessImplTest.before();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
 
 
     static String baseUrl = "http://127.0.0.1:" + port;
@@ -91,22 +91,23 @@ public class NoticeBusinessImplTest {
         buApproveSyncReqVO.setAppName("ss");
         buApproveSyncReqVO.setCreateTime(new Date());
         buApproveSyncReqVO.setFinishTime(new Date());
-        buApproveSyncReqVO.setPid("sss");
+        buApproveSyncReqVO.setCreaterId("sss");
         buApproveSyncReqVO.setLastReviewerIdCard("sss");
         buApproveSyncReqVO.setLastReviewerName("sssss");
-        buApproveSyncReqVO.setLastReviewerUnit("ss");
+        buApproveSyncReqVO.setLastReviewerUnitName("ss");
         buApproveSyncReqVO.setLastReviewerUnitCode("sssss");
+        buApproveSyncReqVO.setTaskId("111");
+        buApproveSyncReqVO.setCreaterId("sss");
 
         BuApproveSyncBizApproveReqVO buApproveSyncBizApproveReqVO = new BuApproveSyncBizApproveReqVO();
-        buApproveSyncBizApproveReqVO.setBizId(UUIDUtils.getUUID());
-        buApproveSyncBizApproveReqVO.setBizTitle("ss");
+        buApproveSyncBizApproveReqVO.setTitle("ss");
         buApproveSyncBizApproveReqVO.setTaskClass("sss");
-        buApproveSyncBizApproveReqVO.setApproveMode("1");
-        buApproveSyncBizApproveReqVO.setBizTermStart(new Date());
-        buApproveSyncBizApproveReqVO.setBizTermEnd(new Date());
+        buApproveSyncBizApproveReqVO.setTaskStatus("1");
+        buApproveSyncBizApproveReqVO.setTaskTermStart(new Date());
+        buApproveSyncBizApproveReqVO.setTaskTermEnd(new Date());
 
         BuApproveSyncBizDataReqVO buApproveSyncBizDataReqVO = new BuApproveSyncBizDataReqVO();
-        buApproveSyncBizDataReqVO.setBizApprove(buApproveSyncBizApproveReqVO);
+        buApproveSyncBizDataReqVO.setTaskInfo(buApproveSyncBizApproveReqVO);
         buApproveSyncReqVO.setBizData(buApproveSyncBizDataReqVO);
 
         ResponseStatus responseStatus = noticeBusiness.retryRequestSyncToBu(buApproveSyncReqVO);