feat: 1.药店推广任务类型调整3；2.多人积分包接口调整

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

@@ -378,7 +378,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;
 									}
 
@@ -466,10 +467,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");
@@ -559,7 +564,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;
 								}
 

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

@@ -664,6 +664,9 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
 					// 计算实际任务积分（数量*企业这个任务类型的积分值）
 					score = score * Integer.parseInt(wmTaskContent.getTemp13());
+					// 设置实际的任务类型
+					wmTaskContent.setTemp30(wmTaskContent.getTemp23());
+					wmTask.setTaskTypeId(wmTaskContent.getTemp23());
 				}
 
 				// 校验任务类型是否启用