diff --git a/src/main/java/com/bonus/nxdt/energy/GetResponsibleFor/service/GetResponsibleForServiceImp.java b/src/main/java/com/bonus/nxdt/energy/GetResponsibleFor/service/GetResponsibleForServiceImp.java index 07db76e..90f1fdf 100644 --- a/src/main/java/com/bonus/nxdt/energy/GetResponsibleFor/service/GetResponsibleForServiceImp.java +++ b/src/main/java/com/bonus/nxdt/energy/GetResponsibleFor/service/GetResponsibleForServiceImp.java @@ -71,8 +71,8 @@ public class GetResponsibleForServiceImp implements GetResponsibleForService { bean.setId(UserUtil.getLoginUser().getId().toString()); msg = dao.addMessageTable(bean); if (!"2".equals(bean.getAuditTypeId()) && "3".equals(bean.getAuditTypeId()) && "6".equals(bean.getAuditTypeId())) { - setPhoneMsg(approvalProcessBean.getAuditNameId(), msg1); - setPhoneMsg(bean.getAuditNameId(), msg1); +// setPhoneMsg(approvalProcessBean.getAuditNameId(), msg1); +// setPhoneMsg(bean.getAuditNameId(), msg1); } toBackBean.setNum(msg); toBackBean.setMsg(msg1); diff --git a/src/main/java/com/bonus/nxdt/energy/constrator/entity/CheckManageBean.java b/src/main/java/com/bonus/nxdt/energy/constrator/entity/CheckManageBean.java index 75b3168..3d10a87 100644 --- a/src/main/java/com/bonus/nxdt/energy/constrator/entity/CheckManageBean.java +++ b/src/main/java/com/bonus/nxdt/energy/constrator/entity/CheckManageBean.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class CheckManageBean { - + private String auditProcessId; //承包商id private String id; diff --git a/src/main/java/com/bonus/nxdt/energy/constrator/service/CheckManageServiceImpl.java b/src/main/java/com/bonus/nxdt/energy/constrator/service/CheckManageServiceImpl.java index 15d0a7b..86c550c 100644 --- a/src/main/java/com/bonus/nxdt/energy/constrator/service/CheckManageServiceImpl.java +++ b/src/main/java/com/bonus/nxdt/energy/constrator/service/CheckManageServiceImpl.java @@ -159,7 +159,7 @@ public class CheckManageServiceImpl implements CheckManageService { listAfter.forEach(i -> { String msg = "【审核流转信息】"+loginName+phone+" 将审核提交至"+i.getValue()+"处，请注意及时审核"; // dao.insertCheckMsg(i.getKey(),msg,o.getAuditStatus()); - setPhoneMsg(i.getPhone(),msg); +// setPhoneMsg(i.getPhone(),msg); }); }else { //终审 diff --git a/src/main/java/com/bonus/nxdt/energy/material/dao/MaterialUploadDao.java b/src/main/java/com/bonus/nxdt/energy/material/dao/MaterialUploadDao.java index 8c79967..76e9b4e 100644 --- a/src/main/java/com/bonus/nxdt/energy/material/dao/MaterialUploadDao.java +++ b/src/main/java/com/bonus/nxdt/energy/material/dao/MaterialUploadDao.java @@ -76,4 +76,8 @@ public interface MaterialUploadDao { //以下为2024年审核流修改新增方法 int addProgressChild(MaterialBean bean); + + int updateProgressChild(MaterialBean bb); + + String getProcessChildId(MaterialBean bb); } diff --git a/src/main/java/com/bonus/nxdt/energy/material/service/MaterialUploadService.java b/src/main/java/com/bonus/nxdt/energy/material/service/MaterialUploadService.java index 0373040..f13b8cf 100644 --- a/src/main/java/com/bonus/nxdt/energy/material/service/MaterialUploadService.java +++ b/src/main/java/com/bonus/nxdt/energy/material/service/MaterialUploadService.java @@ -80,4 +80,7 @@ public interface MaterialUploadService { //以下为2024年审核流修改新增方法 int addProgressChild(MaterialBean bean); + int updateProgressChild(MaterialBean bb); + + String getProgressChildId(MaterialBean bb); } diff --git a/src/main/java/com/bonus/nxdt/energy/material/service/MaterialUploadServiceImpl.java b/src/main/java/com/bonus/nxdt/energy/material/service/MaterialUploadServiceImpl.java index ff2f5bd..25b1076 100644 --- a/src/main/java/com/bonus/nxdt/energy/material/service/MaterialUploadServiceImpl.java +++ b/src/main/java/com/bonus/nxdt/energy/material/service/MaterialUploadServiceImpl.java @@ -371,4 +371,14 @@ public class MaterialUploadServiceImpl implements MaterialUploadService { public int addProgressChild(MaterialBean bean) { return dao.addProgressChild(bean); } + + @Override + public int updateProgressChild(MaterialBean bb) { + return dao.updateProgressChild(bb); + } + + @Override + public String getProgressChildId(MaterialBean bb) { + return dao.getProcessChildId(bb); + } } diff --git a/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubCheckManageBean.java b/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubCheckManageBean.java index 57c1940..d59f291 100644 --- a/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubCheckManageBean.java +++ b/src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubCheckManageBean.java @@ -133,5 +133,5 @@ public class SubCheckManageBean { private String isCheck = "0"; private String childId; - + private String type; } 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 e6fb9a1..44097ba 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 @@ -49,4 +49,5 @@ public class SubEntranceBean { private String messageTitle; private String auditId; private String messageTheme; + private String reUpload; } 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 026294d..a337c5f 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 @@ -81,7 +81,11 @@ public class NewconsServiceImpl implements NewconsService { bb.setAuditStatus("0"); bb.setProcessType("-1"); bb.setAuditProcess(processId); - materialUploadService.addProgressChild(bb); + if("true".equals(bean.getReUpload())) { + materialUploadService.updateProgressChild(bb); + }else { + materialUploadService.addProgressChild(bb); + } } return cons; } @@ -148,7 +152,11 @@ public class NewconsServiceImpl implements NewconsService { bb.setAuditStatus("0");//待审核 bb.setProcessType("-1"); bb.setAuditProcess(processId); - materialUploadService.addProgressChild(bb); + if("true".equals(bean.getReUpload())) { + materialUploadService.updateProgressChild(bb); + }else { + materialUploadService.addProgressChild(bb); + } } return num; @@ -172,8 +180,8 @@ public class NewconsServiceImpl implements NewconsService { b.setAuditTypeId("3"); ToBackBean backBean = service.addAuditProcess(b); if(backBean.getNum() == 1 && "1".equals(bean.getNum())){ - setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); - setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); System.out.println("=======================设备新增发送短信========================"); } MaterialBean bb = new MaterialBean(); diff --git a/src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/SubCheckManageServiceImpl.java b/src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/SubCheckManageServiceImpl.java index ed6ba4a..7f9df0a 100644 --- a/src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/SubCheckManageServiceImpl.java +++ b/src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/SubCheckManageServiceImpl.java @@ -1094,7 +1094,7 @@ public class SubCheckManageServiceImpl implements SubCheckManageService { checkManageDao.insertCheckMsg(nextId, msg, o.getAuditStatus(), o.getMsgId(), o.getProId()); listAfter.forEach(i -> { String msg1 = "【" + o.getContractorName() + "-" + o.getCheckType() + "】" + loginName + "(" + phone + ") 将" + o.getCheckType() + "材料提交至 -" + i.getValue() + "- 处，请注意及时审核"; - setPhoneMsg(i.getPhone(), msg1); +// setPhoneMsg(i.getPhone(), msg1); }); } else { //终审 diff --git a/src/main/java/com/bonus/nxdt/energy/newcheck/dao/New_CheckManageDao.java b/src/main/java/com/bonus/nxdt/energy/newcheck/dao/New_CheckManageDao.java index d30ac2d..e359976 100644 --- a/src/main/java/com/bonus/nxdt/energy/newcheck/dao/New_CheckManageDao.java +++ b/src/main/java/com/bonus/nxdt/energy/newcheck/dao/New_CheckManageDao.java @@ -78,4 +78,6 @@ public interface New_CheckManageDao { void updatePersonStatus(String auditId, String isActive); void updateToolsStatus(String auditId, String isActive); + + String getAuditProcessId(CheckManageBean o); } diff --git a/src/main/java/com/bonus/nxdt/energy/newcheck/service/impl/New_SubCheckManageServiceImpl.java b/src/main/java/com/bonus/nxdt/energy/newcheck/service/impl/New_SubCheckManageServiceImpl.java index 9b8f935..e0835e9 100644 --- a/src/main/java/com/bonus/nxdt/energy/newcheck/service/impl/New_SubCheckManageServiceImpl.java +++ b/src/main/java/com/bonus/nxdt/energy/newcheck/service/impl/New_SubCheckManageServiceImpl.java @@ -85,7 +85,10 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService i.setJumpPage("5"); i.setJumpType("1"); } - + if ("7".equals(auditType)){ + i.setJumpPage("5"); + i.setJumpType("2"); + } //1.2 判断是否是董事长 isManager(phone, i); } else { @@ -1164,7 +1167,7 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService checkManageDao.insertCheckMsg(nextId, msg, o.getAuditStatus(), o.getMsgId(), o.getProId()); listAfter.forEach(i -> { String msg1 = "【" + o.getContractorName() + "-" + o.getNewDataMsg() + "】" + loginName + "(" + phone + ") 将" + o.getNewDataMsg() + "材料提交至 -" + i.getValue() + "- 处，请注意及时审核"; - setPhoneMsg(i.getPhone(), msg1); +// setPhoneMsg(i.getPhone(), msg1); }); } else { //终审 @@ -1307,6 +1310,8 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService String phones = checkManageDao.getAuditTwoPhone(o); o.setAuditNameId(phones); //毛病 将前面全部通过 + String id = checkManageDao.getAuditProcessId(o); + o.setAuditProcessId(id); checkManageDao.updateCheckStatus(o); //人员和工器具会有多个数据，删掉无用数据 checkManageDao.updateCheckDataActive(o); diff --git a/src/main/java/com/bonus/nxdt/energy/person/service/PersonAddServiceImpl.java b/src/main/java/com/bonus/nxdt/energy/person/service/PersonAddServiceImpl.java index acced14..cd39788 100644 --- a/src/main/java/com/bonus/nxdt/energy/person/service/PersonAddServiceImpl.java +++ b/src/main/java/com/bonus/nxdt/energy/person/service/PersonAddServiceImpl.java @@ -129,8 +129,8 @@ public class PersonAddServiceImpl implements PersonAddService { materialUploadService.addProgressChild(bb); if(backBean.getNum() == 1 && i == 0){ - setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); - setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); System.out.println("=======================人员新增发送短信========================"); } } diff --git a/src/main/java/com/bonus/nxdt/energy/person/service/PersonExitSetServiceImpl.java b/src/main/java/com/bonus/nxdt/energy/person/service/PersonExitSetServiceImpl.java index 1f2029b..5795c9d 100644 --- a/src/main/java/com/bonus/nxdt/energy/person/service/PersonExitSetServiceImpl.java +++ b/src/main/java/com/bonus/nxdt/energy/person/service/PersonExitSetServiceImpl.java @@ -51,8 +51,8 @@ public class PersonExitSetServiceImpl implements PersonExitSetService { b.setAuditTypeId("6"); ToBackBean backBean = service.addAuditProcess(b); if(backBean.getNum() == 1 && i == 0){ - setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); - setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); System.out.println("=======================人员出场发送短信========================"); } //添加 diff --git a/src/main/resources/mappers/material/MaterialUploadMapper.xml b/src/main/resources/mappers/material/MaterialUploadMapper.xml index 7e65072..0bc3188 100644 --- a/src/main/resources/mappers/material/MaterialUploadMapper.xml +++ b/src/main/resources/mappers/material/MaterialUploadMapper.xml @@ -483,9 +483,12 @@ update security_apparatus set is_active ='0' where equip_file_id = #{uuid}; update file_table set is_active ='0' where file_id = #{uuid} ; + + update audit_pross_child set audit_status = #{auditStatus} where cons_id = #{contratorId} and audit_process = #{auditProcess} + - SELECT count(1) FROM( @@ -622,6 +625,9 @@ AND cq.appera_status = '0' + diff --git a/src/main/resources/mappers/newcheck/NewCheckManageMapper.xml b/src/main/resources/mappers/newcheck/NewCheckManageMapper.xml index dac8fb8..6dc3ca9 100644 --- a/src/main/resources/mappers/newcheck/NewCheckManageMapper.xml +++ b/src/main/resources/mappers/newcheck/NewCheckManageMapper.xml @@ -193,7 +193,7 @@ update audit_processon set audit_result = '1' - where audit_id = #{auditId} and cons_id = #{id} and project_id = #{proId} + where id = #{auditProcessId} update audit_processon set is_active = '0' @@ -427,6 +427,10 @@ + update audit_pross_child set process_type = #{processType} where id = #{childId} diff --git a/src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml b/src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml index f61e1e6..b7fe703 100644 --- a/src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml +++ b/src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml @@ -6,13 +6,19 @@ cq.is_active = '1' AND cq.audit_process IS NOT NULL AND cq.project_id IS NOT NULL and apc.is_active ='1' + + and cq.contrator_id = #{contractorId} + and locate(#{projectName},bmp.`name`) and bmp.start_time between #{startDate} and #{endDate} - order by cq.id desc + + and apc.audit_status = #{auditStatus} + + order by cq.id,ap.create_time desc @@ -33,7 +39,6 @@ cq.contrator_register AS contractorRegister, bmp.legal_person AS asLegal, bmp.phone AS legalPhone, - bmp.start_time AS createTime, apc.audit_status as auditStatus, apc.audit_process AS auditProcess, cq.start_work_status AS startWorkStatus, diff --git a/src/main/resources/static/js/work/newSub/cbsAppearApply.js b/src/main/resources/static/js/work/newSub/cbsAppearApply.js index 89cb499..f21a20d 100644 --- a/src/main/resources/static/js/work/newSub/cbsAppearApply.js +++ b/src/main/resources/static/js/work/newSub/cbsAppearApply.js @@ -268,7 +268,7 @@ function cbsBasesave() { 'contratorId':contratorId, 'fileId':imgUuid, auditProcess:auditProcess, - reUpload : "true" + reUpload : reUpload }, //获取提交的表单字段 success: function (data) { var resMsg = data.resMsg; diff --git a/src/main/resources/static/js/work/newSub/datumChecDetails_new.js b/src/main/resources/static/js/work/newSub/datumChecDetails_new.js index 71d33cd..db06665 100644 --- a/src/main/resources/static/js/work/newSub/datumChecDetails_new.js +++ b/src/main/resources/static/js/work/newSub/datumChecDetails_new.js @@ -22,18 +22,16 @@ layui.use(['table', 'form', 'laydate', 'dropdown' ,'util'], function () { }); if (ifMaster === "分包"){ - $("#subContractor").css("display","block"); - $("#subContractor").css("display","block"); + $("#subcontract_ul").css("display",""); + $("#generalPackage_ul").css("display","none"); } - if (consApplyStatus === "2"){ - $("#addDic").css("display","none"); - } if (startWorkStatus !== "10"){ document.getElementById('generalPackage_start_work_apply').style.display = "none"; document.getElementById('subcontract_start_work_apply').style.display = "none"; } if (consApplyStatus !== "10"){ + $("#addDic").css("display","none"); $("#generalPackage_start_work_apply").css("display","none"); $("#subcontract_start_work_apply").css("display","none"); } @@ -75,7 +73,10 @@ layui.use(['table', 'form', 'laydate', 'dropdown' ,'util'], function () { elem: '#lay-table' //表格id , url: ctxPath + '/new_subCheckManage/getProList' //接口地址 , method: 'post' //方式默认是get - , where: {} //post请求必须加where ，post请求需要的参数 + , where: { + contractorId: consId, + type: "view" + } //post请求必须加where ，post请求需要的参数 , title: '首页消息表' , cellMinWidth: 70 //全局定义常规单元格的最小宽度，layui 2.2.1 新增 , cols: [[ @@ -185,7 +186,9 @@ layui.use(['table', 'form', 'laydate', 'dropdown' ,'util'], function () { projectName: $("#projectName").val(), startDate: $("#startDate").val(), endDate: $("#endDate").val(), - auditStatus: $("#auditStatus").val() + auditStatus: $("#auditStatus").val(), + contractorId: consId, + type: "view" }; var index = layer.msg('查询中，请稍后...', {icon: 16, time: false, shade: 0}); setTimeout(function () { @@ -362,9 +365,11 @@ function layerOpenForm(title,contentUrl){ * @param auditStatus * @param proName * @param consName + * @param auditr + * @param auditProcess * @returns {*} */ -function openFrameTwo(title, contentUrl,ifMaster, consId, proId, auditStatus, proName, consName,auditr, ifMaster, auditProcess) { +function openFrameTwo(title, contentUrl,ifMaster, consId, proId, auditStatus, proName, consName, auditProcess) { localStorage.setItem("consId", consId); localStorage.setItem("proId", proId); localStorage.setItem("proName", proName); diff --git a/src/main/resources/static/pages/work/newSubApply/contractorModuleList.html b/src/main/resources/static/pages/work/newSubApply/contractorModuleList.html index 2ade1a1..058c247 100644 --- a/src/main/resources/static/pages/work/newSubApply/contractorModuleList.html +++ b/src/main/resources/static/pages/work/newSubApply/contractorModuleList.html @@ -63,6 +63,7 @@ {{# if((d.auditStatus === null || d.auditStatus === 'null' || d.auditStatus === '') && (d.proName !== null && d.proName !== 'null' && d.proName !== '')){ }} + | 编辑 {{# } }} {{# if((d.proName === null || d.proName === 'null' || d.proName === '') && (d.subStatus == '2')){ }}