|
@@ -1,6 +1,7 @@
|
|
|
package com.rongwei.bscommon.sys.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
@@ -23,7 +24,9 @@ import com.rongwei.rwcommonentity.commonservers.domain.SysMindMappingDo;
|
|
|
import com.rongwei.safecommon.fegin.CXCommonFeginClient;
|
|
|
import com.rongwei.safecommon.utils.CXCommonUtils;
|
|
|
import com.rongwei.safecommon.utils.SaveConstans;
|
|
|
+import com.rongwei.wfentity.sys.ProcessInstDo;
|
|
|
import com.rongwei.wfentity.sys.RunTaskDo;
|
|
|
+import com.rongwei.wfserver.wfcommon.sys.service.ProcessInstService;
|
|
|
import com.rongwei.wfserver.wfcommon.sys.service.RunTaskService;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -111,6 +114,8 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
private ApsProcessOperationProcessEquService apsProcessOperationProcessEquService;
|
|
|
@Autowired
|
|
|
private RunTaskService runTaskService;
|
|
|
+ @Autowired
|
|
|
+ private ProcessInstService processInstService;
|
|
|
|
|
|
|
|
|
public static final String ERROR_MSG = "%s上诉订单的排程交货期大于承诺交货期";
|
|
@@ -837,10 +842,19 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
needUpdate.setId(one.getId());
|
|
|
needUpdate.setAssignee("8672bf72ab274bec83052868ae336b38");//系统管理员
|
|
|
needUpdate.setTaskstatus("30");
|
|
|
+ DateTime nowDate = DateUtil.date();
|
|
|
+ needUpdate.setCreatedate(nowDate);
|
|
|
+ needUpdate.setModifydate(nowDate);
|
|
|
+ needUpdate.setModifyuserid("8672bf72ab274bec83052868ae336b38");
|
|
|
+ needUpdate.setModifyusername("管理员");
|
|
|
needUpdateList.add(needUpdate);
|
|
|
}
|
|
|
|
|
|
runTaskService.updateBatchById(needUpdateList);
|
|
|
+ //更新所有流程实例为已完成(20)
|
|
|
+ processInstService.update(new UpdateWrapper<ProcessInstDo>().lambda()
|
|
|
+ .set(ProcessInstDo::getFlowinststatus, "20")
|
|
|
+ .in(ProcessInstDo::getId, processInstIdList));
|
|
|
|
|
|
//更新所有订单的审批状态为 已完工关闭
|
|
|
List<String> orderIdList = productionOrderDoList.stream().map(ApsProductionOrderDo::getId).collect(Collectors.toList());
|