【DAOP-1.0】数据需求

【功能点】加工单状态问题处理

@@ -46,14 +46,6 @@ public class DemandController {
         demandService.updateDemand(vo);
         demandService.updateDemand(vo);
         return CommonRes.success(true);
         return CommonRes.success(true);
     }
     }
-
-    @PostMapping("/update-state")
-    @SystemLog(value = "数据需求-修改状态")
-    @Operation(summary = "数据需求-修改状态")
-    public CommonRes<Boolean> updateState(@RequestBody @Valid DemandUpdateStateVO vo) {
-        demandService.updateState(vo);
-        return CommonRes.success(true);
-    }
     
     
     @DeleteMapping("/delete")
     @DeleteMapping("/delete")
     @SystemLog(value = "数据需求-批量删除")
     @SystemLog(value = "数据需求-批量删除")

@@ -76,5 +76,4 @@ public interface DemandService {
 
 
     DemandRSVO getDemandDetailByProcess(String processOrderNo);
     DemandRSVO getDemandDetailByProcess(String processOrderNo);
 
 
-    void updateState(DemandUpdateStateVO vo);
 }
 }

@@ -125,7 +125,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         if (entity == null) {
         if (entity == null) {
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME)));
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME)));
         }
         }
-        return convertToVO(entity,getStateMap(Collections.singletonList(entity.getProcessCompanyGuid())));
+        return convertToVO(entity,getStateMap(Collections.singletonList(guid)));
     }
     }
 
 
     private Map<String, DemandUpdateStateVO> getStateMap(List<String> guids){
     private Map<String, DemandUpdateStateVO> getStateMap(List<String> guids){
@@ -283,7 +283,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
 
 
     private String addOrder(MfDemand bean,BizCallbackDTO dto){
     private String addOrder(MfDemand bean,BizCallbackDTO dto){
         ProcessOrderRQVO vo = csbrBeanUtil.convert(bean,ProcessOrderRQVO.class);
         ProcessOrderRQVO vo = csbrBeanUtil.convert(bean,ProcessOrderRQVO.class);
-        vo.setGuid(null);
+        vo.setGuid(bean.getGuid());
         vo.setTenantName(personelFeign.getAllTenantGuidNameMap().getData().get(bean.getTenantGuid()));
         vo.setTenantName(personelFeign.getAllTenantGuidNameMap().getData().get(bean.getTenantGuid()));
         vo.setRequirementOrderNo(bean.getRequirementOrderNo());
         vo.setRequirementOrderNo(bean.getRequirementOrderNo());
         vo.setProcessOrderNo(configureFeign.newCode(new RuleDTO().setRuleName("process-order-code").setRuleType("generate")).getData());
         vo.setProcessOrderNo(configureFeign.newCode(new RuleDTO().setRuleName("process-order-code").setRuleType("generate")).getData());
@@ -342,21 +342,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         if(CollectionUtils.isEmpty(list)){
         if(CollectionUtils.isEmpty(list)){
             return null;
             return null;
         }
         }
-        return convertToVO(list.get(0),getStateMap(Collections.singletonList(list.get(0).getProcessCompanyGuid())));
-    }
-
-    @Override
-    public void updateState(DemandUpdateStateVO vo) {
-        if(CollectionUtils.isEmpty(vo.getProcessCompanyGuidList())){
-            return;
-        }
-        LambdaUpdateWrapper<MfDemand> queryWrapper = new LambdaUpdateWrapper<>();
-        queryWrapper.in(MfDemand::getProcessCompanyGuid,vo.getProcessCompanyGuidList());
-        queryWrapper.set(StringUtils.isNotBlank(vo.getResourceAcquisitionState()),MfDemand::getResourceAcquisitionState,vo.getResourceAcquisitionState());
-        queryWrapper.set(StringUtils.isNotBlank(vo.getProductProcessingState()),MfDemand::getProductProcessingState,vo.getProductProcessingState());
-        queryWrapper.set(StringUtils.isNotBlank(vo.getProductDeliveryState()),MfDemand::getProductDeliveryState,vo.getProductDeliveryState());
-        queryWrapper.set(StringUtils.isNotBlank(vo.getProductAcceptState()),MfDemand::getProductAcceptState,vo.getProductAcceptState());
-        mfDemandService.update(queryWrapper);
+        return convertToVO(list.get(0),getStateMap(Collections.singletonList(list.get(0).getGuid())));
     }
     }
 
 
     /**
     /**
@@ -584,7 +570,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
     private void afterQuery(PageListVO<MfDemand> pageList, PageListVO<DemandRSVO> rsPageList) {
     private void afterQuery(PageListVO<MfDemand> pageList, PageListVO<DemandRSVO> rsPageList) {
         // 需要特殊处理数据时使用
         // 需要特殊处理数据时使用
         if(CollectionUtils.isNotEmpty(pageList.getRecords())){
         if(CollectionUtils.isNotEmpty(pageList.getRecords())){
-            List<String> guids = pageList.getRecords().stream().map(MfDemand::getProcessCompanyGuid).collect(Collectors.toList());
+            List<String> guids = pageList.getRecords().stream().map(MfDemand::getGuid).collect(Collectors.toList());
             List<DemandRSVO> results = new ArrayList<>();
             List<DemandRSVO> results = new ArrayList<>();
             for (MfDemand item : pageList.getRecords()){
             for (MfDemand item : pageList.getRecords()){
                 DemandRSVO vo = convertToVO(item,getStateMap(guids));
                 DemandRSVO vo = convertToVO(item,getStateMap(guids));
@@ -608,7 +594,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         //流程数据处理
         //流程数据处理
         vo.setApproveVO(approvalFlowUtil.getApprovalInfo(entity.getGuid()));
         vo.setApproveVO(approvalFlowUtil.getApprovalInfo(entity.getGuid()));
         if(map != null){
         if(map != null){
-            DemandUpdateStateVO voState = map.get(entity.getProcessCompanyGuid());
+            DemandUpdateStateVO voState = map.get(entity.getGuid());
             if(voState != null){
             if(voState != null){
                 vo.setResourceAcquisitionState(voState.getResourceAcquisitionState());
                 vo.setResourceAcquisitionState(voState.getResourceAcquisitionState());
                 vo.setProductProcessingState(voState.getProductProcessingState());
                 vo.setProductProcessingState(voState.getProductProcessingState());