From 4b191b643aadf3e39cde72095090903f0f99421e Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Fri, 12 Jan 2024 09:23:43 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=8D=AB=E7=94=9F=E8=87=AA=E6=9F=A5?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hnac/hzims/safeproduct/dto/HygienePlanDTO.java  | 3 +++
 .../java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java | 3 +++
 .../com/hnac/hzims/safeproduct/entity/HygieneRecordEntity.java    | 3 ---
 .../java/com/hnac/hzims/safeproduct/vo/HygienePlanDetailVO.java   | 6 ++++++
 .../com/hnac/hzims/safeproduct/controller/HygieneController.java  | 2 ++
 .../java/com/hnac/hzims/safeproduct/mapper/HygienePlanMapper.xml  | 4 ++--
 .../com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml     | 2 +-
 .../hzims/safeproduct/service/impl/HygienePlanServiceImpl.java    | 8 ++++++++
 8 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/HygienePlanDTO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/HygienePlanDTO.java
index d4c074f..0345876 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/HygienePlanDTO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/HygienePlanDTO.java
@@ -24,6 +24,9 @@ public class HygienePlanDTO extends BaseEntity {
     @ApiModelProperty("卫生自查计划id")
     private Long id;
 
+    @ApiModelProperty("单位")
+    private String unit;
+
     @ApiModelProperty("计划名称")
     private String name;
 
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java
index f4af9aa..39a641f 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java
@@ -24,6 +24,9 @@ public class HygienePlanEntity extends BaseEntity {
     @ApiModelProperty("计划名称")
     private String name;
 
+    @ApiModelProperty("单位")
+    private String unit;
+
     @ApiModelProperty("标准总分值")
     private Integer standardScore;
 
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygieneRecordEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygieneRecordEntity.java
index 275d3dd..e58f745 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygieneRecordEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygieneRecordEntity.java
@@ -59,7 +59,4 @@ public class HygieneRecordEntity extends BaseEntity {
     @Size(max = 1000, message = "检查图片字段长度不能超过1000")
     @ApiModelProperty("检查图片")
     private String imgPath;
-
-    @ApiModelProperty("自查记录状态")
-    private String hygieneRecordStatus;
 }
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygienePlanDetailVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygienePlanDetailVO.java
index a41e72e..f342328 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygienePlanDetailVO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygienePlanDetailVO.java
@@ -21,6 +21,12 @@ import java.util.List;
 @ApiModel(value = "卫生自查计划详情VO类")
 public class HygienePlanDetailVO extends BaseEntity {
 
+    @ApiModelProperty("计划名称")
+    private String name;
+
+    @ApiModelProperty("单位")
+    private String unit;
+
     @ApiModelProperty("标准总分值")
     private Integer standardScore;
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
index e0e36e9..63bdafe 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
@@ -72,6 +72,8 @@ public class HygieneController extends BladeController {
 
     @GetMapping("/planPage")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "unit", value = "单位", dataType = "query", paramType = "string"),
+            @ApiImplicitParam(name = "name", value = "名称", dataType = "query", paramType = "string"),
             @ApiImplicitParam(name = "scheduledStartTime", value = "计划开始时间", dataType = "query", paramType = "string"),
             @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
     })
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygienePlanMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygienePlanMapper.xml
index ce87bbb..39919c0 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygienePlanMapper.xml
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygienePlanMapper.xml
@@ -20,9 +20,9 @@
 
     <select id="selectFinishedDataByMonth" resultType="com.hnac.hzims.safeproduct.vo.HygieneMonthVO">
         SELECT
-            unit, count(1) as finished_task_num
+            unit, count(1) as finished_check_num
         FROM
-            hzims_hygiene_record
+            hzims_hygiene_plan
         WHERE
             is_deleted = 0
             AND scheduled_end_time like concat('%', #{month}, '%')
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml
index 7536baa..93de52a 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml
@@ -20,7 +20,7 @@
         WHERE
             is_deleted = 0
         <if test="param.hygienePlanId != null and param.hygienePlanId != ''">
-            AND hygiene_plan_id = #{hygienePlanId}
+            AND hygiene_plan_id = #{param.hygienePlanId}
         </if>
         ORDER BY
             create_time DESC
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
index d9a787f..3292edd 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
@@ -79,12 +79,20 @@ public class HygienePlanServiceImpl extends ServiceImpl<HygienePlanMapper, Hygie
         QueryWrapper<HygienePlanEntity> queryWrapper = new QueryWrapper<>();
         String startTime = String.valueOf(param.get("scheduledStartTime"));
         String endTime = String.valueOf(param.get("scheduledEndTime"));
+        String unit = String.valueOf(param.get("unit"));
+        String name = String.valueOf(param.get("name"));
         if (!startTime.equals("null") && !startTime.equals("")) {
             queryWrapper.lambda().ge(HygienePlanEntity::getScheduledStartTime, startTime);
         }
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(HygienePlanEntity::getScheduledEndTime, endTime);
         }
+        if (!unit.equals("null") && !unit.equals("")) {
+            queryWrapper.lambda().like(HygienePlanEntity::getUnit, unit);
+        }
+        if (!name.equals("null") && !name.equals("")) {
+            queryWrapper.lambda().like(HygienePlanEntity::getName, name);
+        }
         queryWrapper.lambda().orderByDesc(HygienePlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }