优化

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -238,6 +238,24 @@ public class ExportSbInfoVO implements Serializable {
     private String bcrl;
     @Excel(name="电缆规格",styleType=1)
     private String dlgg;
+
+    @Excel(name="设备识别码")
+    private String identifyNo;
+
+    @Excel(name="使用证号")
+    private String useNo;
+
+    @Excel(name="设备代号")
+    private String sbCode;
+
+    @Excel(name="安装单位")
+    private String installUnit;
+
+    @Excel(name="检验结论")
+    private String examResult;
+
+    @Excel(name="单位内部使用地点")
+    private String usePosition;
     @Excel(name="排序字段")
     private String sortNum;
 

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -172,7 +172,13 @@ sb.apply_time,
                                      sb.remark,
                                      sb.apply_comment,
 sb.scrap_user_id,
-sb.scrap_user_name,sb.repair_dept_id,sb.sort_num
+sb.scrap_user_name,sb.repair_dept_id,sb.sort_num,
+sb.identify_no,
+sb.use_no,
+sb.sb_code,
+sb.install_unit,
+sb.exam_result,
+sb.use_position
     </sql>
 
     <sql id="deptSql">

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -2662,6 +2662,31 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     if (vo.getUseType() == null || vo.getUseType() < 3 || vo.getUseType() > 5) {
                         throw new BusinessException("第" + i + "行,自定义类型为空，生产设备请填3，计量设备填4，特种设备填5;");// 编号为空，复制位号
                     }
+
+                    if (vo.getIdentifyNo()!=null&&vo.getIdentifyNo().trim()!=""){
+                        tempInfo.setIdentifyNo(vo.getIdentifyNo());
+                    }
+
+                    if (vo.getUseNo()!=null&&vo.getUseNo().trim()!=""){
+                        tempInfo.setUseNo(vo.getUseNo());
+                    }
+
+                    if (vo.getSbCode()!=null&&vo.getSbCode().trim()!=""){
+                        tempInfo.setSbCode(vo.getSbCode());
+                    }
+
+                    if (vo.getInstallUnit()!=null&&vo.getInstallUnit().trim()!=""){
+                        tempInfo.setInstallUnit(vo.getInstallUnit());
+                    }
+
+                    if (vo.getExamResult()!=null&&vo.getExamResult().trim()!=""){
+                        tempInfo.setExamResult(vo.getExamResult());
+                    }
+
+                    if (vo.getUsePosition()!=null&&vo.getUsePosition().trim()!=""){
+                        tempInfo.setUsePosition(vo.getUsePosition());
+                    }
+
                     if (vo.getUseType() == 4) {
                         tempInfo.setIsChild(1);
                     } else {