From 72d7e970694a3638b4df62590ca87138382fb65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=97=E9=A3=8E?= <2452618307@qq.com>
Date: Mon, 22 Apr 2024 13:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83,=E5=B7=B2?=
=?UTF-8?q?=E6=92=A4=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E6=A0=B9?=
=?UTF-8?q?=E6=8D=AE=E6=90=9C=E7=B4=A2=E6=A1=86=E5=8D=95=E7=8B=AC=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nxdt/energy/newSubApply/entity/SubEntranceBean.java | 2 ++
.../newSubApply/service/impl/NewconsServiceImpl.java | 1 +
src/main/resources/mappers/newSubApply/SubIndexMapper.xml | 7 ++++++-
.../resources/static/pages/work/newSubApply/subIndex.html | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubEntranceBean.java b/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubEntranceBean.java
index 44097ba..358a251 100644
--- a/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubEntranceBean.java
+++ b/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubEntranceBean.java
@@ -35,6 +35,8 @@ public class SubEntranceBean {
private String processId;
private String fileId;
+ private String distInfo;
+
//工器具
private String equipmentName;
private String number;
diff --git a/src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/NewconsServiceImpl.java b/src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/NewconsServiceImpl.java
index 0d8ad57..0595490 100644
--- a/src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/NewconsServiceImpl.java
+++ b/src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/NewconsServiceImpl.java
@@ -204,6 +204,7 @@ public class NewconsServiceImpl implements NewconsService {
bean.setUuid(UUID.randomUUID().toString().replaceAll("-", ""));
bean.setNameId(UserUtil.getLoginUser().getId().toString());
bean.setMessage("【提示信息】 " + name + "撤回入场材料成功");
+ bean.setDistInfo("5");
dao.insertAps(bean);
dao.insertMessageTabeles(bean);
}
diff --git a/src/main/resources/mappers/newSubApply/SubIndexMapper.xml b/src/main/resources/mappers/newSubApply/SubIndexMapper.xml
index 4bd798c..3b5720b 100644
--- a/src/main/resources/mappers/newSubApply/SubIndexMapper.xml
+++ b/src/main/resources/mappers/newSubApply/SubIndexMapper.xml
@@ -33,7 +33,12 @@
- and ap.audit_result like concat ('%',#{auditResult},'%')
+
+ and ap.audit_result like concat ('%',#{auditResult},'%')
+
+
+ and mt.dist_info = '5'
+
AND mt.audit_id IN (${auditId})
diff --git a/src/main/resources/static/pages/work/newSubApply/subIndex.html b/src/main/resources/static/pages/work/newSubApply/subIndex.html
index ea03507..6cf270b 100644
--- a/src/main/resources/static/pages/work/newSubApply/subIndex.html
+++ b/src/main/resources/static/pages/work/newSubApply/subIndex.html
@@ -78,7 +78,7 @@
-
+