fix(controller): 解决查询查询不出积分包的问题

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

@@ -16,12 +16,12 @@ import java.util.List;
 
 /**
  * mybatis list与varchar之间转换处理类
+ * 加上下面两行，可以解决mybatis plus的list、getone等查询方法 查不到List<String>的问题
  * @author lixuesong
  * @date 2021年07月15日 17:10
  */
-// 加上下面两行，可以解决mybatis plus的list、getone等查询方法 查不到List<String>的问题
-//@MappedTypes(value = { List.class })
-//@MappedJdbcTypes(value = JdbcType.VARCHAR)
+@MappedTypes(value = { List.class })
+@MappedJdbcTypes(value = JdbcType.VARCHAR)
 public class ListToStringTypeHandler implements TypeHandler<List<String>> {
 
 	@Override

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

@@ -2940,9 +2940,11 @@ public class ApiController {
 		List<Map<String, Object>> listMap = new ArrayList<>();
 
 		for (WmScorePackageStatus item : statusList) {
-			Map<String, Object> tmp = wmScorePackageService.getMap(Wrappers.<WmScorePackage>lambdaQuery()
+			WmScorePackage wmScorePackage = wmScorePackageService.getOne(Wrappers.<WmScorePackage>lambdaQuery()
 					.eq(WmScorePackage::getId, item.getPackageId()));
-			WmScorePackage wmScorePackage = BeanUtil.copyProperties(tmp,WmScorePackage.class);
+			// Map<String, Object> tmp = wmScorePackageService.getOne(Wrappers.<WmScorePackage>lambdaQuery()
+			// 		.eq(WmScorePackage::getId, item.getPackageId()));
+			// WmScorePackage wmScorePackage = BeanUtil.copyProperties(tmp,WmScorePackage.class);
 			if (null != wmScorePackage) {
 				if ("0".equals(wmScorePackage.getTaskAddFlag())) {
 					continue;

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

@@ -292,6 +292,7 @@ public class WmScorePackage extends Model<WmScorePackage> {
 
 	private LocalDateTime receiveDate;
 
+	@TableField(exist = false)
 	private List<String> drugsIds;
 
 	@ApiModelProperty(value = "结算单号")
@@ -468,7 +469,7 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	/**
 	 * 关联药品的生产厂商列表
 	 */
-	@TableField(value = "drug_producer", typeHandler = ListToStringTypeHandler.class)
+	@TableField(value = "drug_producer")
 	@ApiModelProperty(value="关联药品的生产厂商列表")
 	private List<String> drugProducerList;
 

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

@@ -482,8 +482,10 @@ 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);
 		}

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

@@ -91,7 +91,7 @@
 		<result property="oldPackage" column="old_package"/>
 		<result property="scorePackageStatus" column="score_package_status"/>
 		<result property="subType" column="sub_type"/>
-		<result property="drugProducerList" column="drug_producer" typeHandler="com.qunzhixinxi.hnqz.common.data.handler.ListToStringTypeHandler"/>
+		<result property="drugProducerList" column="drug_producer"/>
 
 	</resultMap>