Merge branch 'feat-20231031-newtasktype64'

hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskSubmissionRuleServiceTest.java

@@ -2,14 +2,15 @@ package com.qunzhixinxi.hnqz.admin;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionPercentRule;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionRule;
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
 import com.qunzhixinxi.hnqz.common.core.constant.enums.CommonFlag;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -18,8 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -27,8 +28,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static java.util.Collections.addAll;
-
 /**
  * @author snows
  * @date 2023/7/18 17:00
@@ -40,9 +39,45 @@ public class WmTaskSubmissionRuleServiceTest {
 
     @Autowired
     private WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
+	@Autowired
+	private WmTaskSubmissionRuleService taskSubmissionRuleService;
     @Autowired
     private SysDeptService deptService;
 
+	/**
+	 * 初始化企业的特定任务规则
+	 */
+//	@Test
+	public void initDeptTaskSubmissionRule() {
+		// 查询源数据企业的配置
+		List<WmTaskSubmissionRule> platformRules = taskSubmissionRuleService.list(Wrappers.<WmTaskSubmissionRule>lambdaQuery()
+				.eq(WmTaskSubmissionRule::getDeptId, 1)
+				.eq(WmTaskSubmissionRule::getSubCategory, UpmsType.TaskSubCategory.PHARMACY_VISIT));
+
+		// 查询需要初始化的企业
+		List<SysDept> deptList = deptService.list(Wrappers.<SysDept>lambdaQuery()
+				.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.val())
+				.ne(SysDept::getDeptId, 1));
+		Set<Integer> deptIds = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toSet());
+
+		List<WmTaskSubmissionRule> deptRules = new ArrayList<>(deptIds.size() * platformRules.size());
+
+		deptIds.forEach(deptId -> {
+			platformRules.forEach(r -> {
+				WmTaskSubmissionRule deptRule = new WmTaskSubmissionRule();
+				deptRule.setRule(r.getRule());
+				deptRule.setDeptId(deptId);
+				deptRule.setOptFlag(r.getOptFlag());
+				deptRule.setSubCategory(r.getSubCategory());
+				deptRules.add(deptRule);
+			});
+
+		});
+
+		taskSubmissionRuleService.saveBatch(deptRules);
+	}
+
+
 //    @Test
     public void initTaskTypeConfig() {
 
@@ -81,13 +116,7 @@ public class WmTaskSubmissionRuleServiceTest {
 
         // 平台新增的任务类型
         Set<String> taskTypeIds = new HashSet<>();
-        taskTypeIds.add("51");
-        taskTypeIds.add("52");
-        taskTypeIds.add("53");
-        taskTypeIds.add("54");
-        taskTypeIds.add("55");
-        taskTypeIds.add("56");
-        taskTypeIds.add("57");
+        taskTypeIds.add("64");
 
             // 查询待修改企业的规则
             List<WmTaskSubmissionPercentRule> queryRules = taskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()