Merge remote-tracking branch 'origin/master'

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;
 

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(""));

hzims-service/operational/src/main/resources/db/2.0.3.sql

@@ -11,4 +11,24 @@ 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 '周期(单位:小时)';
+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;
+-- 更新日常维护计划周期字段值
+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;

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