feat: 创建cso和药企时初始化

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -42,6 +42,8 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,6 +72,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 	private final WmTaskTypeEntRefMapper wmTaskTypeEntRefMapper;
 	private final SysDeptMapper sysDeptMapper;
 	private final SysDeptSubMapper sysDeptSubMapper;
+	private final WmTaskSubmissionRuleService taskSubmissionRuleService;
 
 	public String getDeptBuildName(String deptId) {
 		String buildName = "";
@@ -310,6 +313,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 		wmDaAgent.setPgqx(1 + "");
 		super.save(wmDaAgent);
 		List<SysDept> list3 = sysDeptMapper.selectByName(wmDaAgent.getGsmc());
+		int deptId;
 		if (list3.size() == 0) {
 			SysDept sysDept = new SysDept();/**
 			 * @Modify: start
@@ -331,6 +335,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 				sysDeptService.save(sysDept);
 			}
 
+			deptId = sysDept.getDeptId();
 			// for (Map.Entry<String, Integer> entry : wmDaAgent.getSubjectTypeAndChannel().entrySet()){
 			// 	SysDeptSub deptSub = new SysDeptSub();
 			// 	deptSub.setDeptId(sysDept.getDeptId());
@@ -375,7 +380,10 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 			newList2.add(sysDeptRelation);
 			sysDeptRelationService.saveBatch(newList2);
 		} else {
-			wmDaAgent.setDeptId(String.valueOf(list3.get(0).getDeptId()));
+
+			deptId = list3.get(0).getDeptId();
+			wmDaAgent.setDeptId(String.valueOf(deptId));
+
 			List<WmDaDrugEnt> newList1 = new ArrayList<>();
 			for (String id : ids) {
 				WmDaDrugEnt wmDaDrugEnt = new WmDaDrugEnt();
@@ -397,6 +405,10 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 			newList2.add(sysDeptRelation);
 			sysDeptRelationService.saveBatch(newList2);
 		}
+
+		// 初始化任务规则
+		taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(deptId));
+
 		this.updateById(wmDaAgent);
 		List<WmRelation> newList = new ArrayList<>();
 		for (String upId : ids) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -33,6 +33,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
@@ -41,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -59,6 +61,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	private final WmDaDrugEntMapper wmDaDrugEntMapper;
 	private final SysDeptRelationService sysDeptRelationService;
 	private final SysDeptSubMapper sysDeptSubMapper;
+	private final WmTaskSubmissionRuleService taskSubmissionRuleService;
 
 	@Override
 	@Transactional
@@ -157,6 +160,9 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			newList.add(sysDeptRelation1);
 			sysDeptRelationService.saveBatch(newList);
 
+			// 初始化任务规则
+			taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(sysDept.getDeptId()));
+
 			// 创建结算渠道和通道
 //			if (CollUtil.isNotEmpty(entity.getSubjectTypeAndChannel())) {
 //				for (Map.Entry<String, Integer> entry : entity.getSubjectTypeAndChannel().entrySet()) {