修改资料下载 发货单

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

@@ -691,8 +691,8 @@ public class CommonServiceImpl {
                 fillSheet(secondSheet6, returnDto.getPowerStationEngineeringInfo());
 
                 Sheet secondSheet7 = workbook.getSheetAt(7);
-                fillSheet(secondSheet7, preparationMoneyDto);
-                fillSheetFH(secondSheet7, preparationMoneyDto);
+           //     fillSheet(secondSheet7, preparationMoneyDto);
+                fillSheetFH(secondSheet7, preparationMoneyDto == null?new PreparationMoney():preparationMoneyDto);
 
                 Sheet secondSheet8 = workbook.getSheetAt(8);
                 fillSheet(secondSheet8, returnDto.getPowerStationConstructionData());
@@ -1002,10 +1002,26 @@ public class CommonServiceImpl {
            return;
        }
 
+        int startRow = 1;
+        for (int i = 0; i < sheet.getLastRowNum() + 1; i++) {
+            Row row = sheet.getRow(i);
+            if (row != null && i >= startRow) {
+
+                for (Cell cell : row) {
+                    if (cell.getCellType() == CellType.STRING) {
+                        String cellValue = cell.getStringCellValue();
+                        String fieldName = removePlaceholders(cellValue);
+                        setCellValue(cell, fieldName, preparationMoney);
+                    }
+                }
+            }
+        }
+
         LambdaQueryWrapper<DocumentStation> q = new LambdaQueryWrapper<>();
         q.eq(DocumentStation::getPreparationMoneyId, preparationMoney.getSequenceNbr());
         List<DocumentStation> lih = documentStationMapper.selectList(q);
-
+        DesignInformation designInformation = new DesignInformation();
+        if (CollectionUtil.isNotEmpty(lih)){
             if(lih != null && lih.size() > 0) {
                 lih.forEach(e -> {
                     if(e.getPeasantHouseholdNo() != null) {
@@ -1025,7 +1041,7 @@ public class CommonServiceImpl {
             QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>();
             designInformationQueryWrapper.in("peasant_household_id", ids);
             List<DesignInformation> li = designInformationMapper.selectList(designInformationQueryWrapper);
-        DesignInformation designInformation = new DesignInformation();
+
             //组件
             List<Object> assembly = new ArrayList<>();
             //逆变器
@@ -1052,6 +1068,9 @@ public class CommonServiceImpl {
             designInformation.setInverter(inverter);
             designInformation.setElectricityMeter(electricityMeter);
             designInformation.setCable(cable);
+        }
+  ;
+