bug修改
This commit is contained in:
parent
0ac813963a
commit
b44d4a645f
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -144,7 +144,6 @@ public class NewconsServiceImpl implements NewconsService {
|
|||
service.addAuditProcess(b);
|
||||
|
||||
|
||||
|
||||
MaterialBean bb = new MaterialBean();
|
||||
bb.setProjectId(bean.getProjectId());
|
||||
bb.setContratorId(bean.getContratorId());
|
||||
|
|
@ -168,31 +167,31 @@ 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;
|
||||
}
|
||||
|
||||
|
|
@ -275,7 +274,8 @@ public class NewconsServiceImpl implements NewconsService {
|
|||
}
|
||||
|
||||
private void setPhoneMsg(String phone, String msg) {
|
||||
String url = WorkConfig.getPhoneSendPhone();;
|
||||
String url = WorkConfig.getPhoneSendPhone();
|
||||
;
|
||||
String uri = url + "&mobile=" + phone + "&content=【宁夏电投】提醒您：" + msg;
|
||||
HttpRequest.post(uri).execute(false).body();
|
||||
// try {
|
||||
|
|
@ -286,5 +286,4 @@ public class NewconsServiceImpl implements NewconsService {
|
|||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@
|
|||
</insert>
|
||||
<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)
|
||||
values (#{proId},#{consId},#{equipmentName},#{number},#{uuid},#{createUser},'1','0',#{processId})
|
||||
values (#{proId},#{consId},#{equipmentName},#{number},#{fileId},#{createUser},'1','0',#{processId})
|
||||
</insert>
|
||||
<select id="getEquipCount" resultType="java.lang.Integer">
|
||||
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
|
||||
where cq.contrator_id = #{consId}
|
||||
</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 into pm_file_cons(cons_id,file_id)values(#{consId},'4')
|
||||
|
|
|
|||
|
|
@ -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-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 class="layui-input-inline"style="border: 0px dashed dimgrey;width: 70%;height: 160px;">';
|
||||
personHtml += ' <div class="layui-upload">';
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
<div id="exitApplyFile">
|
||||
<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%">
|
||||
<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 class="layui-input-inline" style="border: 0px dashed dimgrey;width: 74%;height: auto;">
|
||||
<div class="layui-upload">
|
||||
|
|
|
|||
Loading…
Reference in New Issue