liux
/
nx_dx_one_manager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
tqzhang 2024-03-27 09:10:12 +08:00
parent 0ac813963a
commit b44d4a645f
7 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/bonus/nxdt/energy/newSubApply/dao/NewsConsDao.java
View File

@ -63,4 +63,11 @@ public interface NewsConsDao {
String getConsNameByConsId(String consId); String getConsNameByConsId(String consId);
SubEntranceBean getConsAndPro(SubEntranceBean bean); SubEntranceBean getConsAndPro(SubEntranceBean bean);
/**
* 查询是否存在同一批的auditId
* @param bean SubEntranceBean
* @return int
*/
int getIsExistChild(SubEntranceBean bean);
} }

91
src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/NewconsServiceImpl.java
View File

@ -56,14 +56,14 @@ public class NewconsServiceImpl implements NewconsService {
@Override @Override
public int savebaseInfo(ConsPersonBean bean) { public int savebaseInfo(ConsPersonBean bean) {
String processId = ""; String processId = "";
if ("true".equals(bean.getReUpload())){ if ("true".equals(bean.getReUpload())) {
processId = bean.getAuditProcess(); processId = bean.getAuditProcess();
}else { } else {
processId = UUID.randomUUID().toString().replace("-",""); processId = UUID.randomUUID().toString().replace("-", "");
} }
bean.setProcessId(processId); bean.setProcessId(processId);
int cons=dao.savebaseInfo(bean); int cons = dao.savebaseInfo(bean);
if (cons > 0){ if (cons > 0) {
ApprovalProcessBean b = new ApprovalProcessBean(); ApprovalProcessBean b = new ApprovalProcessBean();
b.setAuditId(processId); b.setAuditId(processId);
b.setProjectId(bean.getProjectId()); b.setProjectId(bean.getProjectId());
@ -81,9 +81,9 @@ public class NewconsServiceImpl implements NewconsService {
bb.setAuditStatus("0"); bb.setAuditStatus("0");
bb.setProcessType("-1"); bb.setProcessType("-1");
bb.setAuditProcess(processId); bb.setAuditProcess(processId);
if("true".equals(bean.getReUpload())) { if ("true".equals(bean.getReUpload())) {
materialUploadService.updateProgressChild(bb); materialUploadService.updateProgressChild(bb);
}else { } else {
materialUploadService.addProgressChild(bb); materialUploadService.addProgressChild(bb);
} }
} }
@ -91,16 +91,16 @@ public class NewconsServiceImpl implements NewconsService {
} }
@Override @Override
public NewsConsBean getListOneById(String consId,String proId) { public NewsConsBean getListOneById(String consId, String proId) {
return dao.consId(consId,proId); return dao.consId(consId, proId);
} }
@Override @Override
public int SubEntranceBean(SubEntranceBean bean) { public int SubEntranceBean(SubEntranceBean bean) {
String processId = UUID.randomUUID().toString().replace("-",""); String processId = UUID.randomUUID().toString().replace("-", "");
bean.setProcessId(processId); bean.setProcessId(processId);
int num = dao.SubEntranceBean(bean); int num = dao.SubEntranceBean(bean);
if (num > 0){ if (num > 0) {
ApprovalProcessBean b = new ApprovalProcessBean(); ApprovalProcessBean b = new ApprovalProcessBean();
b.setAuditId(processId); b.setAuditId(processId);
b.setProjectId(bean.getProId()); b.setProjectId(bean.getProId());
@ -128,14 +128,14 @@ public class NewconsServiceImpl implements NewconsService {
@Override @Override
public int cbssavebaseInfo(ConsPersonBean bean) { public int cbssavebaseInfo(ConsPersonBean bean) {
String processId = ""; String processId = "";
if ("true".equals(bean.getReUpload())){ if ("true".equals(bean.getReUpload())) {
processId = bean.getAuditProcess(); processId = bean.getAuditProcess();
}else { } else {
processId = UUID.randomUUID().toString().replace("-",""); processId = UUID.randomUUID().toString().replace("-", "");
} }
bean.setProcessId(processId); bean.setProcessId(processId);
int num = dao.cbssavebaseInfo(bean); int num = dao.cbssavebaseInfo(bean);
if (num > 0){ if (num > 0) {
ApprovalProcessBean b = new ApprovalProcessBean(); ApprovalProcessBean b = new ApprovalProcessBean();
b.setAuditId(processId); b.setAuditId(processId);
b.setProjectId(bean.getProjectId()); b.setProjectId(bean.getProjectId());
@ -144,7 +144,6 @@ public class NewconsServiceImpl implements NewconsService {
service.addAuditProcess(b); service.addAuditProcess(b);
MaterialBean bb = new MaterialBean(); MaterialBean bb = new MaterialBean();
bb.setProjectId(bean.getProjectId()); bb.setProjectId(bean.getProjectId());
bb.setContratorId(bean.getContratorId()); bb.setContratorId(bean.getContratorId());
@ -152,9 +151,9 @@ public class NewconsServiceImpl implements NewconsService {
bb.setAuditStatus("0");//待审核 bb.setAuditStatus("0");//待审核
bb.setProcessType("-1"); bb.setProcessType("-1");
bb.setAuditProcess(processId); bb.setAuditProcess(processId);
if("true".equals(bean.getReUpload())) { if ("true".equals(bean.getReUpload())) {
materialUploadService.updateProgressChild(bb); materialUploadService.updateProgressChild(bb);
}else { } else {
materialUploadService.addProgressChild(bb); materialUploadService.addProgressChild(bb);
} }
@ -168,43 +167,43 @@ public class NewconsServiceImpl implements NewconsService {
if (equipCount == 0) { if (equipCount == 0) {
dao.insertEquipFileCons(bean.getConsId()); dao.insertEquipFileCons(bean.getConsId());
} }
bean.setProcessId(bean.getUuid());
String processId = UUID.randomUUID().toString().replace("-","");
bean.setProcessId(processId);
int num = dao.uploadEquipBasicInfo(bean); int num = dao.uploadEquipBasicInfo(bean);
if (num > 0){ int code = dao.getIsExistChild(bean);
if (code == 0) {
MaterialBean bb = new MaterialBean();
ApprovalProcessBean b = new ApprovalProcessBean(); ApprovalProcessBean b = new ApprovalProcessBean();
b.setAuditId(processId); b.setAuditId(bean.getUuid());
b.setProjectId(bean.getProId()); b.setProjectId(bean.getProId());
b.setConsId(bean.getConsId()); b.setConsId(bean.getConsId());
b.setAuditTypeId("3"); b.setAuditTypeId("3");
ToBackBean backBean = service.addAuditProcess(b); 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.setProjectId(bean.getProId());
bb.setContratorId(bean.getConsId()); bb.setContratorId(bean.getConsId());
bb.setIdType("3");//工器具 bb.setIdType("3");//工器具
bb.setAuditStatus("0");//待审核 bb.setAuditStatus("0");//待审核
bb.setProcessType("-1"); bb.setProcessType("-1");
bb.setAuditProcess(b.getAuditId()); bb.setAuditProcess(bean.getUuid());
materialUploadService.addProgressChild(bb); 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; return num;
} }
@Override @Override
public int recallConsById(SubEntranceBean bean) { public int recallConsById(SubEntranceBean bean) {
int num = dao.recallConsById(bean); int num = dao.recallConsById(bean);
if(num == 1){ if (num == 1) {
String name = dao.getConName(bean); String name = dao.getConName(bean);
bean.setDeptId(UserUtil.getLoginUser().getOrgId()); bean.setDeptId(UserUtil.getLoginUser().getOrgId());
bean.setUuid(UUID.randomUUID().toString().replaceAll("-","")); bean.setUuid(UUID.randomUUID().toString().replaceAll("-", ""));
bean.setNameId(UserUtil.getLoginUser().getId().toString()); bean.setNameId(UserUtil.getLoginUser().getId().toString());
bean.setMessage("【提示信息】 "+name+"撤回入场材料成功"); bean.setMessage("【提示信息】 " + name + "撤回入场材料成功");
dao.insertAps(bean); dao.insertAps(bean);
dao.insertMessageTabeles(bean); dao.insertMessageTabeles(bean);
} }
@ -223,11 +222,11 @@ public class NewconsServiceImpl implements NewconsService {
@Override @Override
public int updateSub(SubEntranceBean bean) { public int updateSub(SubEntranceBean bean) {
String processId = UUID.randomUUID().toString().replace("-",""); String processId = UUID.randomUUID().toString().replace("-", "");
bean.setProcessId(processId); bean.setProcessId(processId);
SubEntranceBean nameBean = dao.getConsAndPro(bean); SubEntranceBean nameBean = dao.getConsAndPro(bean);
int num = dao.updateSub(bean); int num = dao.updateSub(bean);
if (num > 0){ if (num > 0) {
ApprovalProcessBean b = new ApprovalProcessBean(); ApprovalProcessBean b = new ApprovalProcessBean();
b.setAuditId(processId); b.setAuditId(processId);
b.setProjectId(nameBean.getProId()); b.setProjectId(nameBean.getProId());
@ -244,20 +243,20 @@ public class NewconsServiceImpl implements NewconsService {
String proId = dao.getProIdByConsId(bean.getConsId()); String proId = dao.getProIdByConsId(bean.getConsId());
String consName = dao.getConsNameByConsId(b.getIfMaster()); String consName = dao.getConsNameByConsId(b.getIfMaster());
int num = dao.updateSubStatus(bean); int num = dao.updateSubStatus(bean);
b.setMessageTitle(consName+"-分包入场-审核流转信息"); b.setMessageTitle(consName + "-分包入场-审核流转信息");
SubEntranceBean auditBean = dao.getAuditIdByConsName(b); SubEntranceBean auditBean = dao.getAuditIdByConsName(b);
if (num == 1){ if (num == 1) {
if ("2".equals(bean.getSubStatus())){ if ("2".equals(bean.getSubStatus())) {
bean.setMessage("【提示信息】 "+ b.getConsName() + "-(分包)入场失败,请对相关信息进行修改"); bean.setMessage("【提示信息】 " + b.getConsName() + "-(分包)入场失败,请对相关信息进行修改");
bean.setAuditResult("0"); bean.setAuditResult("0");
auditBean.setAuditResult("0"); auditBean.setAuditResult("0");
}else { } else {
bean.setAuditResult("1"); bean.setAuditResult("1");
auditBean.setAuditResult("1"); auditBean.setAuditResult("1");
bean.setMessage("【提示信息】 "+ b.getConsName() + "-(分包)入场成功"); bean.setMessage("【提示信息】 " + b.getConsName() + "-(分包)入场成功");
} }
bean.setProId(proId); bean.setProId(proId);
bean.setUuid(UUID.randomUUID().toString().replaceAll("-","")); bean.setUuid(UUID.randomUUID().toString().replaceAll("-", ""));
//获取部门ID //获取部门ID
String duptId = UserUtil.getLoginUser().getOrgId(); String duptId = UserUtil.getLoginUser().getOrgId();
bean.setDeptId(duptId); bean.setDeptId(duptId);
@ -274,9 +273,10 @@ public class NewconsServiceImpl implements NewconsService {
return dao.isAllSubOut(consId); return dao.isAllSubOut(consId);
} }
private void setPhoneMsg(String phone,String msg){ private void setPhoneMsg(String phone, String msg) {
String url = WorkConfig.getPhoneSendPhone();; String url = WorkConfig.getPhoneSendPhone();
String uri = url+"&mobile="+ phone + "&content=【宁夏电投】提醒您：" + msg; ;
String uri = url + "&mobile=" + phone + "&content=【宁夏电投】提醒您：" + msg;
HttpRequest.post(uri).execute(false).body(); HttpRequest.post(uri).execute(false).body();
// try { // try {
// Thread.sleep(5000); // Thread.sleep(5000);
@ -286,5 +286,4 @@ public class NewconsServiceImpl implements NewconsService {
} }
} }

7
src/main/resources/mappers/newSubApply/newConsMapper.xml
View File

@ -104,7 +104,7 @@
</insert> </insert>
<insert id="uploadEquipBasicInfo"> <insert id="uploadEquipBasicInfo">
insert into security_apparatus(project_id,contrator_id,securiity_name,num,equip_file_id,create_user,is_active,audit_status,process_id) 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> </insert>
<select id="getEquipCount" resultType="java.lang.Integer"> <select id="getEquipCount" resultType="java.lang.Integer">
select count(1) from pm_file_cons where cons_id = #{consId} and file_id = '4' select count(1) from pm_file_cons where cons_id = #{consId} and file_id = '4'
@ -155,6 +155,11 @@
left join contractor_qualication cqq on cq.if_master = cqq.contrator_id left join contractor_qualication cqq on cq.if_master = cqq.contrator_id
where cq.contrator_id = #{consId} where cq.contrator_id = #{consId}
</select> </select>
<select id="getIsExistChild" resultType="java.lang.Integer">
select count(1)
FROM audit_pross_child
WHERE cons_id = #{consId} and audit_process = #{uuid} and is_active = '1'
</select>
<insert id="insertEquipFileCons"> <insert id="insertEquipFileCons">
insert into pm_file_cons(cons_id,file_id)values(#{consId},'4') insert into pm_file_cons(cons_id,file_id)values(#{consId},'4')

2
src/main/resources/static/js/newCheck/datumCheckForm5_new.js
View File

@ -673,7 +673,7 @@ function personExit(data){
personHtml += ' <div class="layui-form-item upfile" id="'+reccImg+'" style="margin-top: 2%;height: 160px;border: 0px solid red">'; personHtml += ' <div class="layui-form-item upfile" id="'+reccImg+'" style="margin-top: 2%;height: 160px;border: 0px solid red">';
personHtml += ' <div class="layui-input-inline" style="">'; personHtml += ' <div class="layui-input-inline" style="">';
personHtml += ' <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i>出场文件：</label>'; personHtml += ' <label class="layui-form-label">出场文件：</label>';
personHtml += ' </div>'; personHtml += ' </div>';
personHtml += ' <div class="layui-input-inline"style="border: 0px dashed dimgrey;width: 70%;height: 160px;">'; personHtml += ' <div class="layui-input-inline"style="border: 0px dashed dimgrey;width: 70%;height: 160px;">';
personHtml += ' <div class="layui-upload">'; personHtml += ' <div class="layui-upload">';

2
src/main/resources/static/js/publicJs.js
View File

@ -8,7 +8,7 @@ var dataPath = "http://192.168.0.14:1930/nxnyback";
var lookFile = "http://192.168.0.14:1930/nxnyback/statics"; //文件路径 var lookFile = "http://192.168.0.14:1930/nxnyback/statics"; //文件路径
//kk file 测试环境地址 //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="; // var filePreviewPathAll = "http://218.21.27.6:8012/onlinePreview?url=";

5
src/main/resources/static/js/work/newSub/addEquipmentForm.js
View File

@ -13,7 +13,7 @@ var consName = localStorage.getItem("consName");
var uploadNum = 0; var uploadNum = 0;
var fileNum =0; var fileNum =0;
var fileList = new Array(); var fileList = new Array();
var childProcessId = uuid2(32,16);
var isUploadNum = 1; var isUploadNum = 1;
var startWorkFiles = {}; var startWorkFiles = {};
@ -151,7 +151,8 @@ function uploadEquipBasicInfo(num,uuid) {
data: { data: {
'proId':proId, 'proId':proId,
'consId':consId, 'consId':consId,
'uuid':uuid, 'uuid':childProcessId,
'fileId':uuid,
'equipmentName':$("#equipmentName_"+num+"").val(), 'equipmentName':$("#equipmentName_"+num+"").val(),
'number':$("#number_"+num+"").val(), 'number':$("#number_"+num+"").val(),
'num' : num 'num' : num

2
src/main/resources/static/pages/work/newSubApply/cbsAppearApply.html
View File

@ -34,7 +34,7 @@
<div id="exitApplyFile"> <div id="exitApplyFile">
<div class="layui-form-item upfile" id="ccsqdImg" style="margin-left: 5%;height: auto;border: 0px solid red"> <div class="layui-form-item upfile" id="ccsqdImg" style="margin-left: 5%;height: auto;border: 0px solid red">
<div class="layui-input-inline" style="margin-top: 2%"> <div class="layui-input-inline" style="margin-top: 2%">
<label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i>出场申请单上传：</label> <label class="layui-form-label">出场申请单上传：</label>
</div> </div>
<div class="layui-input-inline" style="border: 0px dashed dimgrey;width: 74%;height: auto;"> <div class="layui-input-inline" style="border: 0px dashed dimgrey;width: 74%;height: auto;">
<div class="layui-upload"> <div class="layui-upload">