内外部导入优化

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

@@ -705,13 +705,21 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                     }
 
                     String finalProcode = procode;
+                    qcsLossDetailDo.setId(SecurityUtil.getUUID());
+                    qcsLossDetailDo.setMainid(costId);
+                    qcsLossDetailDo.setProcode(procode);
                     codeParts = allPartnos.stream().filter(c -> c.getDlprojid().equals(finalProcode)).collect(Collectors.toList());
                     if (codeParts.size() == 0) {
-                        stringBuilder.append("项目工号" + procode + "不存在，");
+//                        stringBuilder.append("项目工号" + procode + "不存在，");
+                        String proname = row.getCell(1) == null ? "" : row.getCell(1).toString().replaceAll("\\s+", "");//项目名称
+                        if (StringUtils.isNotEmpty(proname)) {
+                            if (StringUtil.isScience(proname)) {
+                                BigDecimal formatProjectCode = new BigDecimal(proname);
+                                proname = formatProjectCode.setScale(0, BigDecimal.ROUND_HALF_UP).toPlainString();
+                            }
+                        }
+                        qcsLossDetailDo.setProname(proname);
                     } else {
-                        qcsLossDetailDo.setId(SecurityUtil.getUUID());
-                        qcsLossDetailDo.setMainid(costId);
-                        qcsLossDetailDo.setProcode(procode);
                         qcsLossDetailDo.setProname(codeParts.get(0).getDlprojname());
                     }
                 }
@@ -724,11 +732,19 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                         partno = formatProjectCode.setScale(0, BigDecimal.ROUND_HALF_UP).toPlainString();
                     }
                     String finalPartno = partno;
+                    qcsLossDetailDo.setPartno(partno);
                     List<QcsPartNoDo> partNos = codeParts.stream().filter(p -> p.getDtdrawingno().equals(finalPartno)).collect(Collectors.toList());
                     if (partNos.size() == 0) {
-                        stringBuilder.append("部件图号" + partno + "与项目工号" + procode + "不匹配，");
+//                        stringBuilder.append("部件图号" + partno + "与项目工号" + procode + "不匹配，");
+                        String partname = row.getCell(3) == null ? "" : row.getCell(3).toString().replaceAll("\\s+", "");//部件名称
+                        if (StringUtils.isNotEmpty(partname)) {
+                            if (StringUtil.isScience(partname)) {
+                                BigDecimal formatProjectCode = new BigDecimal(partname);
+                                partname = formatProjectCode.setScale(0, BigDecimal.ROUND_HALF_UP).toPlainString();
+                            }
+                        }
+                        qcsLossDetailDo.setPartname(partname);
                     } else {
-                        qcsLossDetailDo.setPartno(partno);
                         qcsLossDetailDo.setPartname(partNos.get(0).getDtpartname());
                     }
                 }