From a582236519afafb666431ea5bbf02d6c023ed321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E9=A3=8E?= <2452618307@qq.com> Date: Thu, 21 Mar 2024 09:34:20 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/New_SubCheckManageServiceImpl.java | 3 +- .../person/service/PersonAddServiceImpl.java | 41 ++++----- .../static/js/newCheck/datumPublic_new.js | 8 +- src/main/resources/static/js/publicJs.js | 89 ++++++++++++------- 4 files changed, 78 insertions(+), 63 deletions(-) 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 5c23515..e4add2a 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 @@ -396,12 +396,11 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService //开工申请 String checkStartFileId = publicBean.getCheckStartFileId(); + sbBean.setApplyCheckRemark(publicBean.getCheckStartRemark()); if(StringHelper.isNotEmpty(checkStartFileId)){ List StartCheckFile = dao.getFiles(checkStartFileId); sbBean.setApplyCheckFile(StartCheckFile); - sbBean.setApplyCheckRemark(publicBean.getCheckStartRemark()); } - //业主培训材料 String checkYzSafeFiled = publicBean.getYzSafeFiled(); if(StringHelper.isNotEmpty(checkYzSafeFiled)){ 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 cd39788..b44b97b 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 @@ -73,9 +73,9 @@ public class PersonAddServiceImpl implements PersonAddService { } } if("".equals(msg)){ + String processId = UUID.randomUUID().toString().replace("-",""); for (int i = 0; i < consNames.length; i++) { PersonAddBean vo = new PersonAddBean(); - String processId = UUID.randomUUID().toString().replace("-",""); vo.setConsName(consNames.length > 0 ? consNames[i] : ""); vo.setProName(proNames.length > 0 ? proNames[i] : ""); vo.setPersonName(personNames[i]); @@ -112,28 +112,25 @@ public class PersonAddServiceImpl implements PersonAddService { if(res < 1){ flag = false; } - ApprovalProcessBean b = new ApprovalProcessBean(); - b.setAuditId(processId); - b.setProjectId(proId); - b.setConsId(consId); - b.setAuditTypeId("2"); - ToBackBean backBean = service.addAuditProcess(b); - - MaterialBean bb = new MaterialBean(); - bb.setProjectId(proId); - bb.setContratorId(consId); - bb.setIdType("2");//承包商资质 - bb.setAuditStatus("0");//待审核 - bb.setProcessType("-1"); - bb.setAuditProcess(b.getAuditId()); - materialUploadService.addProgressChild(bb); - - if(backBean.getNum() == 1 && i == 0){ -// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); -// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); - System.out.println("=======================人员新增发送短信========================"); - } } + ApprovalProcessBean b = new ApprovalProcessBean(); + b.setAuditId(processId); + b.setProjectId(proId); + b.setConsId(consId); + b.setAuditTypeId("2"); + ToBackBean backBean = service.addAuditProcess(b); + + MaterialBean bb = new MaterialBean(); + bb.setProjectId(proId); + bb.setContratorId(consId); + bb.setIdType("2");//承包商资质 + bb.setAuditStatus("0");//待审核 + bb.setProcessType("-1"); + bb.setAuditProcess(b.getAuditId()); + materialUploadService.addProgressChild(bb); + +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); +// setPhoneMsg(backBean.getAuditNameId(), backBean.getMsg()); } if(flag && "".equals(msg)){ //新增分包商文件关联 diff --git a/src/main/resources/static/js/newCheck/datumPublic_new.js b/src/main/resources/static/js/newCheck/datumPublic_new.js index 91c550e..e3ad1dc 100644 --- a/src/main/resources/static/js/newCheck/datumPublic_new.js +++ b/src/main/resources/static/js/newCheck/datumPublic_new.js @@ -69,7 +69,7 @@ function selectOrgOwner() { var index = layer.open({ title: ["选择", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, - content: '../audit/ProFormZTree.html', + content: '../work/audit/ProFormZTree.html', area: ['60%', '75%'], maxmin: false, btn: ['选中','关闭'], @@ -125,7 +125,6 @@ function historyshow(){ function nextStep(num){ - //debugger; if(pageNow === pageMax){ upData(num,1); }else{ @@ -177,7 +176,6 @@ function upData(num,buttonType){ processType:checkData.processType, childId:checkData.childId }; - //debugger; var valueParam ={ consId: checkData.contractorId, proId: checkData.proId, @@ -307,7 +305,6 @@ function upData(num,buttonType){ }else{ layer.msg("if判断类型不对") } - debugger; console.log("params="+JSON.stringify(params)); //setHistoryData(params); thisParam = params; @@ -322,7 +319,6 @@ function upData(num,buttonType){ if (data.code == 200) { if(isHaveImage){ - debugger; $("#hideUpload2").trigger("click"); $("#hideUpload4").trigger("click"); $("#hideUpload6").trigger("click"); @@ -348,7 +344,6 @@ function upData(num,buttonType){ } } else { - debugger; layer.msg("后端异常"+data.msg); } }, @@ -413,7 +408,6 @@ function upData(num,buttonType){ dataType: "json",// 服务器返回数据类型 success: function (data) { if (data.code == 200) { - debugger; if(isHaveImage){ $("#hideUpload12").trigger("click"); $("#hideUpload21").trigger("click"); diff --git a/src/main/resources/static/js/publicJs.js b/src/main/resources/static/js/publicJs.js index fba1c29..fcc1b4d 100644 --- a/src/main/resources/static/js/publicJs.js +++ b/src/main/resources/static/js/publicJs.js @@ -8,22 +8,21 @@ 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/onlinePreview?url="; +var filePreviewPathAll = "http://192.168.0.14:8012/index?url="; // var filePreviewPathAll = "http://218.21.27.6:8012/onlinePreview?url="; function getContextPath() { var pathName = document.location.pathname; var index = pathName.substr(1).indexOf("/"); - var result = pathName.substr(0, index + 1); - return result; + return pathName.substr(0, index + 1); } var disphoto = ctxPath + '/statics/'; var filePath = ctxPath + '/statics'; function isNotEmpty(str) { - if (str != null && str != 'null' && str != '') { + if (str != null && str !== 'null' && str !== '') { return true; } else { return false; @@ -37,11 +36,7 @@ function openFileWindows(url) { } function isEmpty(str) { - if (str == null || str == 'null' || str == '') { - return true; - } else { - return false; - } + return str == null || str === 'null' || str === ''; } function choseType(str) { @@ -51,13 +46,9 @@ function choseType(str) { return true; } else if (str.indexOf("jpeg") > 0) { return true; - } else if (str.indexOf("gif") > 0) { - return true; - } else { - return false; - } + } else return str.indexOf("gif") > 0; -}; +} function getTypeImg(str) { if (str.toLowerCase().indexOf("xlsx") > 0 || str.toLowerCase().indexOf("xls") > 0) { @@ -164,12 +155,12 @@ function addSvg(svgId,addDivId) { } function getFirst(str) { - if(str ==null | str =='null' | str ==undefined | str=='undefined' | str.length<1){ + if(str ==null | str ==='null' | str === undefined | str ==='undefined' || str.length<1){ return; } var x = str.substring(0,1); var y = str.substring(1,str.length); - if(x == "/"){ + if(x === "/"){ // str.substring(1,str.length); console.log("str111=="+y) return y; @@ -284,10 +275,8 @@ function checkPsidno(value) } // 不能是2月30号、4月31号、5月32号出生的吧 const date = new Date(year, month, 0) // 获取当月的最后一天 - if (day < 1 || day > date.getDate()) { - return false - } - return true + return !(day < 1 || day > date.getDate()); + } // 4.18位号码校验生成的校验码 @@ -312,10 +301,8 @@ function checkPsidno(value) // 验证手机号码的正则 const phone_reg = function(num){ var num_reg = /^13[0-9]{1}[0-9]{8}$|15[0-9]{1}[0-9]{8}$|16[0-9]{1}[0-9]{8}$|18[0-9]{1}[0-9]{8}|17[0-9]{1}[0-9]{8}$|19[0-9]{1}[0-9]{8}$|14[0-9]{1}[0-9]{8}/; - if(!num_reg.test(num)){ - return false; - } - return true; + return num_reg.test(num); + } @@ -333,7 +320,7 @@ function changeDivHeightById(divId,num) { var height = $("#"+divId).outerHeight() var lineNum = Math.ceil(num/6); var ss = height*lineNum; - $("#"+divId).css("height", ss+"px"); + $('#'+divId).css("height", ss+"px"); } @@ -348,19 +335,57 @@ function changeDivHeightByIdAndLine(divId,num,lineNum,type) { if(num <= 0){ num =1; } - var height = 160; - if(type ==1){ - var lineNum = Math.ceil((num+1)/lineNum); + let lineNum1; + const height = 160; + if(type ===1){ + lineNum1 = Math.ceil((num+1)/lineNum); }else{ - var lineNum = Math.ceil(num/lineNum); + lineNum1 = Math.ceil(num/lineNum); } - var ss = height*lineNum; + const ss = height * lineNum1; $("#"+divId).css("height", ss+"px"); } -var provinces = { 11: "北京", 12: "天津", 13: "河北", 14: "山西", 15: "内蒙古", 21: "辽宁", 22: "吉林", 23: "黑龙江", 31: "上海", 32: "江苏", 33: "浙江", 34: "安徽", 35: "福建", 36: "江西", 37: "山东", 41: "河南", 42: "湖北", 43: "湖南", 44: "广东", 45: "广西", 46: "海南", 50: "重庆", 51: "四川", 52: "贵州", 53: "云南", 54: "西藏", 61: "陕西", 62: "甘肃", 63: "青海", 64: "宁夏", 65: "新疆", 71: "台湾", 81: "香港", 82: "澳门", 91: "国外" }; +const provinces = { + 11: "北京", + 12: "天津", + 13: "河北", + 14: "山西", + 15: "内蒙古", + 21: "辽宁", + 22: "吉林", + 23: "黑龙江", + 31: "上海", + 32: "江苏", + 33: "浙江", + 34: "安徽", + 35: "福建", + 36: "江西", + 37: "山东", + 41: "河南", + 42: "湖北", + 43: "湖南", + 44: "广东", + 45: "广西", + 46: "海南", + 50: "重庆", + 51: "四川", + 52: "贵州", + 53: "云南", + 54: "西藏", + 61: "陕西", + 62: "甘肃", + 63: "青海", + 64: "宁夏", + 65: "新疆", + 71: "台湾", + 81: "香港", + 82: "澳门", + 91: "国外" +}; + function getProvince(idNumber){ return provinces[parseInt(idNumber.substr(0, 2))]; } \ No newline at end of file