diff --git a/src/main/java/com/bonus/nxdt/energy/newSubApply/dao/NewsConsDao.java b/src/main/java/com/bonus/nxdt/energy/newSubApply/dao/NewsConsDao.java index de12a1c..f055949 100644 --- a/src/main/java/com/bonus/nxdt/energy/newSubApply/dao/NewsConsDao.java +++ b/src/main/java/com/bonus/nxdt/energy/newSubApply/dao/NewsConsDao.java @@ -63,4 +63,11 @@ public interface NewsConsDao { String getConsNameByConsId(String consId); SubEntranceBean getConsAndPro(SubEntranceBean bean); + + /** + * 查询是否存在同一批的auditId + * @param bean SubEntranceBean + * @return int + */ + int getIsExistChild(SubEntranceBean bean); } 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 a337c5f..0d8ad57 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 @@ -56,14 +56,14 @@ public class NewconsServiceImpl implements NewconsService { @Override public int savebaseInfo(ConsPersonBean bean) { String processId = ""; - if ("true".equals(bean.getReUpload())){ + if ("true".equals(bean.getReUpload())) { processId = bean.getAuditProcess(); - }else { - processId = UUID.randomUUID().toString().replace("-",""); + } else { + processId = UUID.randomUUID().toString().replace("-", ""); } bean.setProcessId(processId); - int cons=dao.savebaseInfo(bean); - if (cons > 0){ + int cons = dao.savebaseInfo(bean); + if (cons > 0) { ApprovalProcessBean b = new ApprovalProcessBean(); b.setAuditId(processId); b.setProjectId(bean.getProjectId()); @@ -81,9 +81,9 @@ public class NewconsServiceImpl implements NewconsService { bb.setAuditStatus("0"); bb.setProcessType("-1"); bb.setAuditProcess(processId); - if("true".equals(bean.getReUpload())) { + if ("true".equals(bean.getReUpload())) { materialUploadService.updateProgressChild(bb); - }else { + } else { materialUploadService.addProgressChild(bb); } } @@ -91,16 +91,16 @@ public class NewconsServiceImpl implements NewconsService { } @Override - public NewsConsBean getListOneById(String consId,String proId) { - return dao.consId(consId,proId); + public NewsConsBean getListOneById(String consId, String proId) { + return dao.consId(consId, proId); } @Override public int SubEntranceBean(SubEntranceBean bean) { - String processId = UUID.randomUUID().toString().replace("-",""); + String processId = UUID.randomUUID().toString().replace("-", ""); bean.setProcessId(processId); int num = dao.SubEntranceBean(bean); - if (num > 0){ + if (num > 0) { ApprovalProcessBean b = new ApprovalProcessBean(); b.setAuditId(processId); b.setProjectId(bean.getProId()); @@ -128,14 +128,14 @@ public class NewconsServiceImpl implements NewconsService { @Override public int cbssavebaseInfo(ConsPersonBean bean) { String processId = ""; - if ("true".equals(bean.getReUpload())){ + if ("true".equals(bean.getReUpload())) { processId = bean.getAuditProcess(); - }else { - processId = UUID.randomUUID().toString().replace("-",""); + } else { + processId = UUID.randomUUID().toString().replace("-", ""); } bean.setProcessId(processId); int num = dao.cbssavebaseInfo(bean); - if (num > 0){ + if (num > 0) { ApprovalProcessBean b = new ApprovalProcessBean(); b.setAuditId(processId); b.setProjectId(bean.getProjectId()); @@ -144,7 +144,6 @@ public class NewconsServiceImpl implements NewconsService { service.addAuditProcess(b); - MaterialBean bb = new MaterialBean(); bb.setProjectId(bean.getProjectId()); bb.setContratorId(bean.getContratorId()); @@ -152,9 +151,9 @@ public class NewconsServiceImpl implements NewconsService { bb.setAuditStatus("0");//待审核 bb.setProcessType("-1"); bb.setAuditProcess(processId); - if("true".equals(bean.getReUpload())) { + if ("true".equals(bean.getReUpload())) { materialUploadService.updateProgressChild(bb); - }else { + } else { materialUploadService.addProgressChild(bb); } @@ -168,43 +167,43 @@ public class NewconsServiceImpl implements NewconsService { if (equipCount == 0) { dao.insertEquipFileCons(bean.getConsId()); } - - String processId = UUID.randomUUID().toString().replace("-",""); - bean.setProcessId(processId); + bean.setProcessId(bean.getUuid()); int num = dao.uploadEquipBasicInfo(bean); - if (num > 0){ + int code = dao.getIsExistChild(bean); + if (code == 0) { + MaterialBean bb = new MaterialBean(); ApprovalProcessBean b = new ApprovalProcessBean(); - b.setAuditId(processId); + b.setAuditId(bean.getUuid()); b.setProjectId(bean.getProId()); b.setConsId(bean.getConsId()); 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()); - System.out.println("=======================设备新增发送短信========================"); - } - MaterialBean bb = new MaterialBean(); bb.setProjectId(bean.getProId()); bb.setContratorId(bean.getConsId()); bb.setIdType("3");//工器具 bb.setAuditStatus("0");//待审核 bb.setProcessType("-1"); - bb.setAuditProcess(b.getAuditId()); + bb.setAuditProcess(bean.getUuid()); materialUploadService.addProgressChild(bb); + if (backBean.getNum() == 1 && "1".equals(bean.getNum())) { +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); + System.out.println("=======================设备新增发送短信========================"); + } } + return num; } @Override public int recallConsById(SubEntranceBean bean) { int num = dao.recallConsById(bean); - if(num == 1){ + if (num == 1) { String name = dao.getConName(bean); bean.setDeptId(UserUtil.getLoginUser().getOrgId()); - bean.setUuid(UUID.randomUUID().toString().replaceAll("-","")); + bean.setUuid(UUID.randomUUID().toString().replaceAll("-", "")); bean.setNameId(UserUtil.getLoginUser().getId().toString()); - bean.setMessage("【提示信息】 "+name+"撤回入场材料成功"); + bean.setMessage("【提示信息】 " + name + "撤回入场材料成功"); dao.insertAps(bean); dao.insertMessageTabeles(bean); } @@ -223,11 +222,11 @@ public class NewconsServiceImpl implements NewconsService { @Override public int updateSub(SubEntranceBean bean) { - String processId = UUID.randomUUID().toString().replace("-",""); + String processId = UUID.randomUUID().toString().replace("-", ""); bean.setProcessId(processId); SubEntranceBean nameBean = dao.getConsAndPro(bean); int num = dao.updateSub(bean); - if (num > 0){ + if (num > 0) { ApprovalProcessBean b = new ApprovalProcessBean(); b.setAuditId(processId); b.setProjectId(nameBean.getProId()); @@ -244,20 +243,20 @@ public class NewconsServiceImpl implements NewconsService { String proId = dao.getProIdByConsId(bean.getConsId()); String consName = dao.getConsNameByConsId(b.getIfMaster()); int num = dao.updateSubStatus(bean); - b.setMessageTitle(consName+"-分包入场-审核流转信息"); + b.setMessageTitle(consName + "-分包入场-审核流转信息"); SubEntranceBean auditBean = dao.getAuditIdByConsName(b); - if (num == 1){ - if ("2".equals(bean.getSubStatus())){ - bean.setMessage("【提示信息】 "+ b.getConsName() + "-(分包)入场失败,请对相关信息进行修改"); + if (num == 1) { + if ("2".equals(bean.getSubStatus())) { + bean.setMessage("【提示信息】 " + b.getConsName() + "-(分包)入场失败,请对相关信息进行修改"); bean.setAuditResult("0"); auditBean.setAuditResult("0"); - }else { + } else { bean.setAuditResult("1"); auditBean.setAuditResult("1"); - bean.setMessage("【提示信息】 "+ b.getConsName() + "-(分包)入场成功"); + bean.setMessage("【提示信息】 " + b.getConsName() + "-(分包)入场成功"); } bean.setProId(proId); - bean.setUuid(UUID.randomUUID().toString().replaceAll("-","")); + bean.setUuid(UUID.randomUUID().toString().replaceAll("-", "")); //获取部门ID String duptId = UserUtil.getLoginUser().getOrgId(); bean.setDeptId(duptId); @@ -274,9 +273,10 @@ public class NewconsServiceImpl implements NewconsService { return dao.isAllSubOut(consId); } - private void setPhoneMsg(String phone,String msg){ - String url = WorkConfig.getPhoneSendPhone();; - String uri = url+"&mobile="+ phone + "&content=【宁夏电投】提醒您：" + msg; + private void setPhoneMsg(String phone, String msg) { + String url = WorkConfig.getPhoneSendPhone(); + ; + String uri = url + "&mobile=" + phone + "&content=【宁夏电投】提醒您：" + msg; HttpRequest.post(uri).execute(false).body(); // try { // Thread.sleep(5000); @@ -286,5 +286,4 @@ public class NewconsServiceImpl implements NewconsService { } - } diff --git a/src/main/resources/mappers/newSubApply/newConsMapper.xml b/src/main/resources/mappers/newSubApply/newConsMapper.xml index 46bad08..0ea376a 100644 --- a/src/main/resources/mappers/newSubApply/newConsMapper.xml +++ b/src/main/resources/mappers/newSubApply/newConsMapper.xml @@ -104,7 +104,7 @@ insert into security_apparatus(project_id,contrator_id,securiity_name,num,equip_file_id,create_user,is_active,audit_status,process_id) - values (#{proId},#{consId},#{equipmentName},#{number},#{uuid},#{createUser},'1','0',#{processId}) + values (#{proId},#{consId},#{equipmentName},#{number},#{fileId},#{createUser},'1','0',#{processId}) + insert into pm_file_cons(cons_id,file_id)values(#{consId},'4') diff --git a/src/main/resources/static/js/newCheck/datumCheckForm5_new.js b/src/main/resources/static/js/newCheck/datumCheckForm5_new.js index 87efa56..9d498bf 100644 --- a/src/main/resources/static/js/newCheck/datumCheckForm5_new.js +++ b/src/main/resources/static/js/newCheck/datumCheckForm5_new.js @@ -673,7 +673,7 @@ function personExit(data){ personHtml += '
'; personHtml += '
'; - personHtml += ' '; + personHtml += ' '; personHtml += '
'; personHtml += '
'; personHtml += '
'; diff --git a/src/main/resources/static/js/publicJs.js b/src/main/resources/static/js/publicJs.js index fcc1b4d..d155d06 100644 --- a/src/main/resources/static/js/publicJs.js +++ b/src/main/resources/static/js/publicJs.js @@ -8,7 +8,7 @@ var dataPath = "http://192.168.0.14:1930/nxnyback"; var lookFile = "http://192.168.0.14:1930/nxnyback/statics"; //文件路径 //kk file 测试环境地址 -var filePreviewPathAll = "http://192.168.0.14:8012/index?url="; +var filePreviewPathAll = "http://192.168.0.14:8012/onlinePreview?url="; // var filePreviewPathAll = "http://218.21.27.6:8012/onlinePreview?url="; diff --git a/src/main/resources/static/js/work/newSub/addEquipmentForm.js b/src/main/resources/static/js/work/newSub/addEquipmentForm.js index afc19db..08b5616 100644 --- a/src/main/resources/static/js/work/newSub/addEquipmentForm.js +++ b/src/main/resources/static/js/work/newSub/addEquipmentForm.js @@ -13,7 +13,7 @@ var consName = localStorage.getItem("consName"); var uploadNum = 0; var fileNum =0; var fileList = new Array(); - +var childProcessId = uuid2(32,16); var isUploadNum = 1; var startWorkFiles = {}; @@ -151,7 +151,8 @@ function uploadEquipBasicInfo(num,uuid) { data: { 'proId':proId, 'consId':consId, - 'uuid':uuid, + 'uuid':childProcessId, + 'fileId':uuid, 'equipmentName':$("#equipmentName_"+num+"").val(), 'number':$("#number_"+num+"").val(), 'num' : num diff --git a/src/main/resources/static/pages/work/newSubApply/cbsAppearApply.html b/src/main/resources/static/pages/work/newSubApply/cbsAppearApply.html index da0a8a1..fab13af 100644 --- a/src/main/resources/static/pages/work/newSubApply/cbsAppearApply.html +++ b/src/main/resources/static/pages/work/newSubApply/cbsAppearApply.html @@ -34,7 +34,7 @@
- +