Merge branch 'feature-packagewithdrugproducer-20210715' of googol/YY_BE_2 into master

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

@@ -2959,9 +2959,21 @@ public class ApiController {
 				if ("3".equals(wmScorePackage.getPackageType1())) {
 					continue;
 				}
-				if (ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) || !ArrayUtils.contains(wmScorePackage.getDrugProducerList(),drugProducer)){
+				if (ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList())){
 					continue;
 				}
+				boolean flag = false;
+				for (String name : wmScorePackage.getDrugProducerList() ){
+					if (StringUtils.equals(name, drugProducer)){
+						flag = true;
+						break;
+					}
+				}
+
+				if (!flag){
+					continue;
+				}
+
 				/**
 				 * 过滤有效任务类型
 				 */

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

@@ -909,7 +909,7 @@
 	</select>
 	<select id="getScorePackagekfpjf" resultMap="wmScorePackageMap">
 		select dd.* from (
-		select p.id,p.score,p.score_package_name,p.score_id,p.package_type1,
+		select p.id,p.score,p.score_package_name,p.score_id,p.package_type1,p.drug_producer,
 		p.score-sum(if(p1.del_flag='0' and p1.enable_flag='0',p1.score,0)) as kfpjf
 		from wm_score_package p
 		left join wm_score_package p1 on p.id=p1.relation_score_id and p1.del_flag='0' and p1.enable_flag='0'