itp报验点导入导出

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxItpTemplateNodesServiceImpl.java

@@ -494,6 +494,7 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
      * @param file
      */
     @Override
+    @Transactional
     public void importQcp(ImportNodeRequest req, MultipartFile file) {
         //删除历史数据
         zhcxItpTemplateNodesDao.delByItpId(req.getTmpId());
@@ -501,8 +502,7 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
         final List<JSONObject> rowList = excelService.parseMF(file); //excel数据
 
         final ImportNodeExcelAssistantBO excelHelp = getNodeExcelHelp(); //辅助参数
-        final ZhcxItpTemplateDo templateDo = zhcxItpTemplateService.getById(req.getTmpId());
-        excelHelp.setFactoryId(templateDo.getTenantid());
+        excelHelp.setFactoryId(excelHelp.getUser().getTenantid());
         excelHelp.setTmpId(req.getTmpId());
 
         final SaveITPNodeBO itpNodeBO = ImportITPHelp.parseRow2Node(rowList, excelHelp); //解析每一行
@@ -657,6 +657,7 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
                     .inspectionType(excelExportHelp.getInspectionTypeMap().get(node.getInspectiontype()))
                     .issupp(excelExportHelp.getWhetherMap().get(node.getIssupp()))
                     .factoryName(excelExportHelp.getFactoryName())
+                    .isneedout(excelExportHelp.getWhetherMap().get(node.getIsneedout()))
                     .build();
 
             //大小构件

business-common/src/main/java/com/rongwei/bscommon/sys/utils/ImportITPHelp.java

@@ -119,8 +119,10 @@ public class ImportITPHelp {
 
         StringBuilder sb  = new StringBuilder();
         sb.append(excelBO.getPhase().getNodename());
-        sb.append("_");
-        sb.append(excelBO.getBig().getNodename());
+        if(ObjectUtil.isNotNull(excelBO.getBig())) {
+            sb.append("_");
+            sb.append(excelBO.getBig().getNodename());
+        }
         if(ObjectUtil.isNotNull(excelBO.getSmall())) {
             sb.append("_");
             sb.append(excelBO.getSmall().getNodename());
@@ -150,6 +152,9 @@ public class ImportITPHelp {
         final String issupp = excelBO.getNodeBO().getIssupp();
         node.setIssupp(excelHelp.getWhetherMap().get(issupp));
 
+        final String isneedout = excelBO.getNodeBO().getIsneedout();
+        node.setIsneedout(excelHelp.getWhetherMap().get(isneedout));
+
         node.setSortindex(new BigDecimal(String.valueOf(excelBO.getNodeMap().size() + 1)));
 
         excelBO.getNodeMap().put(sb.toString(), node);
@@ -261,8 +266,8 @@ public class ImportITPHelp {
         node.setNodetype(nodeType);
         node.setDeleted("0");
         node.setTenantid(excelHelp.getUser().getTenantid());
-        node.setOrgid(excelHelp.getFactoryId());
-        node.setOrgname(excelHelp.getFactoryName());
+//        node.setOrgid(excelHelp.getFactoryId());
+//        node.setOrgname(excelHelp.getFactoryName());
 
         return node;
     }
@@ -292,7 +297,11 @@ public class ImportITPHelp {
         }
 
         if(ObjectUtil.isEmpty(row.getIssupp())) {
-            requiredList.add("是否外协");
+            requiredList.add("是否外协必填");
+        }
+
+        if(ObjectUtil.isEmpty(row.getIsneedout())) {
+            requiredList.add("是否外部报验必填");
         }
 
         return requiredList;

business-entity/src/main/java/com/rongwei/bsentity/dto/node/ExportTemplateNodeBO.java

@@ -13,7 +13,7 @@ public class ExportTemplateNodeBO {
     /**
      * 导出字段
      */
-    public static String [] EXPORT_COLS = {"基地", "产品类型", "阶段", "大构件名称", "小构件名称", "检验点", "报检类型", "是否外协"};
+    public static String [] EXPORT_COLS = {"基地", "产品类型", "阶段", "大构件名称", "小构件名称", "检验点", "报检类型", "是否外部报验", "是否外协"};
 
     /**
      * 工厂名称
@@ -57,6 +57,12 @@ public class ExportTemplateNodeBO {
     @JSONField(name = "报检类型")
     private String inspectionType;
 
+    /**
+     * 是否外部报检点
+     */
+    @JSONField(name = "是否外部报验")
+    private String isneedout;
+
     /**
      * 是否外部报检点
      */

business-entity/src/main/java/com/rongwei/bsentity/dto/node/ImportTemplateNodeBO.java

@@ -37,7 +37,7 @@ public class ImportTemplateNodeBO {
     /**
      * 报验类型
      */
-    @JSONField(name = "报检类型")
+    @JSONField(name = "报验类型")
     private String inspectionType;
 
     /**
@@ -46,4 +46,10 @@ public class ImportTemplateNodeBO {
     @JSONField(name = "是否外协")
     private String issupp;
 
+    /**
+     * 外部报验点
+     */
+    @JSONField(name = "是否外部报验")
+    private String isneedout;
+
 }