Browse Source

Merge branch 'feat-20230316-tasktype47' into temp-pre

李学松 2 years ago
parent
commit
acacb7134b

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

@@ -653,12 +653,11 @@ 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(baseTaskType.getTaskTypeName());
+					queryTaskType.setTaskTypeName(wmTaskType1.getTaskTypeName());
 					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
 					score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
 					// 计算实际任务积分(数量*企业这个任务类型的积分值)