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 @@ - +