fix:设备测试问题处理

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentFileController.java

@@ -110,10 +110,13 @@ public class ReportDocumentFileController extends AbstractFileUploadController i
     public CommonResult<ReportDocumentFileRespVO> getPdfFileObjByMainId(ReportDocumentFileSaveReqVO vo) {
         Long mainId = vo.getMainId();
         Integer version = vo.getVersion();
-        if(version == null){
-            ReportDocumentMainDO mainDO = reportDocumentMainService.getReportDocumentMain(mainId);
+//        String lastVersionFlag = vo.getLastVersionFlag();
+//        if("1".equals(lastVersionFlag))
+//            vo.setType("");
+//        if(version == null){
+//            ReportDocumentMainDO mainDO = reportDocumentMainService.getReportDocumentMain(mainId);
 //            version = mainDO.getDocumentVersion();
-        }
+//        }
 //        if(type != null)
 //            entity
         if(ObjectUtils.isEmpty(vo.getType()))

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentFileServiceImpl.java

@@ -7,6 +7,7 @@ import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentFil
 import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentFileSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
@@ -39,7 +40,7 @@ public class ReportDocumentFileServiceImpl implements ReportDocumentFileService
         LambdaQueryWrapper<ReportDocumentFileDO> query = new LambdaQueryWrapper<>();
         if(vo.getMainId() != null)
             query.eq(ReportDocumentFileDO::getMainId, vo.getMainId());
-        if(vo.getType() != null)
+        if(!ObjectUtils.isEmpty(vo.getType()))
             query.eq(ReportDocumentFileDO::getType, vo.getType());
         if(vo.getVersion() != null)
             query.eq(ReportDocumentFileDO::getVersion, vo.getVersion());

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceApplyPageReqVO.java

@@ -27,6 +27,10 @@ public class DeviceApplyPageReqVO extends PageParam {
     @Schema(description = "申请人ID")
     private String applyUser;
 
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] applyTime;
+
     @Schema(description = "申请标题")
     private String title;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceApplyRespVO.java

@@ -32,6 +32,10 @@ public class DeviceApplyRespVO {
     @ExcelProperty("申请人")
     private String applyUserName;
 
+    @Schema(description = "申请时间")
+    @ExcelProperty("申请时间")
+    private LocalDateTime applyTime;
+
     @Schema(description = "申请标题")
     @ExcelProperty("申请标题")
     private String title;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceApplySaveReqVO.java

@@ -28,6 +28,9 @@ public class DeviceApplySaveReqVO {
     @Schema(description = "申请人ID")
     private String applyUser;
 
+    @Schema(description = "申请时间")
+    private LocalDateTime applyTime;
+
     @Schema(description = "申请标题")
     private String title;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemRespVO.java

@@ -53,7 +53,7 @@ public class DeviceConfigBusinessItemRespVO {
     @ExcelProperty("责任人")
     private String dutyRemark;
 
-    @Dict(dicCode = "write_way")
+    @Dict(dicCode = "maintenance_item_input_way")
     @Schema(description = "填写方式")
     @ExcelProperty("填写方式")
     private String writeWay;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainItemPageReqVO.java

@@ -67,6 +67,9 @@ public class DeviceMaintainItemPageReqVO extends PageParam {
     @Schema(description = "责任人")
     private String dutyRemark;
 
+    @Schema(description = "填写方式")
+    private String writeWay;
+
     @Schema(description = "排序号")
     private Integer sortNo;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainItemRespVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.device.controller.vo;
 
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -87,6 +88,11 @@ public class DeviceMaintainItemRespVO {
     @ExcelProperty("责任人")
     private String dutyRemark;
 
+    @Schema(description = "填写方式")
+    @ExcelProperty("填写方式")
+    @Dict(dicCode = "maintenance_item_input_way")
+    private String writeWay;
+
     @Schema(description = "排序号")
     @ExcelProperty("排序号")
     private Integer sortNo;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainItemSaveReqVO.java

@@ -66,6 +66,9 @@ public class DeviceMaintainItemSaveReqVO {
     @Schema(description = "责任人")
     private String dutyRemark;
 
+    @Schema(description = "填写方式")
+    private String writeWay;
+
     @Schema(description = "排序号")
     private Integer sortNo;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceApplyDO.java

@@ -57,6 +57,12 @@ public class DeviceApplyDO extends BusinessBaseDO {
     @TableField("APL_USER")
     private Long applyUser;
 
+    /**
+     * 申请时间
+     */
+    @TableField("APL_TM")
+    private LocalDateTime applyTime;
+
     @TableField("TTL")
     private String title;