Merge branch 'feat-newtasktype-20220531' into temp-pre

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

@@ -129,7 +129,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 			add("库存信息收集");
 			add("医院信息收集");
 			add("商业公司信息收集");
-			add("药物警戒质量管理");
+			add("药物警戒相关信息收集（疗效等）");
 			add("药店调查");
 		}};
 		BASE_TASK_TYPE_MAP.put("市场信息收集", marketList);
@@ -144,6 +144,13 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 			add("临床监察");
 		}};
 		BASE_TASK_TYPE_MAP.put("医药研发服务", medicineList);
+
+		List<String> trainingList = new ArrayList<String>() {{
+			add("医院患者教育培训");
+			add("药店药师培训");
+			add("商业公司培训");
+		}};
+		BASE_TASK_TYPE_MAP.put("培训", trainingList);
 	}
 
 	/**
@@ -280,7 +287,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 		if (deptTaskTypeConfig != null) {
 			List<WmDeptTaskTypeConfigJsonDTO> configJsonDTOList = JSON.parseArray(deptTaskTypeConfig.getTaskTypeJson(), WmDeptTaskTypeConfigJsonDTO.class);
 			configTaskTypeIdList = configJsonDTOList.stream()
-					.filter(configJsonDTO -> configJsonDTO.getQualifiedTask())
+					.filter(WmDeptTaskTypeConfigJsonDTO::getQualifiedTask)
 					.map(WmDeptTaskTypeConfigJsonDTO::getTaskTypeName)
 					.collect(Collectors.toList());
 		}

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

@@ -49,6 +49,10 @@ public class WmTaskTypeServiceTest {
 
 	@Autowired
 	private WmDaAgentMapper wmDaAgentMapper;
+	
+	private static final String taskTypeId = "34";
+
+	private static final String taskTypeName = "医院患者教育培训";
 
 	/**
 	 * 批量补充新增的任务类型33-药店拜访
@@ -59,7 +63,7 @@ public class WmTaskTypeServiceTest {
 //		wmTaskTypeQ.setTaskTypeLevel("1");
 //		wmTaskTypeQ.setStatus("0");
 //		wmTaskTypeQ.setDelFlag("0");
-		wmTaskTypeQ.setId("33");
+		wmTaskTypeQ.setId(taskTypeId);
 		List<WmTaskType> tempList = wmTaskTypeMapper.selectList(Wrappers.query(wmTaskTypeQ));
 
 		// 1.第一级是药企的情况
@@ -95,7 +99,7 @@ public class WmTaskTypeServiceTest {
 				newOne.setRuleId(wmDaDrugEnt.getId());
 				newOne.setParentId(wmTaskType1.getParentId());
 				List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, "药店拜访")
+						.eq(WmTaskType::getTaskTypeName, taskTypeName)
 						.eq(WmTaskType::getRuleId, newOne.getRuleId())
 						.eq(WmTaskType::getDeptId, newOne.getDeptId())
 						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
@@ -142,7 +146,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType1.getId());
 					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-							.eq(WmTaskType::getTaskTypeName, "药店拜访")
+							.eq(WmTaskType::getTaskTypeName, taskTypeName)
 							.eq(WmTaskType::getRuleId, newOne.getRuleId())
 							.eq(WmTaskType::getDeptId, newOne.getDeptId())
 							.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
@@ -164,7 +168,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType2.getId());
 					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-							.eq(WmTaskType::getTaskTypeName, "药店拜访")
+							.eq(WmTaskType::getTaskTypeName, taskTypeName)
 							.eq(WmTaskType::getRuleId, newOne.getRuleId())
 							.eq(WmTaskType::getDeptId, newOne.getDeptId())
 							.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
@@ -200,7 +204,7 @@ public class WmTaskTypeServiceTest {
 						newOne.setStatus("0");
 						newOne.setBaseId(wmTaskType2.getId());
 						List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-								.eq(WmTaskType::getTaskTypeName, "药店拜访")
+								.eq(WmTaskType::getTaskTypeName, taskTypeName)
 								.eq(WmTaskType::getRuleId, newOne.getRuleId())
 								.eq(WmTaskType::getDeptId, newOne.getDeptId())
 								.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
@@ -249,7 +253,7 @@ public class WmTaskTypeServiceTest {
 				newOne.setStatus("0");
 				newOne.setBaseId(wmTaskType2.getId());
 				List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, "药店拜访")
+						.eq(WmTaskType::getTaskTypeName, taskTypeName)
 						.eq(WmTaskType::getRuleId, newOne.getRuleId())
 						.eq(WmTaskType::getDeptId, newOne.getDeptId())
 						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
@@ -285,7 +289,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setStatus("0");
 					newOne.setBaseId(wmTaskType2.getId());
 					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, "药店拜访")
+						.eq(WmTaskType::getTaskTypeName, taskTypeName)
 						.eq(WmTaskType::getRuleId, newOne.getRuleId())
 						.eq(WmTaskType::getDeptId, newOne.getDeptId())
 						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));