|
@@ -1132,13 +1132,28 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
|
|
|
Optional.ofNullable(tfFlowApprove).orElseThrow(() -> ExceptionResultEnum.FLOW_APPROVE_NO_DATA.exception());
|
|
|
|
|
|
FlowResult flowResult = JSONObject.parseObject(tfCustomFlowEntity.getFlowProcessVar(), FlowResult.class);
|
|
|
+ FlowResult flowResultNew = new FlowResult();
|
|
|
+ BeanUtils.copyProperties(flowResult, flowResultNew);
|
|
|
+ LinkedHashMap<String, FlowTaskResult> setupMap = flowResult.getSetupMap();
|
|
|
+ LinkedHashMap<String, FlowTaskResult> setupMapNew = new LinkedHashMap<>(setupMap.size());
|
|
|
+ for (Map.Entry<String, FlowTaskResult> entry : setupMap.entrySet()) {
|
|
|
+ if (entry.getValue().getSetup().intValue() > 0) {
|
|
|
+ if (entry.getValue().getSetup().intValue() <= tfFlowApprove.getSetup().intValue()) {
|
|
|
+ setupMapNew.put(entry.getKey(), entry.getValue());
|
|
|
+ } else {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ flowResultNew.setSetupMap(setupMapNew);
|
|
|
+
|
|
|
TBCrmDetail tbCrmDetail = tbCrmDetailService.findBySopNo(tfCustomFlowEntity.getCode());
|
|
|
CrmProjectResult crmProjectResult = tbCrmService.findCrmProjectInfo(tfCustomFlowEntity.getCode(),
|
|
|
tbCrmDetail.getId(), tfCustomFlowEntity.getCrmNo());
|
|
|
Optional.ofNullable(crmProjectResult).orElseThrow(() -> ExceptionResultEnum.CRM_NO_NO_DATA.exception());
|
|
|
|
|
|
- flowResult.setCrmInfo(crmProjectResult);
|
|
|
- return flowResult;
|
|
|
+ flowResultNew.setCrmInfo(crmProjectResult);
|
|
|
+ return flowResultNew;
|
|
|
}
|
|
|
|
|
|
/**
|