bug修改

sop-business/src/main/resources/mapper/SysUserMapper.xml

@@ -35,7 +35,10 @@
         tfcfe.id as customFlowEntityid,
         tffa.update_time as flowTime,
         datediff(now(),FROM_UNIXTIME(tffa.update_time / 1000,'%Y-%m-%d %H:%i:%s')) as diffTime,
-        24 - TIMESTAMPDIFF(HOUR,DATE_FORMAT(FROM_UNIXTIME(tsjr.exec_time / 1000), '%Y-%m-%d %H:%i:%s'),NOW()) as processHour
+        (select 24 - TIMESTAMPDIFF(hour,
+        DATE_FORMAT(FROM_UNIXTIME(tsjr.exec_time / 1000), '%Y-%m-%d %H:%i:%s'),
+        NOW())  from t_s_job_remind tsjr where tsjr.code = tfcfe.code and tsjr.remind_type = 'AFTER' and tsjr.receive_user_id = #{userId}
+        order by tsjr.create_time desc limit 1) as processHour
         from
         ACT_RU_TASK art
         join t_f_flow_approve tffa on art.PROC_INST_ID_ = tffa.flow_id
@@ -45,7 +48,6 @@
         left join t_b_service tbs on tbs.id = tbc.service_id
         left join sys_custom sc on sc.id = tbc.custom_id
         left join sys_user su ON tfcfe.create_id = su.id
-        left join t_s_job_remind tsjr on tsjr.code  = tfcfe.code
         <where> 1 = 1
             and art.ASSIGNEE_ = cast(#{userId} as char)
             <if test="flowTaskTypeEnum != null and flowTaskTypeEnum != '' and flowTaskTypeEnum == 'DRAFT'">
@@ -97,7 +99,10 @@
         tfcfe.id as customFlowEntityid,
         tffa.update_time as flowTime,
         datediff(now(),FROM_UNIXTIME(tffa.update_time / 1000,'%Y-%m-%d %H:%i:%s')) as diffTime,
-        24 - TIMESTAMPDIFF(HOUR,DATE_FORMAT(FROM_UNIXTIME(tsjr.exec_time / 1000), '%Y-%m-%d %H:%i:%s'),NOW()) as processHour
+        (select 24 - TIMESTAMPDIFF(hour,
+        DATE_FORMAT(FROM_UNIXTIME(tsjr.exec_time / 1000), '%Y-%m-%d %H:%i:%s'),
+        NOW())  from t_s_job_remind tsjr where tsjr.code = tfcfe.code and tsjr.remind_type = 'AFTER' and tsjr.receive_user_id = #{userId}
+        order by tsjr.create_time desc limit 1) as processHour
         from
         ACT_RU_TASK art
         left join act_ru_identitylink ari on ari.TASK_ID_ = art.ID_
@@ -108,7 +113,6 @@
         left join t_b_service tbs on tbs.id = tbc.service_id
         left join sys_custom sc on sc.id = tbc.custom_id
         left join sys_user su ON tfcfe.create_id = su.id
-        left join t_s_job_remind tsjr on tsjr.code  = tfcfe.code
         <where> 1 = 1
             and art.ASSIGNEE_ is null
             and ari.USER_ID_ = cast(#{userId} as char)