From cbcb5b1de17ae84b36ec3cfaa15d96b251aa9e23 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 23 Apr 2024 15:25:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java index b540c27..932cc16 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java @@ -28,7 +28,9 @@ public interface TaskMapper extends UserDataScopeBaseMapper { */ List getListPage(@Param("page") IPage page, @Param("task") TaskListQuery task); + @UserDataAuth List getAllPageList(@Param("page") IPage page, @Param("task") TaskDTO taskDTO); + List getAllExportList(@Param("task") TaskDTO taskDTO); List mainQueryPage(@Param("page") IPage page, @Param("task") TaskListQuery task); From 8780ed6c89e87575d6ac9c97c92a3cee6ffea21e Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 23 Apr 2024 15:28:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E7=BA=BF=E4=B8=8B=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=A5=A8=E4=BD=9C=E5=BA=9F=E7=8E=AF=E8=8A=82=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FirstWorkTicketServiceImpl.java | 4 +- .../service/impl/TicketProcessServiceImpl.java | 44 +++++++++++++++++++--- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java index 66f6b0a..41d0b30 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java @@ -373,7 +373,9 @@ public class FirstWorkTicketServiceImpl extends BaseServiceImpl safetyMeasuresList = workTicketVo.getSafetyMeasuresList(); if(CollectionUtil.isNotEmpty(safetyMeasuresList)) { @@ -643,7 +641,43 @@ public class TicketProcessServiceImpl implements TicketProcessService { } } - + /** + * 填充工作票当前流程环节名称 + * @param workTicket 工作票 + * @param response redis订阅消息 + * @return 当前流程环节名称 + */ + private void fillCurrentFlowName(WorkTicketInfoEntity workTicket, ProcessWorkFlowResponse response) { + String taskId = response.getTaskId(); + Object variablesObj = response.getVariables(); + JSONObject variable = JSONObject.parseObject(JSON.toJSONString(variablesObj)); + Boolean signFlag = Func.isNotEmpty(variable.getBoolean("signFlag")) ? variable.getBoolean("signFlag") : true; + Boolean receiveFlag = Func.isNotEmpty(variable.getBoolean("recieveFlag")) ? variable.getBoolean("recieveFlag") : true; + if(StringUtil.isNotBlank(taskId)) { + workTicket.setFlowUserId(response.getUserId()); + workTicket.setNextStepOperator(response.getNextStepOperator()); + String flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat("，待").concat(response.getNextStepOperator()).concat("审批"); + workTicket.setFlowDescription(flowDescription); + workTicket.setFlowTaskId(taskId); + workTicket.setFlowTaskName(response.getTaskName()); + } + else if(!signFlag || !receiveFlag ) { + // 作废 + workTicket.setFlowDescription("作废"); + workTicket.setFlowTaskName("作废"); + workTicket.setNextStepOperator(null); + workTicket.setStepOperator(null); + } + else { + // 结束 + workTicket.setFlowDescription("结束"); + workTicket.setFlowTaskName("结束"); + workTicket.setNextStepOperator(null); + workTicket.setStepOperator(null); + workTicket.setFlowStatus(999); + workTicket.setImplementStatus("3"); + } + } /** * 获取描述信息 * From 841fe3720661c77d9900d6bef84389e79ed56916 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 23 Apr 2024 15:29:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=BE=E5=A4=87=E8=B5=8B=E5=80=BC=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E4=BF=AE=E6=94=B9?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 b42a617..2b49805 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 @@ -22,7 +22,7 @@ update hzims_oper_maintenance_plan t1,( ) 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` + select ml.`id`,ml.`EM_CODE`,GROUP_CONCAT(ei.`NAME`) EM_NAME from hzims_oper_maintenance_task 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` mp,`hzims_oper_maintenance_library` ml