From d056c424957f9275d1dcd6898972f2636845218c Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Thu, 22 Feb 2024 09:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E9=A3=8E=E9=99=A9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nxdt/energy/newSubApply/entity/CheckPersonBean.java | 9 +++++++++ .../mappers/newcheck/NewSubCheckManageMapper.xml | 2 +- .../resources/static/js/newCheck/datumCheckForm4_new.js | 3 +++ .../resources/static/js/newCheck/datumCheckForm5_new.js | 3 +++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/CheckPersonBean.java b/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/CheckPersonBean.java index 2917f48..6af5542 100644 --- a/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/CheckPersonBean.java +++ b/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/CheckPersonBean.java @@ -33,5 +33,14 @@ public class CheckPersonBean { private String otherFileId; //其他材料id private String isSpecial; //是否特殊工种 + //审核类型 + private String auditType; + + //审核流程id + private String auditProcess; + + //点击样式 1审核 2查看 + private String clickType; + } diff --git a/src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml b/src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml index d5c14f2..f61e1e6 100644 --- a/src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml +++ b/src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml @@ -387,7 +387,7 @@ SELECT * from ( LEFT JOIN type_work tw ON tw.id = cpq.job WHERE cpq.contrator_id = #{contractorId} - AND cpq.check_process_status = '2' AND cpq.appera_status in (0,3) + AND cpq.check_process_status = '2' AND cpq.appera_status in (0,3) and appera_process_id= #{auditProcess}