检定完善

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

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -26,74 +27,41 @@ public class ExportSbMeasureLogVO implements Serializable {
     /**
    * 标准名称
    */
-  @Excel(name = "标准名称", orderNum = "2")
-  private String name;
-
+  @Excel(name = "设备名称", orderNum = "2")
+  private String sbName;
+    /**
+     * 标准名称
+     */
+    @Excel(name = "设备型号", orderNum = "3")
+    private String sbModel;
+    /**
+     * 标准名称
+     */
+    @Excel(name = "测量编号", orderNum = "4")
+    private String cardNo;
     /**
    * 编码
    */
-  @Excel(name = "编码", orderNum = "3")
+  @Excel(name = "设备编号", orderNum = "5")
   private String no;
 
     /**
-   * 检查类型: 1-点检 2-巡检
+   * 检定日期
    */
-  @Excel(name = "检查类型: 1-点检 2-巡检", orderNum = "4")
-  private Integer type;
+  @Excel(name = "检定日期", orderNum = "6")
+  private LocalDate lastDate;
 
     /**
    * 是否启用: 0-否 1-是
    */
-  @Excel(name = "是否启用: 0-否 1-是", orderNum = "5")
-  private Integer enable;
-
-    /**
-   * 要求
-   */
-  @Excel(name = "要求", orderNum = "6")
-  private String requirement;
+  @Excel(name = "检定人", orderNum = "7")
+  private String name;
 
     /**
    * 备注
    */
-  @Excel(name = "备注", orderNum = "7")
-  private String remark;
-
-    /**
-   * 创建人
-   */
-  @Excel(name = "创建人", orderNum = "8")
-  private String createdUserId;
-
-    /**
-   * 更新人
-   */
-  @Excel(name = "更新人", orderNum = "9")
-  private String updateUserId;
-
-    /**
-   * 创建人名称
-   */
-  @Excel(name = "创建人名称", orderNum = "10")
-  private String createdUserName;
-
-    /**
-   * 更新人名称
-   */
-  @Excel(name = "更新人名称", orderNum = "11")
-  private String updateUserName;
-
-    /**
-   * 创建时间
-   */
-  @Excel(name = "创建时间", orderNum = "12")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新时间
-   */
-  @Excel(name = "更新时间", orderNum = "13")
-  private LocalDateTime updateTime;
+  @Excel(name = "备注", orderNum = "8")
+  private String requirement;
 
 
 }

platform-rest/src/main/java/com/platform/rest/controller/sb/SbMeasureLogController.java

@@ -13,6 +13,7 @@ import com.platform.dao.entity.sb.SbMeasureLog;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.check.ExportCheckStandardVO;
 import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO;
+import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.check.CheckStandardService;
 import com.platform.service.sb.SbMeasureLogService;
@@ -131,11 +132,11 @@ public class SbMeasureLogController {
      * @return R
      */
   @GetMapping("/export")
-  @SysLog("设备计量记录导出")
+  @SysLog("计量设备检定记录导出")
   @PreAuthorize("@pms.hasPermission('measure-log-export') or @pms.hasPermission('check-polling-standards-export')")
   public void export(HttpServletResponse response, SbMeasureLogDTO checkStandardDTO) {
-    List<SbMeasureLog> list = checkStandardService.getModelListByDTO(checkStandardDTO);
-    ExcelUtil.exportResponseDict(response, ExportSbMeasureLogVO.class, BeanConverterUtil.copyListProperties(list, ExportSbMeasureLogVO.class), "设备计量记录");
+    List<SbMeasureLogVO> list = checkStandardService.selectList(checkStandardDTO);
+    ExcelUtil.exportResponseDict(response, ExportSbMeasureLogVO.class, BeanConverterUtil.copyListProperties(list, ExportSbMeasureLogVO.class), "计量设备检定记录");
   }
 
 }

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

@@ -106,6 +106,9 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
             checkPeriod = model.getCheckPeriod();
             sbInfo.setCheckPeriod(model.getCheckPeriod());
         }
+        if(model.getCardNo() != null){
+            sbInfo.setCardNo(model.getCardNo());
+        }
         sbInfo.setNextCheckDate(model.getLastDate().minusMonths(-checkPeriod));
         sbInfoMapper.updateByPrimaryKey(sbInfo);
 
@@ -127,6 +130,18 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         // 更新设备下次检定日期
         SbInfo sbInfo = sbInfoMapper.selectByPrimaryKeyForUpdate(model.getSbId());
         sbInfo.setCheckDate(model.getLastDate());
+
+        Integer checkPeriod = 12;// 默认12个月
+        if(sbInfo.getCheckPeriod() != null){
+            checkPeriod = sbInfo.getCheckPeriod();
+        }
+        if(model.getCheckPeriod() != null){
+            checkPeriod = model.getCheckPeriod();
+            sbInfo.setCheckPeriod(model.getCheckPeriod());
+        }
+        if(model.getCardNo() != null){
+            sbInfo.setCardNo(model.getCardNo());
+        }
         sbInfo.setNextCheckDate(model.getLastDate().minusDays(sbInfo.getCheckPeriod()));
         sbInfoMapper.updateByPrimaryKey(sbInfo);