完善

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoMeasureDTO.java

@@ -341,6 +341,10 @@ public class SbInfoMeasureDTO extends BaseDTO implements Serializable {
      */
     private String remark;
 
+    /**
+     * 备注
+     */
+    private String remark2;
     /**
      * 创建人
      */

platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfoMeasure.java

@@ -117,6 +117,10 @@ public class SbInfoMeasure implements Serializable {
      * 备注
      */
     private String remark;
+    /**
+     * 备注
+     */
+    private String remark2;
     /**
      * 保管人/车间使用人员(车间登录账号)
      */

platform-dao/src/main/java/com/platform/dao/util/CustomExcelImportUtil.java

@@ -1014,6 +1014,7 @@ public class CustomExcelImportUtil {
                 record.setIsFinancing(row.getCell(22).getStringCellValue().trim().equals("是")?1:0);
                 record.setFinancingNo(row.getCell(23).getStringCellValue().trim());
                 record.setNo(row.getCell(24).getStringCellValue().trim());
+                record.setRemark2(row.getCell(25).getStringCellValue().trim());
             } catch (Exception e) {
                 error.append(index).append(",");
             }
@@ -1082,11 +1083,12 @@ public class CustomExcelImportUtil {
                 record.setColor(row.getCell(17).getStringCellValue().trim().equals("是")?1:0);
                 record.setSbdh(row.getCell(18).getStringCellValue().trim());
                 record.setZbh(row.getCell(19).getStringCellValue().trim());
-                record.setRemark(row.getCell(20).getStringCellValue().trim());
-                record.setSeatNumber(Double.valueOf(row.getCell(21).getStringCellValue()).intValue());
-                record.setIsFinancing(row.getCell(22).getStringCellValue().trim().equals("是")?1:0);
-                record.setFinancingNo(row.getCell(23).getStringCellValue().trim());
-                record.setNo(row.getCell(24).getStringCellValue().trim());
+                record.setSeatNumber(Double.valueOf(row.getCell(20).getStringCellValue()).intValue());
+                record.setIsFinancing(row.getCell(21).getStringCellValue().trim().equals("是")?1:0);
+                record.setFinancingNo(row.getCell(22).getStringCellValue().trim());
+                record.setNo(row.getCell(23).getStringCellValue().trim());
+                record.setRemark(row.getCell(24).getStringCellValue().trim());
+                record.setRemark2(row.getCell(25).getStringCellValue().trim());
             } catch (Exception e) {
                 error.append(index).append(",");
             }

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

@@ -117,30 +117,35 @@ public class ExportSbInfoMeasureVO implements Serializable {
      */
     @Excel(name = "检定校准记录", orderNum = "20")
     private String zbh;
-    /**
-     * 备注
-     */
-    @Excel(name = "备注", orderNum = "21")
-    private String remark;
     /**
      * 预警天数
      */
-    @Excel(name = "预警天数", orderNum = "22")
+    @Excel(name = "预警天数", orderNum = "21")
     private String seatNumber;
     /**
      * 是否固定资产
      */
-    @Excel(name = "是否固定资产", orderNum = "23")
+    @Excel(name = "是否固定资产", orderNum = "22")
     private String isFinancing;
     /**
      * 固定资产编号
      */
-    @Excel(name = "固定资产编号", orderNum = "24")
+    @Excel(name = "固定资产编号", orderNum = "23")
     private String financingNo;
 
     /**
      * 设备新号设备新号
      */
-    @Excel(name = "设备新号", orderNum = "25")
+    @Excel(name = "设备新号", orderNum = "24")
     private String no;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", orderNum = "25")
+    private String remark;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注2", orderNum = "26")
+    private String remark2;
 }

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoMeasureVO.java

@@ -302,6 +302,10 @@ public class SbInfoMeasureVO extends BaseVO implements Serializable {
      * 备注
      */
     private String remark;
+    /**
+     * 备注
+     */
+    private String remark2;
     /**
      * 创建人
      */

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

@@ -31,7 +31,7 @@ name, model_id,
         save_user,
         repair_user,
         buy_date, start_date, next_check_date, guarantee_date, work_year, retirement_date,
-        depreciation_type, wb_file, use_file, check_file, sb_image, qr_code, status, remark,
+        depreciation_type, wb_file, use_file, check_file, sb_image, qr_code, status, remark,remark2,
         created_user_id, update_user_id, created_time, update_time,
         zzh,
         fdjxh,
@@ -74,7 +74,7 @@ apply_time,
                                      submit_time,
                                      process_instance_id,
                                      audit_node,
-                                     remark,
+                                     remark,remark2,
                                      apply_comment,
 scrap_user_id,
 scrap_user_name
@@ -167,7 +167,7 @@ sb.apply_time,
                                      sb.submit_time,
                                      sb.process_instance_id,
                                      sb.audit_node,
-                                     sb.remark,
+                                     sb.remark2,
                                      sb.apply_comment,
 sb.scrap_user_id,
 sb.scrap_user_name