From 8501ac307c5032ef486a6b257d26038a033edcf2 Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Mon, 22 Apr 2024 15:47:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?update:=20=E5=8D=AB=E7=94=9F=E8=87=AA?=
 =?UTF-8?q?=E6=9F=A5=E8=AE=A1=E5=88=92=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/safeproduct/vo/HygieneRecordDetailVO.java |   3 +++
 .../safeproduct/mapper/HygieneRecordMapper.xml      |   2 +-
 .../main/resources/template/卫生自查表.docx    | Bin 11555 -> 11687 bytes
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygieneRecordDetailVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygieneRecordDetailVO.java
index 52bee71..a501a6e 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygieneRecordDetailVO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygieneRecordDetailVO.java
@@ -18,6 +18,9 @@ public class HygieneRecordDetailVO {
     @ApiModelProperty("编码")
     private String code;
 
+    @ApiModelProperty("单位")
+    private String unit;
+
     @ApiModelProperty("实际结束时间")
     private Date actualEndTime;
 
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 9f06eb5..e7953b6 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
@@ -4,7 +4,7 @@
     <select id="getRecordDetail" resultType="com.hnac.hzims.safeproduct.vo.HygieneRecordDetailVO">
         SELECT
             code, actual_end_time, check_user, hygiene_zone_ids, check_result,comprehensive_score, week_num,
-            img_path, hygiene_plan_id, check_time
+            img_path, hygiene_plan_id, check_time, unit
         FROM
             hzims_hygiene_record
         WHERE
diff --git a/hzims-service/safeproduct/src/main/resources/template/卫生自查表.docx b/hzims-service/safeproduct/src/main/resources/template/卫生自查表.docx
index 141b2aec0243b85397e1a8c299c2209678a70329..42d5253f6f20eb5f240bdc358dfe805e5ae4d79d 100644
GIT binary patch
delta 4571
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

delta 4437
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


From ab58c534308acc2982a617b40b6b027c0c1f6c5d Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Mon, 22 Apr 2024 16:09:26 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=BA=93=E3=80=81=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E3=80=81=E4=BB=BB=E5=8A=A1=E8=A1=A5=E5=85=85=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hzims-service/operational/src/main/resources/db/2.0.3.sql | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/hzims-service/operational/src/main/resources/db/2.0.3.sql b/hzims-service/operational/src/main/resources/db/2.0.3.sql
index c8df871..4290cc0 100644
--- a/hzims-service/operational/src/main/resources/db/2.0.3.sql
+++ b/hzims-service/operational/src/main/resources/db/2.0.3.sql
@@ -11,4 +11,16 @@ alter table `hzims_oper_maintenance_task` add column  `station_name` varchar(100
 alter table `hzims_oper_maintenance_task` add column `em_name` varchar(255) comment '设备名称';
 -- 日常维护计划、任务添加周期字段
 alter table `hzims_oper_maintenance_plan` add column `period` int(11) comment '周期(单位:小时)';
-alter table `hzims_oper_maintenance_task` add column `period` int(11) comment '周期(单位:小时)';
\ No newline at end of file
+alter table `hzims_oper_maintenance_task` add column `period` int(11) comment '周期(单位:小时)';
+-- 更新日常维护库设备名称
+update hzims_oper_maintenance_library t1,(
+    select ml.`id`,ml.`EM_CODE`,GROUP_CONCAT(ei.`NAME`) EM_NAME from hzims_oper_maintenance_library ml,equipment.hzims_em_info ei where ml.`IS_DELETED` = 0 and ei.`IS_DELETED` = 0 and FIND_IN_SET(ei.`NUMBER`,ml.`EM_CODE`) group by ml.`id`,ml.`EM_CODE`
+) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null
+-- 更新日常维护计划设备名称
+update hzims_oper_maintenance_plan t1,(
+    select ml.`id`,ml.`EM_CODE`,GROUP_CONCAT(ei.`NAME`) EM_NAME from hzims_oper_maintenance_plan ml,equipment.hzims_em_info ei where ml.`IS_DELETED` = 0 and ei.`IS_DELETED` = 0 and FIND_IN_SET(ei.`NUMBER`,ml.`EM_CODE`) group by ml.`id`,ml.`EM_CODE`
+) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null
+-- 更新日常维护任务设备名称
+update hzims_oper_maintenance_task t1,(
+    select ml.`id`,ml.`EM_CODE`,GROUP_CONCAT(ei.`NAME`) EM_NAME from hzims_oper_maintenance_task ml,prod_hzims_equipment.hzims_em_info ei where ml.`IS_DELETED` = 0 and ei.`IS_DELETED` = 0 and FIND_IN_SET(ei.`NUMBER`,ml.`EM_CODE`) group by ml.`id`,ml.`EM_CODE`
+) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null
\ No newline at end of file

From 97be1da833c8af374327f00f9579f0611d32a1ec Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Mon, 22 Apr 2024 16:27:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E3=80=81=E4=BB=BB=E5=8A=A1=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=91=A8=E6=9C=9F=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hzims-service/operational/src/main/resources/db/2.0.3.sql | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/hzims-service/operational/src/main/resources/db/2.0.3.sql b/hzims-service/operational/src/main/resources/db/2.0.3.sql
index 4290cc0..b42a617 100644
--- a/hzims-service/operational/src/main/resources/db/2.0.3.sql
+++ b/hzims-service/operational/src/main/resources/db/2.0.3.sql
@@ -15,12 +15,20 @@ alter table `hzims_oper_maintenance_task` add column `period` int(11) comment '
 -- 更新日常维护库设备名称
 update hzims_oper_maintenance_library t1,(
     select ml.`id`,ml.`EM_CODE`,GROUP_CONCAT(ei.`NAME`) EM_NAME from hzims_oper_maintenance_library ml,equipment.hzims_em_info ei where ml.`IS_DELETED` = 0 and ei.`IS_DELETED` = 0 and FIND_IN_SET(ei.`NUMBER`,ml.`EM_CODE`) group by ml.`id`,ml.`EM_CODE`
-) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null
+) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null;
 -- 更新日常维护计划设备名称
 update hzims_oper_maintenance_plan t1,(
     select ml.`id`,ml.`EM_CODE`,GROUP_CONCAT(ei.`NAME`) EM_NAME from hzims_oper_maintenance_plan ml,equipment.hzims_em_info ei where ml.`IS_DELETED` = 0 and ei.`IS_DELETED` = 0 and FIND_IN_SET(ei.`NUMBER`,ml.`EM_CODE`) group by ml.`id`,ml.`EM_CODE`
-) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null
+) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null;
 -- 更新日常维护任务设备名称
 update hzims_oper_maintenance_task t1,(
     select ml.`id`,ml.`EM_CODE`,GROUP_CONCAT(ei.`NAME`) EM_NAME from hzims_oper_maintenance_task ml,prod_hzims_equipment.hzims_em_info ei where ml.`IS_DELETED` = 0 and ei.`IS_DELETED` = 0 and FIND_IN_SET(ei.`NUMBER`,ml.`EM_CODE`) group by ml.`id`,ml.`EM_CODE`
-) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null
\ No newline at end of file
+) t2 set t1.`EM_NAME` = t2.`EM_NAME` WHERE t1.`ID` = t2.`ID` and t1.`EM_NAME` is null;
+-- 更新日常维护计划周期字段值
+update `hzims_oper_maintenance_plan` mp,`hzims_oper_maintenance_library` ml
+set mp.`period` = ml.`period` where mp.`REF_LIBRARY_ID` = ml.`ID`
+and mp.`IS_DELETED` = 0 and ml.`IS_DELETED` = 0 and mp.`period` is null;
+-- 更新日常维护任务周期字段值
+update `hzims_oper_maintenance_task` mt,`hzims_oper_maintenance_library` ml
+set mt.`period` = ml.`period` where mt.`REF_LIBRARY_ID` = ml.`ID`
+and mt.`IS_DELETED` = 0 and ml.`IS_DELETED` = 0 and mt.`period` is null;
\ No newline at end of file

