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

hnqz-common/hnqz-common-data/src/main/java/com/qunzhixinxi/hnqz/common/data/handler/ListToStringTypeHandler.java

@@ -1,62 +0,0 @@
-package com.qunzhixinxi.hnqz.common.data.handler;
-
-import cn.hutool.core.collection.CollectionUtil;
-import org.apache.ibatis.type.JdbcType;
-import org.apache.ibatis.type.MappedJdbcTypes;
-import org.apache.ibatis.type.MappedTypes;
-import org.apache.ibatis.type.TypeHandler;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * mybatis list与varchar之间转换处理类
- * 加上下面两行，可以解决mybatis plus的list、getone等查询方法 查不到List<String>的问题
- * @author lixuesong
- * @date 2021年07月15日 17:10
- */
-@MappedTypes(value = { List.class })
-@MappedJdbcTypes(value = JdbcType.VARCHAR)
-public class ListToStringTypeHandler implements TypeHandler<List<String>> {
-
-	@Override
-	public void setParameter(PreparedStatement preparedStatement, int i, List<String> strings, JdbcType jdbcType) throws SQLException {
-		if (CollectionUtil.isNotEmpty(strings)) {
-			preparedStatement.setString(i, String.join(",", strings));
-		} else {
-			preparedStatement.setString(i, "");
-		}
-	}
-
-	@Override
-	public List<String> getResult(ResultSet resultSet, String s) throws SQLException {
-		if (resultSet.getString(s) == null) {
-			return new ArrayList<>();
-		}
-		String[] arr = resultSet.getString(s).split(",");
-		return Arrays.asList(arr);
-	}
-
-	@Override
-	public List<String> getResult(ResultSet resultSet, int i) throws SQLException {
-		if (resultSet.getString(i) == null) {
-			return new ArrayList<>();
-		}
-		String[] arr = resultSet.getString(i).split(",");
-		return Arrays.asList(arr);
-	}
-
-	@Override
-	public List<String> getResult(CallableStatement callableStatement, int i) throws SQLException {
-		if (callableStatement.getString(i) == null) {
-			return new ArrayList<>();
-		}
-		String[] arr = callableStatement.getString(i).split(",");
-		return Arrays.asList(arr);
-	}
-}

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

@@ -56,6 +56,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.BoundValueOperations;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -2958,7 +2959,7 @@ public class ApiController {
 				if ("3".equals(wmScorePackage.getPackageType1())) {
 					continue;
 				}
-				if (CollectionUtil.isEmpty(wmScorePackage.getDrugProducerList()) || !wmScorePackage.getDrugProducerList().contains(drugProducer)){
+				if (ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) || !ArrayUtils.contains(wmScorePackage.getDrugProducerList(),drugProducer)){
 					continue;
 				}
 				/**

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

@@ -45,6 +45,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.CellType;
@@ -81,6 +82,7 @@ public class WmScorePackageController {
 
 	private final WmScorePackageService wmScorePackageService;
 	private final WmScorePackageStatusService wmScorePackageStatusService;
+	private final WmDaDrugEntDrugtableService wmDaDrugEntDrugtableService;
 	private final WmScorePackageMapper wmScorePackageMapper;
 	private final SysDeptService sysDeptService;
 	private final WmDaAgentService wmDaAgentService;
@@ -1405,6 +1407,7 @@ public class WmScorePackageController {
 					}
 					Map<String, Object> map1 = new HashMap<>();
 					map1.put("relationScoreName", wmScorePackage1.getScorePackageName());
+					map1.put("drugProducerList",wmScorePackage1.getDrugProducerList());
 					map1.put("id", wmScorePackage1.getId());
 					answerList.add(map1);
 				}
@@ -1425,6 +1428,7 @@ public class WmScorePackageController {
 				}
 				Map<String, Object> map3 = new HashMap<>();
 				map3.put("id", wmScorePackage1.getId());
+				map3.put("drugProducerList",wmScorePackage1.getDrugProducerList());
 				map3.put("relationScoreName", wmScorePackage1.getScorePackageName());
 				answerList.add(map3);
 			}
@@ -1564,6 +1568,14 @@ public class WmScorePackageController {
 //		sysDeptRelatedServiceId.setDeptId(Integer.valueOf(wmScorePackage.getRelatedService()));
 //		SysDept sysDeptRelatedService = sysDeptMapper.selectDeptId(sysDeptRelatedServiceId);
 
+		if (StringUtils.isNotEmpty(wmScorePackage.getRelationScoreId()) && ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList())){
+			WmScorePackage relateSp = wmScorePackageService.getById(wmScorePackage.getRelationScoreId());
+			if (relateSp != null){
+				Set<String> producerNames = wmDaDrugEntDrugtableService.listDrugProducerByDeptId(Integer.parseInt(relateSp.getDeptId()));
+				wmScorePackage.setDrugProducerList(producerNames.toArray(new String[producerNames.size()]));
+			}
+		}
+
 		SysDept sysDeptRelatedService = sysDeptService.getById(Integer.valueOf(wmScorePackage.getRelatedService()));
 		if ("".equals(wmScorePackage.getTypeid())) {
 			WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.selectByDeptId(sysDept.getDeptId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackage.java

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.qunzhixinxi.hnqz.common.data.handler.ListToStringTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -469,8 +468,36 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	/**
 	 * 关联药品的生产厂商列表
 	 */
+//	@TableField(exist = false)
 	@TableField(value = "drug_producer")
 	@ApiModelProperty(value="关联药品的生产厂商列表")
-	private List<String> drugProducerList;
-
+	private String[] drugProducerList;
+
+//	@TableField(value = "drug_producer")
+//	private String drugProducer;
+//
+//
+//	public List<String> getDrugProducerList() {
+//		if (StringUtils.isNotEmpty(this.drugProducer)){
+//			return Arrays.asList(this.drugProducer.split(","));
+//		}
+//		return new ArrayList<>();
+//	}
+//
+//	public void setDrugProducerList(List<String> drugProducerList) {
+//		this.drugProducerList = drugProducerList;
+//	}
+//
+//	public String getDrugProducer() {
+//		return drugProducer;
+//	}
+//
+//	public void setDrugProducer(String drugProducer) {
+//		if (CollectionUtil.isEmpty(this.drugProducerList)){
+//			this.drugProducer = " ";
+//
+//		} else {
+//			this.drugProducer = String.join(",",this.drugProducerList);
+//		}
+//	}
 }

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

@@ -482,10 +482,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		List<WmScorePackage> packageList = wmScorePackageMapper.getScorePackagekfpjf(wmScorePackage);
 
 		for (WmScorePackage wmScorePackage1 : packageList) {
-			WmScorePackage tmp = getById(wmScorePackage1.getId());
 			List<WmScoreTaskType> taskTypelist = wmScoreTaskTypeMapper.getScoreTaskTypeByScoreId(wmScorePackage1.getId());
 			wmScorePackage1.setTaskTypeList1(taskTypelist);
-			wmScorePackage1.setDrugProducerList(tmp.getDrugProducerList());
 			Set taskTypeSet = taskTypelist.stream().map(WmScoreTaskType::getTaskTypeId).collect(Collectors.toSet());
 			wmScorePackage1.setTaskTypeSet(taskTypeSet);
 		}