Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
1c24a3f8 by 肖初晴
Options

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

2 parents 44af5973 2e3d99d8
Inline Side-by-side
Showing 8 changed files with 66 additions and 13 deletions
src/main/java/com/csbr/qingcloud/portal/domain/vo/DemandRQVO.java
...@@ -28,6 +28,9 @@ public class DemandRQVO extends FlowRQBaseVO { ...@@ -28,6 +28,9 @@ public class DemandRQVO extends FlowRQBaseVO {
28 */ 28 */
29 @Schema(description = "需求类型") 29 @Schema(description = "需求类型")
30 private String requirementType; 30 private String requirementType;
31
32 @Schema(title = "专区名称")
33 private String zqName;
31 34
32 /** 35 /**
33 * 需求分类【1新增 2调整】 36 * 需求分类【1新增 2调整】
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/DemandRSVO.java
...@@ -231,6 +231,15 @@ public class DemandRSVO { ...@@ -231,6 +231,15 @@ public class DemandRSVO {
231 231
232 @Schema(description = "加工单编号") 232 @Schema(description = "加工单编号")
233 private String processOrderNo; 233 private String processOrderNo;
234
235 @Schema(title = "专区名称")
236 private String zqName;
237
238 /**
239 * 跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)
240 */
241 @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
242 private String crossPlatformApproveState;
234 243
235 /******** 库表存储属性 需处理 *****/ 244 /******** 库表存储属性 需处理 *****/
236 245
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseRQVO.java
...@@ -24,6 +24,9 @@ public class EnterpriseRQVO extends FlowRQBaseVO { ...@@ -24,6 +24,9 @@ public class EnterpriseRQVO extends FlowRQBaseVO {
24 */ 24 */
25 @Schema(description = "公司名称") 25 @Schema(description = "公司名称")
26 private String tenantName; 26 private String tenantName;
27
28 @Schema(title = "专区名称")
29 private String zqName;
27 30
28 /** 31 /**
29 * 统一社会信用代码 32 * 统一社会信用代码
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseRSVO.java
...@@ -188,6 +188,15 @@ public class EnterpriseRSVO { ...@@ -188,6 +188,15 @@ public class EnterpriseRSVO {
188 188
189 @Schema(description = "提交时间") 189 @Schema(description = "提交时间")
190 private Date createTime; 190 private Date createTime;
191
192 @Schema(title = "专区名称")
193 private String zqName;
194
195 /**
196 * 跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)
197 */
198 @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
199 private String crossPlatformApproveState;
191 200
192 /******** 库表存储属性 需处理 *****/ 201 /******** 库表存储属性 需处理 *****/
193 202
......
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfDemand.java
...@@ -221,4 +221,13 @@ public class MfDemand extends BaseShardingDO { ...@@ -221,4 +221,13 @@ public class MfDemand extends BaseShardingDO {
221 @Name("加工单编号") 221 @Name("加工单编号")
222 private String processOrderNo; 222 private String processOrderNo;
223 223
224 @Name("资产Guid")
225 private String zqBizGuid;
226
227 @Name("专区名称")
228 private String zqName;
229
230 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
231 private String crossPlatformApproveState;
232
224 } 233 }
......
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfEnterprise.java
...@@ -171,6 +171,15 @@ public class MfEnterprise extends BaseDO { ...@@ -171,6 +171,15 @@ public class MfEnterprise extends BaseDO {
171 */ 171 */
172 @Name("授权委托书") 172 @Name("授权委托书")
173 private String authorizationLetter; 173 private String authorizationLetter;
174
175 @Name("资产Guid")
176 private String zqBizGuid;
177
178 @Name("专区名称")
179 private String zqName;
180
181 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
182 private String crossPlatformApproveState;
174 183
175 /** 184 /**
176 * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】 185 * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
......
src/main/java/com/csbr/qingcloud/portal/service/impl/DemandServiceImpl.java
1 package com.csbr.qingcloud.portal.service.impl; 1 package com.csbr.qingcloud.portal.service.impl;
2 2
3 import com.alibaba.fastjson.JSON;
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 5 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
5 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 6 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
...@@ -159,7 +160,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService ...@@ -159,7 +160,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
159 MfDemand entity = convertToEntity(rqVO); 160 MfDemand entity = convertToEntity(rqVO);
160 entity.setRequirementOrderNo(configureFeign.newCode(new RuleDTO().setRuleName("demand-code").setRuleType("generate")).getData()); 161 entity.setRequirementOrderNo(configureFeign.newCode(new RuleDTO().setRuleName("demand-code").setRuleType("generate")).getData());
161 // 发起审批流程或保存草稿 162 // 发起审批流程或保存草稿
162 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity); 163 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
163 super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState); 164 super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState);
164 // 业务数据保存 165 // 业务数据保存
165 boolean flag = mfDemandService.save(entity); 166 boolean flag = mfDemandService.save(entity);
...@@ -201,7 +202,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService ...@@ -201,7 +202,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
201 beforeUpdate(rqVO); 202 beforeUpdate(rqVO);
202 MfDemand entity = convertToEntity(rqVO); 203 MfDemand entity = convertToEntity(rqVO);
203 // 发起审批流程或保存草稿 204 // 发起审批流程或保存草稿
204 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity); 205 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
205 super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState); 206 super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
206 if (rqVO.getIsRestart()) { 207 if (rqVO.getIsRestart()) {
207 // 重新提交 208 // 重新提交
...@@ -373,12 +374,14 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService ...@@ -373,12 +374,14 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
373 374
374 /** 375 /**
375 * 获取发起流程参数 376 * 获取发起流程参数
376 * @author xcq 377 *
377 * @date 2024-12-31 18:46
378 * @param entity 378 * @param entity
379 * @param rqVO
379 * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO 380 * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO
381 * @author xcq
382 * @date 2024-12-31 18:46
380 */ 383 */
381 private AddApprovalDTO getAddApprovalDTO(MfDemand entity) { 384 private AddApprovalDTO getAddApprovalDTO(MfDemand entity, DemandRQVO rqVO) {
382 AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid()); 385 AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid());
383 // todo 386 // todo
384 approvalDTO.setFuncCode("SJXQ"); 387 approvalDTO.setFuncCode("SJXQ");
...@@ -391,6 +394,10 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService ...@@ -391,6 +394,10 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
391 approvalDTO.setParam3(null); 394 approvalDTO.setParam3(null);
392 approvalDTO.setParam4(null); 395 approvalDTO.setParam4(null);
393 396
397 // 增加跨服务审批字段
398 rqVO.setGuid(entity.getGuid());
399 approvalDTO.setBizData(JSON.toJSONString(rqVO));
400
394 return approvalDTO; 401 return approvalDTO;
395 } 402 }
396 403
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
...@@ -6,10 +6,8 @@ import com.alibaba.fastjson.JSONObject; ...@@ -6,10 +6,8 @@ import com.alibaba.fastjson.JSONObject;
6 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 6 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
7 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 7 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
8 import com.csbr.cloud.common.enums.SystemError; 8 import com.csbr.cloud.common.enums.SystemError;
9 import com.csbr.cloud.common.enums.UserError;
10 import com.csbr.cloud.common.enums.WorkFlowBizEnum; 9 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
11 import com.csbr.cloud.common.exception.CsbrSystemException; 10 import com.csbr.cloud.common.exception.CsbrSystemException;
12 import com.csbr.cloud.common.exception.CsbrUserException;
13 import com.csbr.cloud.common.util.CommonUtil; 11 import com.csbr.cloud.common.util.CommonUtil;
14 import com.csbr.cloud.common.util.CsbrBeanUtil; 12 import com.csbr.cloud.common.util.CsbrBeanUtil;
15 import com.csbr.cloud.common.util.MessageSourceUtil; 13 import com.csbr.cloud.common.util.MessageSourceUtil;
...@@ -21,7 +19,6 @@ import com.csbr.cloud.workflow.util.FlowAbstractImpl; ...@@ -21,7 +19,6 @@ import com.csbr.cloud.workflow.util.FlowAbstractImpl;
21 import com.csbr.qingcloud.portal.domain.vo.*; 19 import com.csbr.qingcloud.portal.domain.vo.*;
22 import com.csbr.qingcloud.portal.feign.ConfigureFeign; 20 import com.csbr.qingcloud.portal.feign.ConfigureFeign;
23 import com.csbr.qingcloud.portal.feign.PersonelFeign; 21 import com.csbr.qingcloud.portal.feign.PersonelFeign;
24 import com.csbr.qingcloud.portal.feign.UserFeign;
25 import com.csbr.qingcloud.portal.mybatis.entity.MfDemand; 22 import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
26 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise; 23 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
27 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove; 24 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
...@@ -40,6 +37,7 @@ import org.apache.commons.collections.CollectionUtils; ...@@ -40,6 +37,7 @@ import org.apache.commons.collections.CollectionUtils;
40 import org.apache.commons.lang3.StringUtils; 37 import org.apache.commons.lang3.StringUtils;
41 import org.springframework.stereotype.Service; 38 import org.springframework.stereotype.Service;
42 import org.springframework.transaction.annotation.Transactional; 39 import org.springframework.transaction.annotation.Transactional;
40
43 import java.util.ArrayList; 41 import java.util.ArrayList;
44 import java.util.List; 42 import java.util.List;
45 43
...@@ -199,7 +197,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -199,7 +197,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
199 beforeSave(rqVO); 197 beforeSave(rqVO);
200 MfEnterprise entity = convertToEntity(rqVO); 198 MfEnterprise entity = convertToEntity(rqVO);
201 // 发起审批流程或保存草稿 199 // 发起审批流程或保存草稿
202 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity); 200 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
203 super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState); 201 super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState);
204 // 业务数据保存 202 // 业务数据保存
205 boolean flag = mfEnterpriseService.save(entity); 203 boolean flag = mfEnterpriseService.save(entity);
...@@ -226,7 +224,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -226,7 +224,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
226 beforeUpdate(rqVO); 224 beforeUpdate(rqVO);
227 MfEnterprise entity = convertToEntity(rqVO); 225 MfEnterprise entity = convertToEntity(rqVO);
228 // 发起审批流程或保存草稿 226 // 发起审批流程或保存草稿
229 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity); 227 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
230 super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState); 228 super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
231 if (rqVO.getIsRestart()) { 229 if (rqVO.getIsRestart()) {
232 // 重新提交 230 // 重新提交
...@@ -432,12 +430,14 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -432,12 +430,14 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
432 430
433 /** 431 /**
434 * 获取发起流程参数 432 * 获取发起流程参数
435 * @author xcq 433 *
436 * @date 2024-12-26 16:18
437 * @param entity 434 * @param entity
435 * @param rqVO
438 * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO 436 * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO
437 * @author xcq
438 * @date 2024-12-26 16:18
439 */ 439 */
440 private AddApprovalDTO getAddApprovalDTO(MfEnterprise entity) { 440 private AddApprovalDTO getAddApprovalDTO(MfEnterprise entity, EnterpriseRQVO rqVO) {
441 AddApprovalDTO approvalDTO = new AddApprovalDTO(WorkFlowBizEnum.ENTERPRISE_APPLY.getValue(), entity.getGuid()); 441 AddApprovalDTO approvalDTO = new AddApprovalDTO(WorkFlowBizEnum.ENTERPRISE_APPLY.getValue(), entity.getGuid());
442 // todo 442 // todo
443 approvalDTO.setFuncCode("QYRZ"); 443 approvalDTO.setFuncCode("QYRZ");
...@@ -451,6 +451,10 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -451,6 +451,10 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
451 approvalDTO.setParam3(entity.getSocialCreditCode()); 451 approvalDTO.setParam3(entity.getSocialCreditCode());
452 approvalDTO.setParam4(String.format("%s_%s_%s",entity.getJuridicalPerson(),entity.getContacts(),entity.getContactTel())); 452 approvalDTO.setParam4(String.format("%s_%s_%s",entity.getJuridicalPerson(),entity.getContacts(),entity.getContactTel()));
453 453
454 // 增加跨服务审批字段
455 rqVO.setGuid(entity.getGuid());
456 approvalDTO.setBizData(JSON.toJSONString(rqVO));
457
454 return approvalDTO; 458 return approvalDTO;
455 } 459 }
456 460
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!