From 6d0f315c7ad6de4008d987bd834d6495c8b00b0e Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Mon, 22 Apr 2024 17:19:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=8F=96=E5=80=BC=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java
index 2892717..a627cc6 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java
@@ -125,7 +125,6 @@ public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQuerySer
     private List<MaintenanceTaskQueryVO> fillTaskQuery(List<OperMaintenanceTaskEntity> taskList) {
         R<List<Dept>> deptListR = sysClient.getDeptList();
         List<Dept> deptList = deptListR.isSuccess() ? deptListR.getData() : Lists.newArrayList();
-        List<EmInfoEntity> emList = emInfoClient.list();
         IntFunction<MaintenanceTaskQueryVO> convert = index -> {
             OperMaintenanceTaskEntity task = taskList.get(index);
             MaintenanceTaskQueryVO result = new MaintenanceTaskQueryVO();
@@ -137,9 +136,7 @@ public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQuerySer
             // 获取维护类型
             result.setTypeName(DictCache.getValue(DictConstant.MAINTENANCE_TYPE_CODE,task.getTypeCode()));
             // 获取维护设备
-            result.setEmName(emList.stream().filter(
-                    em -> em.getNumber().equals(task.getEmCode())
-            ).findFirst().map(EmInfoEntity::getName).orElse(""));
+            result.setEmName(task.getEmName());
             // 获取执行时间
             result.setPlanDisposeTime(DateUtil.formatDateTime(task.getDisposeTime()));
             result.setDisposeTime(Optional.ofNullable(task.getExecuteTime()).map(DateUtil::formatDateTime).orElse(""));