Merge remote-tracking branch 'origin/develop' into develop

@@ -29,6 +29,9 @@ public class DemandRQVO extends FlowRQBaseVO {
     @Schema(description = "需求类型")
     private String requirementType;
 
+    @Schema(title = "专区名称")
+    private String zqName;
+    
     /**
      * 需求分类【1新增 2调整】
      */

@@ -232,6 +232,15 @@ public class DemandRSVO {
     @Schema(description = "加工单编号")
     private String processOrderNo;
 
+    @Schema(title = "专区名称")
+    private String zqName;
+
+    /**
+     * 跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)
+     */
+    @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+    
     /******** 库表存储属性 需处理 *****/
     
     /******** 自定义扩展 *****/

@@ -25,6 +25,9 @@ public class EnterpriseRQVO extends FlowRQBaseVO {
     @Schema(description = "公司名称")
     private String tenantName;
 
+    @Schema(title = "专区名称")
+    private String zqName;
+    
     /**
      * 统一社会信用代码
      */

@@ -189,6 +189,15 @@ public class EnterpriseRSVO {
     @Schema(description = "提交时间")
     private Date createTime;
 
+    @Schema(title = "专区名称")
+    private String zqName;
+
+    /**
+     * 跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)
+     */
+    @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+    
     /******** 库表存储属性 需处理 *****/
     
     /******** 自定义扩展 *****/

@@ -221,4 +221,13 @@ public class MfDemand extends BaseShardingDO {
     @Name("加工单编号")
     private String processOrderNo;
 
+    @Name("资产Guid")
+    private String zqBizGuid;
+
+    @Name("专区名称")
+    private String zqName;
+
+    @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+
 }

@@ -172,6 +172,15 @@ public class MfEnterprise extends BaseDO {
     @Name("授权委托书")
     private String authorizationLetter;
 
+    @Name("资产Guid")
+    private String zqBizGuid;
+
+    @Name("专区名称")
+    private String zqName;
+
+    @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+    
     /**
     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
     */

 package com.csbr.qingcloud.portal.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -159,7 +160,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         MfDemand entity = convertToEntity(rqVO);
         entity.setRequirementOrderNo(configureFeign.newCode(new RuleDTO().setRuleName("demand-code").setRuleType("generate")).getData());
         // 发起审批流程或保存草稿
-        AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
+        AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState);
         // 业务数据保存
         boolean flag = mfDemandService.save(entity);
@@ -201,7 +202,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         beforeUpdate(rqVO);
         MfDemand entity = convertToEntity(rqVO);
         // 发起审批流程或保存草稿
-        AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
+        AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
         if (rqVO.getIsRestart()) {
             // 重新提交
@@ -373,12 +374,14 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
 
     /**
      * 获取发起流程参数
-     * @author xcq
-     * @date 2024-12-31 18:46
+     *
      * @param entity
+     * @param rqVO
      * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO
+     * @author xcq
+     * @date 2024-12-31 18:46
      */
-    private AddApprovalDTO getAddApprovalDTO(MfDemand entity) {
+    private AddApprovalDTO getAddApprovalDTO(MfDemand entity, DemandRQVO rqVO) {
         AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid());
         // todo
         approvalDTO.setFuncCode("SJXQ");
@@ -391,6 +394,10 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         approvalDTO.setParam3(null);
         approvalDTO.setParam4(null);
 
+        // 增加跨服务审批字段
+        rqVO.setGuid(entity.getGuid());
+        approvalDTO.setBizData(JSON.toJSONString(rqVO));
+
         return approvalDTO;
     }
 

@@ -6,10 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.csbr.cloud.common.enums.SystemError;
-import com.csbr.cloud.common.enums.UserError;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
 import com.csbr.cloud.common.exception.CsbrSystemException;
-import com.csbr.cloud.common.exception.CsbrUserException;
 import com.csbr.cloud.common.util.CommonUtil;
 import com.csbr.cloud.common.util.CsbrBeanUtil;
 import com.csbr.cloud.common.util.MessageSourceUtil;
@@ -21,7 +19,6 @@ import com.csbr.cloud.workflow.util.FlowAbstractImpl;
 import com.csbr.qingcloud.portal.domain.vo.*;
 import com.csbr.qingcloud.portal.feign.ConfigureFeign;
 import com.csbr.qingcloud.portal.feign.PersonelFeign;
-import com.csbr.qingcloud.portal.feign.UserFeign;
 import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
@@ -40,6 +37,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -199,7 +197,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         beforeSave(rqVO);
         MfEnterprise entity = convertToEntity(rqVO);
         // 发起审批流程或保存草稿
-        AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
+        AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState);
         // 业务数据保存
         boolean flag = mfEnterpriseService.save(entity);
@@ -226,7 +224,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         beforeUpdate(rqVO);
         MfEnterprise entity = convertToEntity(rqVO);
         // 发起审批流程或保存草稿
-        AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
+        AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
         if (rqVO.getIsRestart()) {
             // 重新提交
@@ -432,12 +430,14 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
 
     /**
      * 获取发起流程参数
-     * @author xcq
-     * @date 2024-12-26 16:18
+     *
      * @param entity
+     * @param rqVO
      * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO
+     * @author xcq
+     * @date 2024-12-26 16:18
      */
-    private AddApprovalDTO getAddApprovalDTO(MfEnterprise entity) {
+    private AddApprovalDTO getAddApprovalDTO(MfEnterprise entity, EnterpriseRQVO rqVO) {
         AddApprovalDTO approvalDTO = new AddApprovalDTO(WorkFlowBizEnum.ENTERPRISE_APPLY.getValue(), entity.getGuid());
         // todo
         approvalDTO.setFuncCode("QYRZ");
@@ -451,6 +451,10 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         approvalDTO.setParam3(entity.getSocialCreditCode());
         approvalDTO.setParam4(String.format("%s_%s_%s",entity.getJuridicalPerson(),entity.getContacts(),entity.getContactTel()));
 
+        // 增加跨服务审批字段
+        rqVO.setGuid(entity.getGuid());
+        approvalDTO.setBizData(JSON.toJSONString(rqVO));
+
         return approvalDTO;
     }