【DAOP-1.0】数据需求

【功能点】测试问题处理

@@ -10,6 +10,7 @@ import com.csbr.qingcloud.portal.domain.vo.*;
 import com.csbr.qingcloud.portal.feign.ConfigureFeign;
 import com.csbr.qingcloud.portal.feign.DataProcessBasicFeign;
 import com.csbr.qingcloud.portal.feign.PersonelFeign;
+import csbr.cloud.entity.domain.user.UserInfo;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import com.csbr.cloud.common.exception.CsbrSystemException;
 import com.csbr.cloud.common.util.CommonUtil;
@@ -24,6 +25,7 @@ import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
 import com.csbr.qingcloud.portal.mybatis.service.MfDemandService;
 import com.csbr.qingcloud.portal.service.DemandService;
+import csbr.cloud.entity.utils.UserContextHolder;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -251,7 +253,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         String orderNo = null;
         if (ApprovalStateEnum.PASSED.getValue().equals(dto.getApprovalState())) {
             //生成加工单
-            orderNo = addOrder(mfDemandService.getById(dto.getBizGuid()));
+            orderNo = addOrder(mfDemandService.getById(dto.getBizGuid()),dto);
         }
         // 同步更新审批状态
         LambdaUpdateWrapper<MfDemand> updateWrapper = mfDemandService.csbrUpdateWrapper(MfDemand.class);
@@ -265,7 +267,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         }
     }
 
-    private String addOrder(MfDemand bean){
+    private String addOrder(MfDemand bean,BizCallbackDTO dto){
         ProcessOrderRQVO vo = csbrBeanUtil.convert(bean,ProcessOrderRQVO.class);
         vo.setGuid(null);
         vo.setTenantName(personelFeign.getAllTenantGuidNameMap().getData().get(bean.getTenantGuid()));
@@ -278,6 +280,13 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         vo.setLinkContractInfoJson(bean.getContractAttachJson());
         vo.setFileUrl(bean.getDataDemandFieldAttachJson());
 
+        UserInfo user = UserContextHolder.get();
+        vo.setAcceptanceNameGuid(dto.getStaffGuid());
+        vo.setAcceptanceName(user.getUserName());
+        vo.setAcceptanceDate(new Date());
+        vo.setAcceptanceReason(approvalFlowUtil.getApprovalInfo(dto.getBizGuid()).getApproveSuggest());
+        vo.setRequestPath(bean.getRequestType());
+
         dataProcessBasicFeign.saveProcessOrder(vo);
         return vo.getProcessOrderNo();
     }