修改单导出优化

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMdfFormServiceImpl.java

@@ -765,13 +765,13 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
             cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 5, 15);//第8行
             sheet.addMergedRegion(cellRangeAddress);
             sheet.getRow(indexstart + 5).getCell(5).setCellValue(qcsMdfFormDo.getProjectdlprojname()); //项目名称
-            cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 16, 18);//第8行
+            cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 16, 17);//第8行
             sheet.addMergedRegion(cellRangeAddress);
             sheet.getRow(indexstart + 5).getCell(16).setCellValue("项目生\n" +
                     "产阶段");
-            cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 19, 20);//第8行
+            cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 18, 20);//第8行
             sheet.addMergedRegion(cellRangeAddress);
-            sheet.getRow(indexstart + 5).getCell(19).setCellValue(qcsMdfFormDo.getProducename()); //项目生产阶段
+            sheet.getRow(indexstart + 5).getCell(18).setCellValue(qcsMdfFormDo.getProducename()); //项目生产阶段
             cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 21, 23);//第8行
             sheet.addMergedRegion(cellRangeAddress);
             sheet.getRow(indexstart + 5).getCell(21).setCellValue("装船通知\n" +
@@ -795,23 +795,25 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
             sheet.getRow(indexstart + 5).getCell(43).setCellValue("是否已通知修改");
             cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 47, 47);//第8行
             sheet.addMergedRegion(cellRangeAddress);
-            String unitName = "";
-            for (String uid : qcsMdfFormDo.getCopydeptids().split(",")) {
-                List<Map<String, String>> mapList = unitMap.stream()
-                        .filter(umap -> {
-                            String oid = umap.get("ID");
-                            return uid.equals(oid);
-                        }).collect(Collectors.toList());
-                if (mapList.size() > 0) {
-                    unitName += mapList.get(0).get("FULLNAME") + ",";
-                }
-            }
             cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 48, 49);//第8行
             sheet.addMergedRegion(cellRangeAddress);
             sheet.getRow(indexstart + 5).getCell(48).setCellValue("抄送单位");
             cellRangeAddress = new CellRangeAddress(indexstart + 5, indexstart + 6, 50, 57);//第8行
             sheet.addMergedRegion(cellRangeAddress);
-            sheet.getRow(indexstart + 5).getCell(50).setCellValue(unitName.substring(0, unitName.length() - 1)); //抄送单位
+            if (StringUtils.isNotBlank(qcsMdfFormDo.getCopydeptids())) {
+                String unitName = "";
+                for (String uid : qcsMdfFormDo.getCopydeptids().split(",")) {
+                    List<Map<String, String>> mapList = unitMap.stream()
+                            .filter(umap -> {
+                                String oid = umap.get("ID");
+                                return uid.equals(oid);
+                            }).collect(Collectors.toList());
+                    if (mapList.size() > 0) {
+                        unitName += mapList.get(0).get("FULLNAME") + ",";
+                    }
+                }
+                sheet.getRow(indexstart + 5).getCell(50).setCellValue(unitName.substring(0, unitName.length() - 1)); //抄送单位
+            }
 
             //明细数据
             cellRangeAddress = new CellRangeAddress(indexstart + 7, indexstart + 8, 1, 1);//第10行