Merge branch 'feat-20220829-jinpaitasktype' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeEntRefController.java

@@ -106,6 +106,9 @@ public class WmTaskTypeEntRefController {
 
 		SysDept deptId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
 		WmDaAgent anId = wmDaAgentService.selectByDeptId(deptId.getDeptId());
+		if (anId == null) {
+			return R.ok(new ArrayList<>());
+		}
 		wmTaskTypeEntRef.setAgentId(String.valueOf(anId.getId()));
 		wmTaskTypeEntRef.setDrugentId("");
 		return R.ok(wmTaskTypeEntRefService.page(page, Wrappers.query(wmTaskTypeEntRef)));

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

@@ -82,7 +82,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 	 * 兼职学术专员启用的任务类型
 	 */
 	private final String[] ENABLE_ZBDB_STATUS_ARR = {"医院拜访", "商业公司拜访", "药店拜访", "电子名片分享", "产品相册分享", "学术信息交流",
-			"受众打开产品相册", "受众阅读文章"};
+			"受众打开产品相册", "受众阅读文章", "调剂服务", "应收账款回款-A类", "应收账款回款-B类", "应收账款回款-C类"};
 
 	/**
 	 * 任务类型Map
@@ -131,6 +131,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 			add("商业公司信息收集");
 			add("药物警戒相关信息收集（疗效等）");
 			add("药店调查");
+			add("库存盘点-中药颗粒剂");
 		}};
 		BASE_TASK_TYPE_MAP.put("市场信息收集", marketList);
 
@@ -142,8 +143,12 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 			add("数据管理");
 			add("统计分析");
 			add("临床监察");
+			add("调剂服务");
+			add("应收账款回款-A类");
+			add("应收账款回款-B类");
+			add("应收账款回款-C类");
 		}};
-		BASE_TASK_TYPE_MAP.put("医药研发服务", medicineList);
+		BASE_TASK_TYPE_MAP.put("专项服务", medicineList);
 
 		List<String> trainingList = new ArrayList<String>() {{
 			add("医院患者教育培训");
@@ -167,6 +172,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 		wmDeptTaskTypeConfigDTO.getConfigList().forEach(configJsonDTO -> {
 			// 查询任务名称对应的基础任务类型id
 			WmTaskType baseTaskType = wmTaskTypeService.getOne(Wrappers.<WmTaskType>lambdaQuery()
+					.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val())
 					.eq(WmTaskType::getTaskTypeLevel, "1")
 					.eq(WmTaskType::getTaskTypeName, configJsonDTO.getTaskTypeName()));
 			configJsonDTO.setTaskTypeId(baseTaskType.getId());