根据区域和月份分页查询缺陷库

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperPhenomenonEntity.java

@@ -287,25 +287,4 @@ public class OperPhenomenonEntity extends TenantEntity {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@ApiModelProperty(value = "核算工时")
 	private Integer checkHours;
-
-
-	@ApiModelProperty(value = "年月")
-	@TableField(exist = false)
-	private YearMonth yearMonth;
-
-
-	@ApiModelProperty(value = "年月")
-	@TableField(exist = false)
-	private String areaId;
-
-
-	@ApiModelProperty(value = "是否为缺陷 直接传0")
-	@TableField(exist = false)
-	private Integer defect;
-
-
-	@ApiModelProperty(value = "已定论1")
-	@TableField(exist = false)
-	private  Integer conclusionStatusNum;
-
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/web/AreaMonthlyDetailsController.java

@@ -17,6 +17,7 @@ import com.hnac.hzims.operational.defect.vo.OperDefectVO;
 import com.hnac.hzims.operational.defect.vo.OperPhenomenonVO;
 import com.hnac.hzims.operational.defect.wrapper.OperPhenomenonWrapper;
 import com.hnac.hzims.operational.main.service.AreaMonthlyDetailsService;
+import com.hnac.hzims.operational.main.vo.OperPhenomenonVo;
 import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity;
 import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskService;
 import com.hnac.hzims.safeproduct.areamonthly.vo.CheckCompanyVo;
@@ -206,7 +207,7 @@ public class AreaMonthlyDetailsController {
     public R<IPage<OperPhenomenonVO>> queryDefectPageList(
             @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
             @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
-            OperPhenomenonEntity entity, String taskIds, Date findTimeEnd) {
+            OperPhenomenonVo entity, String taskIds, Date findTimeEnd) {
         Page<OperPhenomenonEntity> operDefectEntityPage = new Page<>(page, size);
         LambdaQueryWrapper<OperPhenomenonEntity> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtil.isNotBlank(taskIds)) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/vo/OperPhenomenonVo.java

@@ -0,0 +1,69 @@
+package com.hnac.hzims.operational.main.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.YearMonth;
+import java.util.Date;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/6/12 15:59
+ */
+@Data
+public class OperPhenomenonVo {
+
+    /**
+     * 发现时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "发现时间")
+    private Date findTime;
+
+    /**
+     * 甄别状态：已甄别 1 和未甄别 0 ，默认0
+     */
+    @ApiModelProperty(value = "甄别状态：已甄别 1 和未甄别 0 ，默认0")
+    private String discriminateStatus;
+
+    /**
+     * 计划开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "计划开始时间")
+    private Date planStartTime;
+    /**
+     * 计划结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "计划结束时间")
+    private Date planEndTime;
+
+
+
+    @ApiModelProperty(value = "年月")
+    @TableField(exist = false)
+    private YearMonth yearMonth;
+
+
+    @ApiModelProperty(value = "年月")
+    private String areaId;
+
+
+    @ApiModelProperty(value = "是否为缺陷 直接传0")
+    @TableField(exist = false)
+    private Integer defect;
+
+
+    @ApiModelProperty(value = "已定论1")
+    private Integer conclusionStatusNum;
+
+}