fix(mapper): 修复药企企业承接界面'完成积分值'问题

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

@@ -1714,7 +1714,7 @@ public class WmScorePackageController {
 				List<WmTaskType> taskTypeList = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
 						.eq(WmTaskType::getRuleId, daAgent.getId()));
 				if (CollectionUtil.isNotEmpty(taskTypeList)) {
-					wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
+					wmScorePackage.setRuleId(daAgent.getId());
 					wmScorePackage.setDrugEntId("");
 				} else {
 					return R.failed("cso没有分配积分规则");

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -879,26 +879,30 @@
 		relation_score_id = #{query.relationScoreId,jdbcType=VARCHAR}
 	</select>
 	<select id="finishRate" resultMap="wmScorePackageMap">
-select sum(ifnull(c.payScore,0)) pay_score ,sum(c.ysh) ysh
-from (
-select 0 as payScore, a.ysh  from (
-select score_package_id,sum(if(task_status=3,score,0)) ysh from wm_task where wm_task.score_package_id in
-    (
-    select id from wm_score_package where id=#{query.id}
-    union all
-    select id from wm_score_package where relation_score_id in (select id from wm_score_package where id=#{query.id})
-    union all
-    select id from wm_score_package   where relation_score_id in (
-select id from wm_score_package where relation_score_id in (select id from wm_score_package where id=#{query.id}))
-)
- and  wm_task.enable_flag=0 and wm_task.real_flag = '0' and score_package_id is not null and wm_task.del_flag=0
- group by score_package_id
- )a,wm_score_package b where a.score_package_id=b.id and  relation_score_id=#{query.id}
- union all
-select sum(score) as payScore,0 as ysh from wm_task  where report_drug_approval_opinion=1 and  (report_one_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
-or report_second_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
-or report_drug_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
-)) c
+		select sum(ifnull(c.payScore,0)) pay_score ,sum(c.ysh) ysh
+		from (
+			select 0 as payScore, a.ysh  from (
+				select score_package_id,sum(if(task_status=3,score,0)) ysh from wm_task where wm_task.score_package_id in
+					(
+						select id from wm_score_package where id=#{query.id}
+						union all
+						select id from wm_score_package where relation_score_id in (select id from wm_score_package where id=#{query.id})
+						union all
+						select id from wm_score_package   where relation_score_id in (
+							select id from wm_score_package where relation_score_id in (select id from wm_score_package where id=#{query.id})
+						)
+					)
+				 and  wm_task.enable_flag=0 and wm_task.real_flag = '0' and score_package_id is not null and wm_task.del_flag=0
+				 group by score_package_id
+			 )a,wm_score_package b, wm_score_package c where a.score_package_id=b.id and b.relation_score_id=c.id and
+				(b.relation_score_id = #{query.id} or c.relation_score_id = #{query.id})
+			 union all
+				select sum(score) as payScore,0 as ysh from wm_task  where report_drug_approval_opinion=1 and  (report_one_id in (
+				    select id from wm_report where report_status=6 and score_id=#{query.id})
+					or report_second_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
+					or report_drug_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
+				)
+		) c
 	</select>
 	<select id="getScorePackagekfpjf" resultMap="wmScorePackageMap">
 		select dd.* from (