Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfReplenishment.java

@@ -10,6 +10,7 @@ import lombok.Value;
 import lombok.experimental.Accessors;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 
@@ -20,7 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_replenishment")
+@TableName(value="hygf_replenishment",autoResultMap = true)
 public class HygfReplenishment extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -41,6 +42,6 @@ public class HygfReplenishment extends BaseEntity {
      * 补货文件
      */
 	@TableField(value = "file" , typeHandler = FastjsonTypeHandler.class)
-    private List<Object> file;
+    private List<Map> file;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java

@@ -151,7 +151,8 @@ public class PreparationMoney extends BaseEntity {
     private List<PreparationMoneyLog> preparationMoneyLog;  //发货单流水
 
     @TableField(exist = false)
-    private List<HygfReplenishmentDto> files;  //发货单流水
+    private List<HygfReplenishment> files;
+
 
     @TableField(exist = false)
     private String instanceId;  //发货单流水

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml

@@ -45,7 +45,9 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         hygf_peasant_household.peasant_household_no as peasantHouseholdNo,
         hygf_peasant_household.owners_name as ownersName,
         hygf_peasant_household.regional_companies_name as regionalCompaniesName,
+        hygf_peasant_household.regional_companies_seq as regionalCompaniesSeq,
         hygf_peasant_household.developer_name as developerName,
+        hygf_peasant_household.developer_id as developeId,
         hygf_peasant_household.sequence_nbr  as sequenceNbr,
         concat_ws('/',hygf_peasant_household.project_address_name,hygf_peasant_household.project_address_detail) as address,
         hygf_peasant_household.project_address_name  as sequenceNbr,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -190,19 +190,13 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         List<DocumentStation> li = documentStationMapper.selectList(q);
         preparationMoney.setPeasantHouseholdId(li);
 
-        List<HygfReplenishment> hygfReplenishments = new ArrayList<>();
-        List<HygfReplenishmentDto> hygfReplenishmentDtos = hygfReplenishmentMapper.selectData(sequenceNbr);
 
-        if (CollectionUtil.isNotEmpty(hygfReplenishmentDtos) && !hygfReplenishmentDtos.isEmpty() ){
+        LambdaQueryWrapper<HygfReplenishment> files = new LambdaQueryWrapper<>();
+        files.eq(HygfReplenishment::getPreparationMoneyId,sequenceNbr);
+        List<HygfReplenishment> hygfReplenishments1 = hygfReplenishmentMapper.selectList(files);
 
-            hygfReplenishmentDtos.forEach(e->{
-                HygfReplenishment hygfReplenishment = new HygfReplenishment();
-                BeanUtils.copyProperties(e,hygfReplenishment);
-                hygfReplenishment.setFile(JSON.parseArray(e.getFile()));
-                hygfReplenishments.add(hygfReplenishment);
-            });
-
-            preparationMoney.setFiles(hygfReplenishmentDtos);
+        if (CollectionUtil.isNotEmpty(hygfReplenishments1) && !hygfReplenishments1.isEmpty() ){
+            preparationMoney.setFiles(hygfReplenishments1);
         }
         return preparationMoney;
 
@@ -321,22 +315,14 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         Map<String, Object> map2 = Bean.BeantoMap(preparationMoney);
 
 
-        List<HygfReplenishment> hygfReplenishments = new ArrayList<>();
-        List<HygfReplenishmentDto> hygfReplenishmentDtos = hygfReplenishmentMapper.selectData(Long.valueOf(sequenceNbr));
-
-        if (CollectionUtil.isNotEmpty(hygfReplenishmentDtos) && !hygfReplenishmentDtos.isEmpty() ) {
+        LambdaQueryWrapper<HygfReplenishment> files = new LambdaQueryWrapper<>();
+        files.eq(HygfReplenishment::getPreparationMoneyId,sequenceNbr);
+        List<HygfReplenishment> hygfReplenishments = hygfReplenishmentMapper.selectList(files);
 
-            hygfReplenishmentDtos.forEach(e -> {
-                HygfReplenishment hygfReplenishment = new HygfReplenishment();
-                BeanUtils.copyProperties(e, hygfReplenishment);
-                hygfReplenishment.setFile(JSON.parseArray(e.getFile()));
-                hygfReplenishments.add(hygfReplenishment);
-            });
+        if (CollectionUtil.isNotEmpty(hygfReplenishments) && !hygfReplenishments.isEmpty() ){
             map2.put("files",hygfReplenishments);
         }
 
-
-
         map.put("preparationMoney", map2);
         map.put("designInformation", designInformation);
         Map<String, Object> map1 = new HashMap<>();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -315,6 +315,8 @@ public class SurveyInformationServiceImpl
 			}
 			peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold);
 
+		} catch (BadRequest e1) {
+			throw e1;
 		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -126,7 +126,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		}
 		if (!workorderPeasant.isEmpty()) {
 			String names = workorderPeasant.stream().map(i -> i.getOwnersName()).collect(Collectors.joining(","));
-			throw new Exception("电站" + names + ",已被工单关联");
+			throw new Exception("电站" + names + ",已被工单关联,请重新选择电站");
 		}
 
 		// 保存派工单