Merge branch 'feat-20230329-mazhou' into temp-pre

# Conflicts:
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

db/v2.0/230330.sql

@@ -0,0 +1,6 @@
+INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp32', '关联积分包', 1, 'domain', 1, 200, null, '', 'package_list', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
+INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp12', '药品', 2, 'domain', 1, 200, null, '', 'package_drug_list', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
+INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp13', '数量', 4, 'number', 1, 20, null, '', '', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
+INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp4', '时间', 5, 'datetime', 1, 200, null, '', '', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
+INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp7', '现场照片', 6, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
+INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp23', '推广类型', 3, 'select', 1, 2, '', '', 'drugstore_promotion_type', '1', null, '0', '0', 1, '2021-06-11 16:29:17', null, '2021-06-11 16:29:16', null);

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

@@ -246,6 +246,13 @@ public class ApiController {
 		} else if ("42".equals(taskTypeId) || "43".equals(taskTypeId) || "44".equals(taskTypeId)) {
 			// 手术跟台-一级/手术跟台-二级/手术跟台-三级 都取42
 			connfigMap = getTaskContentConfigByTaskTypeId("42");
+		} else if ("47".equals(taskTypeId) || "48".equals(taskTypeId) || "49".equals(taskTypeId) || "50".equals(taskTypeId)) {
+			// 库存调研、竞品调研、培训、使用情况调查 都取47
+			connfigMap = getTaskContentConfigByTaskTypeId("47");
+			// 查询积分值
+			List<WmTaskType> taskTypes = wmTaskTypeService.listByIds(CollUtil.toList("47", "48", "49", "50"));
+			Map<String, Integer> taskTypeScoreMap = taskTypes.stream().collect(Collectors.toMap(WmTaskType::getId, WmTaskType::getScore));
+			connfigMap.put("taskTypeScore", taskTypeScoreMap);
 		} else {
 			connfigMap = getTaskContentConfigByTaskTypeId(taskTypeId);
 		}
@@ -375,7 +382,8 @@ public class ApiController {
 									if ("1".equals(wmScorePackage.getEnableFlag())) {
 										continue;
 									}
-									if ("2".equals(wmScorePackage.getPackageType2())) {
+									if (PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(wmScorePackage.getPackageType2())
+											&& !PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
 										continue;
 									}
 
@@ -463,10 +471,14 @@ public class ApiController {
 		if ("39".equals(taskTypeId) || "40".equals(taskTypeId) || "41".equals(taskTypeId)) {
 			taskTypeId = "39";
 		}
-		if ("42".equals(taskTypeId) || "43".equals(taskTypeId) || "44".equals(taskTypeId)) {
+		else if ("42".equals(taskTypeId) || "43".equals(taskTypeId) || "44".equals(taskTypeId)) {
 			// 手术跟台-一级/手术跟台-二级/手术跟台-三级 都取42
 			taskTypeId = "42";
 		}
+		else if ("47".equals(taskTypeId) || "48".equals(taskTypeId) || "49".equals(taskTypeId) || "50".equals(taskTypeId)) {
+			// 库存调研、竞品调研、培训、使用情况调查
+			taskTypeId = "47";
+		}
 
 		queryConn.setTaskTypeId(taskTypeId);
 		queryConn.setDelFlag("0");
@@ -556,7 +568,8 @@ public class ApiController {
 								if ("1".equals(wmScorePackage.getEnableFlag())) {
 									continue;
 								}
-								if ("2".equals(wmScorePackage.getPackageType2())) {
+								if (PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(wmScorePackage.getPackageType2())
+										&& !PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
 									continue;
 								}
 
@@ -1865,7 +1878,8 @@ public class ApiController {
 						continue;
 					}
 
-					if ("1".equals(item.getPackageType1())) {
+					if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), item.getPackageType1())
+							|| StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), item.getPackageType1())) {
 						Integer finishScore = 0;
 						Integer waitApprovalScore = 0;
 						for (WmTask task : wmTaskList) {
@@ -3645,7 +3659,8 @@ public class ApiController {
 					}
 				}
 
-				if ("1".equals(tWmScorePackage.getPackageType1())) {
+				if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), tWmScorePackage.getPackageType1())
+						|| StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), tWmScorePackage.getPackageType1())) {
 
 					String limitValue = "30000";
 					// 查询当前企业配置的积分限制
@@ -3908,8 +3923,9 @@ public class ApiController {
 								// 查询出 审核通过和审核中的任务
 								.ne(WmTask::getTaskStatus, "4")
 								.eq(WmTask::getRealFlag, "0"));
-						// 判断定量还是定额 1- 定额   2-定量
-						if ("1".equals(wmScorePackage1.getPackageType1())) {
+						// 判断定量还是定额 1- 定额   2-定量 6-定额+定量
+						if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), wmScorePackage1.getPackageType1())
+								|| StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage1.getPackageType1())) {
 
 							int totalCount = 0;
 							for (WmTask wmtask : wmTaskList) {

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

@@ -376,7 +376,8 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 		/**
 		 * 判断定量还是定额 1- 定额   2-定量
 		 */
-		if ("1".equals(wmScorePackage.getPackageType1())) {
+		if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(wmScorePackage.getPackageType1())
+				|| PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
 
 			int totalCount = 0;
 			for (WmTask wmtask : wmTaskList) {

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

@@ -653,15 +653,20 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 
 				// 药店推广-47 积分值设置
 				if ("47".equals(wmTaskContent.getTemp30())) {
+					// 根据选择的推广类型 查任务类型模板
+					WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp23());
 					// 查询当前企业的任务类型积分
 					WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
 					WmTaskType queryTaskType = new WmTaskType();
 					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
-					queryTaskType.setTaskTypeName(wmTaskType1.getTaskTypeName());
+					queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
 					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
 					score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
 					// 计算实际任务积分（数量*企业这个任务类型的积分值）
 					score = score * Integer.parseInt(wmTaskContent.getTemp13());
+					// 设置实际的任务类型
+					wmTaskContent.setTemp30(wmTaskContent.getTemp23());
+					wmTask.setTaskTypeId(wmTaskContent.getTemp23());
 				}
 
 				// 校验任务类型是否启用