Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
69b06d38 by 肖初晴
Options

【DAOP-1.0】数据需求 

【功能点】功能开发
1 parent b481e3f8
Inline Side-by-side
Showing 7 changed files with 98 additions and 6 deletions
src/main/java/com/csbr/qingcloud/portal/controller/DemandController.java
1 package com.csbr.qingcloud.portal.controller; 1 package com.csbr.qingcloud.portal.controller;
2 2
3 import com.csbr.cloud.common.response.CommonRes; 3 import com.csbr.cloud.common.response.CommonRes;
4 import com.csbr.qingcloud.portal.domain.vo.DemandApproveVO;
4 import csbr.cloud.entity.annotation.SystemLog; 5 import csbr.cloud.entity.annotation.SystemLog;
5 import csbr.cloud.entity.domain.base.vo.PageListVO; 6 import csbr.cloud.entity.domain.base.vo.PageListVO;
6 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 7 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
...@@ -84,6 +85,14 @@ public class DemandController { ...@@ -84,6 +85,14 @@ public class DemandController {
84 demandService.flowCallBack(dto); 85 demandService.flowCallBack(dto);
85 return CommonRes.success(true); 86 return CommonRes.success(true);
86 } 87 }
88
89 @PostMapping("/last-approve")
90 @SystemLog(value = "数据需求审批")
91 @Operation(summary = "数据需求审批-最后一个节点时调用")
92 public CommonRes<Boolean> lastApprove(@RequestBody DemandApproveVO dto) {
93 Boolean vo = demandService.lastApprove(dto);
94 return CommonRes.success(vo);
95 }
87 96
88 //endregion 97 //endregion
89 98
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/DemandApproveVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo;
2
3 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
4 import io.swagger.v3.oas.annotations.media.Schema;
5 import lombok.Data;
6 import lombok.experimental.Accessors;
7
8 import java.math.BigDecimal;
9
10 /**
11 * 项目结项表 视图对象类
12 *
13 * @author xiaocq
14 * @date 2024-03-04
15 */
16 @Data
17 @Accessors(chain = true)
18 @Schema(name = "项目结项审批传参")
19 public class DemandApproveVO extends FlowUpdateStateDTO {
20
21 @Schema(description = "业务唯一标识")
22 private String bizGuid;
23
24 @Schema(description = "合同附件")
25 private String contractAttachJson;
26
27 @Schema(description = "加工单位类型")
28 private String processCompanyType;
29
30 @Schema(description = "加工单位唯一标识")
31 private String processCompanyGuid;
32
33 @Schema(description = "加工单位名称")
34 private String processCompanyName;
35
36
37 }
src/main/java/com/csbr/qingcloud/portal/domain/vo/DemandRSVO.java
...@@ -207,6 +207,18 @@ public class DemandRSVO { ...@@ -207,6 +207,18 @@ public class DemandRSVO {
207 */ 207 */
208 @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】") 208 @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】")
209 private String productAcceptState; 209 private String productAcceptState;
210
211 @Schema(description = "合同附件")
212 private String contractAttachJson;
213
214 @Schema(description = "加工单位类型")
215 private String processCompanyType;
216
217 @Schema(description = "加工单位唯一标识")
218 private String processCompanyGuid;
219
220 @Schema(description = "加工单位名称")
221 private String productAcceptName;
210 222
211 /******** 库表存储属性 需处理 *****/ 223 /******** 库表存储属性 需处理 *****/
212 224
......
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfDemand.java
...@@ -203,4 +203,16 @@ public class MfDemand extends BaseShardingDO { ...@@ -203,4 +203,16 @@ public class MfDemand extends BaseShardingDO {
203 @Name("产品验收状态【N未开始 A进行中 Y已完成】") 203 @Name("产品验收状态【N未开始 A进行中 Y已完成】")
204 private String productAcceptState; 204 private String productAcceptState;
205 205
206 @Name("合同附件")
207 private String contractAttachJson;
208
209 @Name("加工单位类型")
210 private String processCompanyType;
211
212 @Name("加工单位唯一标识")
213 private String processCompanyGuid;
214
215 @Name("加工单位名称")
216 private String processCompanyName;
217
206 } 218 }
......
src/main/java/com/csbr/qingcloud/portal/service/DemandService.java
1 package com.csbr.qingcloud.portal.service; 1 package com.csbr.qingcloud.portal.service;
2 2
3 import com.csbr.qingcloud.portal.domain.vo.DemandApproveVO;
3 import csbr.cloud.entity.domain.base.vo.PageListVO; 4 import csbr.cloud.entity.domain.base.vo.PageListVO;
4 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 5 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
5 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; 6 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
...@@ -69,5 +70,6 @@ public interface DemandService { ...@@ -69,5 +70,6 @@ public interface DemandService {
69 * @return void 70 * @return void
70 */ 71 */
71 void flowCallBack(BizCallbackDTO dto); 72 void flowCallBack(BizCallbackDTO dto);
72 73
74 Boolean lastApprove(DemandApproveVO dto);
73 } 75 }
......
src/main/java/com/csbr/qingcloud/portal/service/impl/DemandServiceImpl.java
...@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
5 import com.csbr.cloud.common.enums.SystemError; 5 import com.csbr.cloud.common.enums.SystemError;
6 import com.csbr.cloud.common.enums.WorkFlowBizEnum; 6 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
7 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
8 import com.csbr.cloud.workflow.feign.WorkflowFeign;
9 import com.csbr.qingcloud.portal.domain.vo.DemandApproveVO;
7 import csbr.cloud.entity.enums.ApprovalStateEnum; 10 import csbr.cloud.entity.enums.ApprovalStateEnum;
8 import com.csbr.cloud.common.exception.CsbrSystemException; 11 import com.csbr.cloud.common.exception.CsbrSystemException;
9 import com.csbr.cloud.common.util.CommonUtil; 12 import com.csbr.cloud.common.util.CommonUtil;
...@@ -51,7 +54,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService ...@@ -51,7 +54,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
51 /** 54 /**
52 * 流程类型 55 * 流程类型
53 */ 56 */
54 private static final String FLOW_TYPE = "10015"; 57 private static final String FLOW_TYPE = WorkFlowBizEnum.DATA_DEMAND.getValue();
55 58
56 @Resource 59 @Resource
57 private MfDemandService mfDemandService; 60 private MfDemandService mfDemandService;
...@@ -65,6 +68,9 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService ...@@ -65,6 +68,9 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
65 @Resource 68 @Resource
66 private MessageSourceUtil messageSourceUtil; 69 private MessageSourceUtil messageSourceUtil;
67 70
71 @Resource
72 private WorkflowFeign workflowFeign;
73
68 /** 74 /**
69 * 数据需求分页查询 75 * 数据需求分页查询
70 * @author xcq 76 * @author xcq
...@@ -77,8 +83,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService ...@@ -77,8 +83,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
77 beforeQuery(queryVO); 83 beforeQuery(queryVO);
78 if (queryVO.getIsNeedQuery()) { 84 if (queryVO.getIsNeedQuery()) {
79 LambdaQueryWrapper<MfDemand> queryWrapper = mfDemandService.csbrQueryWrapper(queryVO, MfDemand.class); 85 LambdaQueryWrapper<MfDemand> queryWrapper = mfDemandService.csbrQueryWrapper(queryVO, MfDemand.class);
80 queryWrapper.in(CollectionUtils.isNotEmpty(queryVO.getGuidList()), MfDemand::getGuid, 86 queryWrapper.in(CollectionUtils.isNotEmpty(queryVO.getGuidList()), MfDemand::getGuid,queryVO.getGuidList());
81 queryVO.getGuidList());
82 queryWrapper.orderByDesc(MfDemand::getCreateTime); 87 queryWrapper.orderByDesc(MfDemand::getCreateTime);
83 PageListVO<MfDemand> pageList = mfDemandService.csbrPageList(queryVO, queryWrapper); 88 PageListVO<MfDemand> pageList = mfDemandService.csbrPageList(queryVO, queryWrapper);
84 PageListVO<DemandRSVO> rsPageList = csbrBeanUtil.convert(pageList, PageListVO.class); 89 PageListVO<DemandRSVO> rsPageList = csbrBeanUtil.convert(pageList, PageListVO.class);
...@@ -247,7 +252,22 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService ...@@ -247,7 +252,22 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
247 throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, messageSourceUtil.updateMessage(String.format("%s的业务审批状态", FUNCTION_NAME))); 252 throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, messageSourceUtil.updateMessage(String.format("%s的业务审批状态", FUNCTION_NAME)));
248 } 253 }
249 } 254 }
250 255
256 @GlobalTransactional
257 @Override
258 public Boolean lastApprove(DemandApproveVO dto) {
259 MfDemand entity = mfDemandService.getById(dto.getBizGuid());
260 entity.setContractAttachJson(dto.getContractAttachJson());
261 entity.setProcessCompanyType(dto.getProcessCompanyType());
262 entity.setProcessCompanyGuid(dto.getProcessCompanyGuid());
263 entity.setProcessCompanyName(dto.getProcessCompanyName());
264 mfDemandService.updateById(entity);
265 FlowUpdateStateDTO flowDTO = csbrBeanUtil.convert(dto,FlowUpdateStateDTO.class);
266 workflowFeign.allowFlowCore(flowDTO).getData();
267
268 return true;
269 }
270
251 /** 271 /**
252 * 获取发起流程参数 272 * 获取发起流程参数
253 * @author xcq 273 * @author xcq
......
src/main/java/com/csbr/qingcloud/portal/service/impl/ServicerMaintainServiceImpl.java
...@@ -54,7 +54,7 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser ...@@ -54,7 +54,7 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
54 /** 54 /**
55 * 流程类型 55 * 流程类型
56 */ 56 */
57 private static final String FLOW_TYPE = "10016"; 57 private static final String FLOW_TYPE = WorkFlowBizEnum.SERVICE_MAINTAIN.getValue();
58 58
59 @Resource 59 @Resource
60 private MfServicerMaintainService mfServicerMaintainService; 60 private MfServicerMaintainService mfServicerMaintainService;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!