选择审核人

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/BoilerTaskOrderController.java

@@ -291,7 +291,7 @@ public class BoilerTaskOrderController {
 
     @PutMapping("/order-item/report/prepare/submit")
     @Operation(summary = "任务单-报告编制录入提交")
-    public CommonResult<Boolean> orderItemPrepare(@RequestBody BoilerOrderItemPrepareVO orderItemPrepareVO) {
+    public CommonResult<Boolean> orderItemPrepare(@RequestBody BoilerOrderItemPrepareVO orderItemPrepareVO) throws Exception {
         boilerTaskOrderService.updateOrderItemPrepare(orderItemPrepareVO);
         return success(true);
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerOrderItemPrepareVO.java

@@ -17,6 +17,8 @@ public class BoilerOrderItemPrepareVO {
     @Schema(description = "审核人id")
     private String approveId;
 
+    private String auditor;
+
     private Integer reportType;
 
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/synchronization/SynchronizationController.java

@@ -65,7 +65,7 @@ public class SynchronizationController {
 //    }
 
     @GetMapping("/authorizeSignature/{reportId}")
-    public CommonResult<List<SignatureDto>> authorizeSignature(@PathVariable String reportId,@RequestParam("name") String name) {
+    public CommonResult<List<SignatureDto>> authorizeSignature(@PathVariable String reportId, @RequestParam(value = "name", required = false) String name) {
         return CommonResult.success(synchronizationService.authorizeSignature(reportId, name));
     }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/boilertaskorder/AppApiBoilerTaskOrderController.java

@@ -303,7 +303,7 @@ public class AppApiBoilerTaskOrderController {
 
     @PutMapping("/order-item/report/prepare/submit")
     @Operation(summary = "任务单-报告编制录入提交")
-    public CommonResult<Boolean> orderItemPrepare(@RequestBody BoilerOrderItemPrepareVO orderItemPrepareVO) {
+    public CommonResult<Boolean> orderItemPrepare(@RequestBody BoilerOrderItemPrepareVO orderItemPrepareVO) throws Exception {
         boilerTaskOrderService.updateOrderItemPrepare(orderItemPrepareVO);
         return success(true);
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderService.java

@@ -129,7 +129,7 @@ public interface BoilerTaskOrderService extends IService<BoilerTaskOrderDO>  {
 
     void updateOrderItemPrepareSave(BoilerOrderItemPrepareVO orderItemPrepareVO);
 
-    void updateOrderItemPrepare(BoilerOrderItemPrepareVO orderItemPrepareVO);
+    void updateOrderItemPrepare(BoilerOrderItemPrepareVO orderItemPrepareVO) throws Exception;
 
 
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -3860,7 +3860,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
     @Override
     @Transactional
-    public void updateOrderItemPrepare(BoilerOrderItemPrepareVO orderItemPrepareVO) {
+    public void updateOrderItemPrepare(BoilerOrderItemPrepareVO orderItemPrepareVO) throws Exception {
 
         BoilerTaskOrderItemReportDO taskOrderItemReportDO = taskOrderItemReportMapper.selectById(orderItemPrepareVO.getId());
         String userId = getLoginUserId();
@@ -3926,7 +3926,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
      * @param taskOrderItemReportDO
      * @param updateObj
      */
-    private void sendApproval(BoilerTaskOrderItemReportDO taskOrderItemReportDO, BoilerTaskOrderItemReportDO updateObj) {
+    private void sendApproval(BoilerTaskOrderItemReportDO taskOrderItemReportDO, BoilerTaskOrderItemReportDO updateObj) throws Exception {
         log.info("发起oa审核");
         try {
             ExternalOACreateFlowRes externalOAFlow = createExternalOAFlow(taskOrderItemReportDO,updateObj);
@@ -3938,8 +3938,13 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             }
         } catch (Exception e) {
             log.error("发起oa审核异常", e);
+            throw e;
         }
     }
+
+    @Value("${external.oa.rest.enableProd}")
+    private boolean enablProd;
+
     /**
      * 创建外部OA流程
      *
@@ -4001,14 +4006,19 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             formmain_0042.setDiscount(snowflakeNextIdStr);
             thirdAttachments.add(externalOACreateFlowBodyAttReq);
         }
-        externalOACreateFlowBodyDataReq.setFormmain_0042(formmain_0042);
         externalOACreateFlowReq.setData(externalOACreateFlowBodyDataReq);
         externalOACreateFlowReq.setThirdAttachments(thirdAttachments);
-//        String auditor = updateObj.getAuditor();
-//        AdminUserRespDTO checkedData = adminUserApi.getUserByEmployeeNo(auditor).getCheckedData();
-        String approvalId = updateObj.getApprovalId();
-        AdminUserRespDTO checkedData = adminUserApi.getUser(approvalId).getCheckedData();
-        return externalOAService.createExternalOAFlow(externalOACreateFlowReq,checkedData.getUsername());
+        String auditor = updateObj.getAuditor();
+        AdminUserRespDTO checkedData = adminUserApi.getUserByEmployeeNo(auditor).getCheckedData();
+        formmain_0042.setApproval(checkedData.getEmployeeNo());
+        String loginUserId = getLoginUserId();
+        String employeeNo = adminUserApi.getUser(loginUserId).getCheckedData().getEmployeeNo();
+        if (!enablProd){
+            employeeNo = "300801";
+        }
+        externalOACreateFlowBodyDataReq.setFormmain_0042(formmain_0042);
+        return externalOAService.createExternalOAFlow(externalOACreateFlowReq,employeeNo);
+//        return externalOAService.createExternalOAFlow(externalOACreateFlowReq,checkedData.getUsername());
     }
 
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/externalOA/vo/ExternalOACreateFlowBodyDataReq.java

@@ -18,5 +18,6 @@ public class ExternalOACreateFlowBodyDataReq {
         private String discount;
         private String reportnum;
         private String property;
+        private String approval;
     }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -3082,6 +3082,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         }
         updateObj.setTaskStatus(TaskOrderStatusEnum.REPORT_APPROVAL.getStatus());
         updateObj.setApprovalId(orderItemPrepareVO.getApproveId());
+        updateObj.setAuditor(orderItemPrepareVO.getAuditor());
 
         AdminUserRespDTO approveUser = adminUserApi.getUser(orderItemPrepareVO.getApproveId()).getData();
         if (approveUser != null) {
@@ -3145,8 +3146,13 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             }
         } catch (Exception e) {
             log.error("发起oa审核异常", e);
+            throw e;
         }
     }
+
+    @Value("${external.oa.rest.enableProd}")
+    private boolean enablProd;
+
     /**
      * 创建外部OA流程
      *
@@ -3214,14 +3220,18 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             formmain_0042.setDiscount(snowflakeNextIdStr);
             thirdAttachments.add(externalOACreateFlowBodyAttReq);
         }
-        externalOACreateFlowBodyDataReq.setFormmain_0042(formmain_0042);
         externalOACreateFlowReq.setData(externalOACreateFlowBodyDataReq);
         externalOACreateFlowReq.setThirdAttachments(thirdAttachments);
-//        String auditor = updateObj.getAuditor();
-//        AdminUserRespDTO checkedData = adminUserApi.getUserByEmployeeNo(auditor).getCheckedData();
-        String approvalId = updateObj.getApprovalId();
-        AdminUserRespDTO checkedData = adminUserApi.getUser(approvalId).getCheckedData();
-        return externalOAService.createExternalOAFlow(externalOACreateFlowReq,checkedData.getUsername());
+        String auditor = updateObj.getAuditor();
+        AdminUserRespDTO checkedData = adminUserApi.getUserByEmployeeNo(auditor).getCheckedData();
+        formmain_0042.setApproval(checkedData.getEmployeeNo());
+        String loginUserId = getLoginUserId();
+        String employeeNo = adminUserApi.getUser(loginUserId).getCheckedData().getEmployeeNo();
+        if (!enablProd){
+            employeeNo = "300801";
+        }
+        externalOACreateFlowBodyDataReq.setFormmain_0042(formmain_0042);
+        return externalOAService.createExternalOAFlow(externalOACreateFlowReq,employeeNo);
 //        return null;
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/synchronization/SynchronizationServiceImpl.java

@@ -309,6 +309,9 @@ public class SynchronizationServiceImpl implements SynchronizationService {
 
     @Override
     public List<SignatureDto> authorizeSignature(String reportId, String name) {
+        if (name == null) {
+            name = "";
+        }
         BoilerTaskOrderItemReportDO boilerTaskOrderItemReportDO = boilerTaskOrderItemReportService.getById(reportId);
         if (boilerTaskOrderItemReportDO != null) {
             Map<String, Object> map = new HashMap<>();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/synchronization/dto/SignatureDto.java

@@ -1,16 +1,26 @@
 package cn.start.tz.module.pressure2.service.synchronization.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class SignatureDto {
+    @JsonProperty("name")
     private String NAME;
+    @JsonProperty("code")
     private String CODE;
+    @JsonProperty("createTime")
     private String CREATE_TIME;
+    @JsonProperty("field0001")
     private String FIELD0001;
+    @JsonProperty("field0003")
     private String FIELD0003;
+    @JsonProperty("field0004")
     private String FIELD0004;
+    @JsonProperty("field0005")
     private String FIELD0005;
+    @JsonProperty("field0007")
     private String FIELD0007;
+    @JsonProperty("modifyDate")
     private String MODIFY_DATE;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/application-hsd.yaml

@@ -176,6 +176,7 @@ external:
       userName: flowsend
       password: 69030b1b-44b7-45d0-aaf3-e73968933642
       loginName: 300801
+      enableProd: false
     # 定时获取状态
     cron: 0 0 0 * * ?
 synchronization:

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/application-hst.yaml

@@ -159,6 +159,7 @@ external:
       userName: flowsend
       password: 69030b1b-44b7-45d0-aaf3-e73968933642
       loginName: 300801
+      enableProd: false
     # 定时获取状态
     cron: 0 0 0 * * ?
 synchronization:

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/application-uat.yaml

@@ -162,6 +162,7 @@ external:
       userName: flowsend
       password: 69030b1b-44b7-45d0-aaf3-e73968933642
       loginName: 300801
+      enableProd: false
     # 定时获取状态
     cron: 0 0 * * * ?
 synchronization: