修复 fahuoghuanli

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

@@ -150,6 +150,9 @@ public class PreparationMoney extends BaseEntity {
     private List<PreparationMoneyLog> preparationMoneyLog;  //发货单流水
 
     @TableField(exist = false)
+    private List<HygfReplenishment> files;  //发货单流水
+
+    @TableField(exist = false)
     private String instanceId;  //发货单流水
     //订单状态
     @TableField("order_status")

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

@@ -188,6 +188,12 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         List<DocumentStation> li = documentStationMapper.selectList(q);
         preparationMoney.setPeasantHouseholdId(li);
 
+        LambdaUpdateWrapper<HygfReplenishment> h = new LambdaUpdateWrapper<>();
+        h.eq(HygfReplenishment::getPreparationMoneyId,sequenceNbr);
+        List<HygfReplenishment> hygfReplenishments = hygfReplenishmentMapper.selectList(h);
+        if (CollectionUtil.isNotEmpty(hygfReplenishments) && hygfReplenishments.size()>0 ){
+            preparationMoney.setFiles(hygfReplenishments);
+        }
         return preparationMoney;
 
     }
@@ -215,12 +221,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         qu.eq(PreparationMoney::getSequenceNbr, sequenceNbr);
         PreparationMoney preparationMoney = preparationMoneyMapper.selectOne(qu);
 
-        LambdaUpdateWrapper<HygfReplenishment> h = new LambdaUpdateWrapper<>();
-        h.eq(HygfReplenishment::getPreparationMoneyId,sequenceNbr);
-        List<HygfReplenishment> hygfReplenishments = hygfReplenishmentMapper.selectList(h);
-        if (CollectionUtil.isNotEmpty(hygfReplenishments) && hygfReplenishments.size()>0 ){
-            map.put("files",hygfReplenishments);
-        }
         LambdaUpdateWrapper<HygfPreparationMoneyAuditing> audit = new LambdaUpdateWrapper<>();
         audit.eq(HygfPreparationMoneyAuditing::getPreparationMoneyId,sequenceNbr);
         List<HygfPreparationMoneyAuditing> hygfPreparationMoneyAuditings = hygfPreparationMoneyAuditingService.getBaseMapper().selectList(audit);
@@ -308,7 +308,16 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         designInformation.setInverter(inverter);
         designInformation.setElectricityMeter(electricityMeter);
         designInformation.setCable(cable);
-        map.put("preparationMoney", preparationMoney);
+        Map<String, Object> map2 = Bean.BeantoMap(preparationMoney);
+
+        LambdaUpdateWrapper<HygfReplenishment> h = new LambdaUpdateWrapper<>();
+        h.eq(HygfReplenishment::getPreparationMoneyId,sequenceNbr);
+        List<HygfReplenishment> hygfReplenishments = hygfReplenishmentMapper.selectList(h);
+        if (CollectionUtil.isNotEmpty(hygfReplenishments) && hygfReplenishments.size()>0 ){
+            map2.put("files",hygfReplenishments);
+        }
+
+        map.put("preparationMoney", map2);
         map.put("designInformation", designInformation);
         Map<String, Object> map1 = new HashMap<>();
         map1.put("preparationMoneyLog", liD);