【DAOP-1.0】数据需求

【功能点】功能开发

 package com.csbr.qingcloud.portal.controller;
 package com.csbr.qingcloud.portal.controller;
 
 
 import com.csbr.cloud.common.response.CommonRes;
 import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.DemandApproveVO;
 import csbr.cloud.entity.annotation.SystemLog;
 import csbr.cloud.entity.annotation.SystemLog;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
@@ -85,6 +86,14 @@ public class DemandController {
         return CommonRes.success(true);
         return CommonRes.success(true);
     }
     }
 
 
+    @PostMapping("/last-approve")
+    @SystemLog(value = "数据需求审批")
+    @Operation(summary = "数据需求审批-最后一个节点时调用")
+    public CommonRes<Boolean> lastApprove(@RequestBody DemandApproveVO dto) {
+        Boolean vo = demandService.lastApprove(dto);
+        return CommonRes.success(vo);
+    }
+    
     //endregion
     //endregion
     
     
 }
 }

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+* 项目结项表 视图对象类
+*
+* @author xiaocq
+* @date 2024-03-04
+*/
+@Data
+@Accessors(chain = true)
+@Schema(name = "项目结项审批传参")
+public class DemandApproveVO extends FlowUpdateStateDTO {
+
+    @Schema(description = "业务唯一标识")
+    private String bizGuid;
+
+    @Schema(description = "合同附件")
+    private String contractAttachJson;
+
+    @Schema(description = "加工单位类型")
+    private String processCompanyType;
+
+    @Schema(description = "加工单位唯一标识")
+    private String processCompanyGuid;
+
+    @Schema(description = "加工单位名称")
+    private String processCompanyName;
+
+
+}

@@ -208,6 +208,18 @@ public class DemandRSVO {
     @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】")
     @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】")
     private String productAcceptState;
     private String productAcceptState;
 
 
+    @Schema(description = "合同附件")
+    private String contractAttachJson;
+
+    @Schema(description = "加工单位类型")
+    private String processCompanyType;
+
+    @Schema(description = "加工单位唯一标识")
+    private String processCompanyGuid;
+
+    @Schema(description = "加工单位名称")
+    private String productAcceptName;
+    
     /******** 库表存储属性 需处理 *****/
     /******** 库表存储属性 需处理 *****/
     
     
     /******** 自定义扩展 *****/
     /******** 自定义扩展 *****/

@@ -203,4 +203,16 @@ public class MfDemand extends BaseShardingDO {
     @Name("产品验收状态【N未开始 A进行中 Y已完成】")
     @Name("产品验收状态【N未开始 A进行中 Y已完成】")
     private String productAcceptState;
     private String productAcceptState;
 
 
+    @Name("合同附件")
+    private String contractAttachJson;
+
+    @Name("加工单位类型")
+    private String processCompanyType;
+
+    @Name("加工单位唯一标识")
+    private String processCompanyGuid;
+
+    @Name("加工单位名称")
+    private String processCompanyName;
+
 }
 }

 package com.csbr.qingcloud.portal.service;
 package com.csbr.qingcloud.portal.service;
 
 
+import com.csbr.qingcloud.portal.domain.vo.DemandApproveVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
@@ -70,4 +71,5 @@ public interface DemandService {
      */
      */
     void flowCallBack(BizCallbackDTO dto);
     void flowCallBack(BizCallbackDTO dto);
 
 
+    Boolean lastApprove(DemandApproveVO dto);
 }
 }

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
+import com.csbr.cloud.workflow.feign.WorkflowFeign;
+import com.csbr.qingcloud.portal.domain.vo.DemandApproveVO;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import com.csbr.cloud.common.exception.CsbrSystemException;
 import com.csbr.cloud.common.exception.CsbrSystemException;
 import com.csbr.cloud.common.util.CommonUtil;
 import com.csbr.cloud.common.util.CommonUtil;
@@ -51,7 +54,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
     /**
     /**
      * 流程类型
      * 流程类型
      */
      */
-    private static final String FLOW_TYPE = "10015";
+    private static final String FLOW_TYPE = WorkFlowBizEnum.DATA_DEMAND.getValue();
     
     
     @Resource
     @Resource
     private MfDemandService mfDemandService;
     private MfDemandService mfDemandService;
@@ -65,6 +68,9 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
     @Resource
     @Resource
     private MessageSourceUtil messageSourceUtil;
     private MessageSourceUtil messageSourceUtil;
 
 
+    @Resource
+    private WorkflowFeign workflowFeign;
+
     /**
     /**
      * 数据需求分页查询
      * 数据需求分页查询
      * @author xcq
      * @author xcq
@@ -77,8 +83,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         beforeQuery(queryVO);
         beforeQuery(queryVO);
         if (queryVO.getIsNeedQuery()) {
         if (queryVO.getIsNeedQuery()) {
             LambdaQueryWrapper<MfDemand> queryWrapper = mfDemandService.csbrQueryWrapper(queryVO, MfDemand.class);
             LambdaQueryWrapper<MfDemand> queryWrapper = mfDemandService.csbrQueryWrapper(queryVO, MfDemand.class);
-            queryWrapper.in(CollectionUtils.isNotEmpty(queryVO.getGuidList()), MfDemand::getGuid,
-                queryVO.getGuidList());
+            queryWrapper.in(CollectionUtils.isNotEmpty(queryVO.getGuidList()), MfDemand::getGuid,queryVO.getGuidList());
             queryWrapper.orderByDesc(MfDemand::getCreateTime);
             queryWrapper.orderByDesc(MfDemand::getCreateTime);
             PageListVO<MfDemand> pageList = mfDemandService.csbrPageList(queryVO, queryWrapper);
             PageListVO<MfDemand> pageList = mfDemandService.csbrPageList(queryVO, queryWrapper);
             PageListVO<DemandRSVO> rsPageList = csbrBeanUtil.convert(pageList, PageListVO.class);
             PageListVO<DemandRSVO> rsPageList = csbrBeanUtil.convert(pageList, PageListVO.class);
@@ -248,6 +253,21 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         }
         }
     }
     }
 
 
+    @GlobalTransactional
+    @Override
+    public Boolean lastApprove(DemandApproveVO dto) {
+        MfDemand entity = mfDemandService.getById(dto.getBizGuid());
+        entity.setContractAttachJson(dto.getContractAttachJson());
+        entity.setProcessCompanyType(dto.getProcessCompanyType());
+        entity.setProcessCompanyGuid(dto.getProcessCompanyGuid());
+        entity.setProcessCompanyName(dto.getProcessCompanyName());
+        mfDemandService.updateById(entity);
+        FlowUpdateStateDTO flowDTO = csbrBeanUtil.convert(dto,FlowUpdateStateDTO.class);
+        workflowFeign.allowFlowCore(flowDTO).getData();
+
+        return true;
+    }
+
     /**
     /**
      * 获取发起流程参数
      * 获取发起流程参数
      * @author xcq
      * @author xcq

@@ -54,7 +54,7 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
     /**
     /**
      * 流程类型
      * 流程类型
      */
      */
-    private static final String FLOW_TYPE = "10016";
+    private static final String FLOW_TYPE = WorkFlowBizEnum.SERVICE_MAINTAIN.getValue();
     
     
     @Resource
     @Resource
     private MfServicerMaintainService mfServicerMaintainService;
     private MfServicerMaintainService mfServicerMaintainService;