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

承包商模块-开工申请,承包商出场申请,新增人员,新增工器具逻辑变更

This commit is contained in:
tqzhang 2024-02-21 15:43:34 +08:00
parent e8e90506c7
commit 50daddbfcb
11 changed files with 122 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/bonus/nxdt/energy/contractorPersonManage/beans/ConsPersonBean.java
View File

@ -146,5 +146,6 @@ public class ConsPersonBean {
private String fileId;
private String processId;
private String reUpload;
}

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

@ -55,7 +55,12 @@ public class NewconsServiceImpl implements NewconsService {
@Override
public int savebaseInfo(ConsPersonBean bean) {
String processId = UUID.randomUUID().toString().replace("-","");
String processId = "";
if ("true".equals(bean.getReUpload())){
processId = bean.getAuditProcess();
}else {
processId = UUID.randomUUID().toString().replace("-","");
}
bean.setProcessId(processId);
int cons=dao.savebaseInfo(bean);
if (cons > 0){
@ -118,7 +123,12 @@ public class NewconsServiceImpl implements NewconsService {
@Override
public int cbssavebaseInfo(ConsPersonBean bean) {
String processId = UUID.randomUUID().toString().replace("-","");
String processId = "";
if ("true".equals(bean.getReUpload())){
processId = bean.getAuditProcess();
}else {
processId = UUID.randomUUID().toString().replace("-","");
}
bean.setProcessId(processId);
int num = dao.cbssavebaseInfo(bean);
if (num > 0){

4
src/main/java/com/bonus/nxdt/energy/newcheck/dao/New_CheckManageDao.java
View File

@ -74,4 +74,8 @@ public interface New_CheckManageDao {
int updateProcessType(String childId,String processType);
int updateChildAuditStatus(String childId,String auditStatus);
void updatePersonStatus(String auditId, String isActive);
void updateToolsStatus(String auditId, String isActive);
}

7
src/main/java/com/bonus/nxdt/energy/newcheck/service/impl/New_SubCheckManageServiceImpl.java
View File

@ -1179,6 +1179,13 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService
//0待审核1未通过2已通过3审核中4在场5撤回
String sta = "通过";
if ("0".equals(o.getAuditResult())) {
if("新增人员审核".equals(o.getNewDataMsg())){
//修改is_active
checkManageDao.updatePersonStatus(o.getAuditId(),"0");
}
if ("新增设备审核".equals(o.getNewDataMsg())){
checkManageDao.updateToolsStatus(o.getAuditId(),"0");
}
sta = "未通过";
checkManageDao.updateChildAuditStatus(childId,"1");
checkManageDao.updateProcessType(childId,"-1");

5
src/main/resources/mappers/material/MaterialUploadMapper.xml
View File

@ -625,11 +625,8 @@
<!-- 以下为2024年审核流修改新增方法 -->
<insert id="addProgressChild" parameterType="com.bonus.nxdt.energy.material.entity.MaterialBean">
update audit_pross_child set is_active = '0' where pro_id=#{projectId} and cons_id=#{contratorId} and process_type = #{processType} and audit_status ='1';
insert into audit_pross_child(pro_id,cons_id,audit_process,audit_type,process_type,audit_status)
values (#{projectId},#{contratorId},#{auditProcess},#{idType},#{processType},#{auditStatus})
values (#{projectId},#{contratorId},#{auditProcess},#{idType},#{processType},#{auditStatus});
</insert>
</mapper>

6
src/main/resources/mappers/newcheck/NewCheckManageMapper.xml
View File

@ -435,6 +435,12 @@
<update id="updateChildAuditStatus" parameterType="string">
update audit_pross_child set audit_status = #{auditStatus} where id = #{childId}
</update>
<update id="updatePersonStatus">
update cons_person_qualifi set is_active = #{isActive} where check_process_id = #{auditId}
</update>
<update id="updateToolsStatus">
update security_apparatus set is_active = #{isActive} where process_id = #{auditId}
</update>
</mapper>

11
src/main/resources/static/js/work/newSub/cbsAppearApply.js
View File

@ -1,4 +1,6 @@
var status = localStorage.getItem("auditStatus");
var reUpload = localStorage.getItem("reUpload");
var auditProcess = localStorage.getItem("auditProcess");
var layer;
var fileNum =0;
var fileList = new Array(),fileListtUp = new Array();
@ -39,7 +41,7 @@ $(function(){
var upload = layui.upload;
layer = layui.layer;
form.render();
if (status != "10"){
if (reUpload == "true"){
getcbsPicList()
}
addDelete();
@ -264,12 +266,17 @@ function cbsBasesave() {
dataType: 'json', // 服务器返回数据类型
data: {'projectId':projectId,
'contratorId':contratorId,
'fileId':imgUuid
'fileId':imgUuid,
auditProcess:auditProcess,
reUpload : "true"
}, //获取提交的表单字段
success: function (data) {
var resMsg = data.resMsg;
if(resMsg=="发起成功"){
layer.msg('开工申请发起成功', {icon: 1, time: 2000});
localStorage.setItem("application_consApplyStatus", "0");
localStorage.setItem("reUpload","false");
localStorage.removeItem("auditStatus")
window.parent.location.reload();
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭

60
src/main/resources/static/js/work/newSub/contractorModuleList.js
View File

@ -22,36 +22,36 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
, {field: 'consName', align: 'center', title: '承包商名称'}
, {field: 'ifMaster', width: 170, align: 'center', title: '分包类别'}
, {field: 'createTime', width: 260, align: 'center', title: '发起时间'}
, {
field: 'auditStatus', width: 170, title: '审核状态', align: 'center', templet: d => {
let text = "";
if (d.auditStatus === "0") {
text = "<span style='color:orange;cursor: pointer;' >待审核</span>";
} else if (d.auditStatus === "1") {
text = "<span style='color:red;cursor: pointer;' >未通过</span>";
} else if (d.auditStatus === "2") {
text = "<span style='color:#70e070;cursor: pointer;' >已通过</span>";
} else if (d.auditStatus === "3") {
text = "<span style='color:#28b9b4;cursor: pointer;' >审核中</span>";
} else if (d.auditStatus === "4") {
text = "<span style='color:#19ffbe;cursor: pointer;' >在场</span>";
} else if (d.auditStatus === "5") {
text = "<span style='color:#949493;cursor: pointer;' >撤回</span>";
}else if (d.auditStatus === "6") {
text = "<span style='color:#949493;cursor: pointer;' >暂存</span>";
}
if (d.subStatus === "2"){
text = "<span style='color:red;cursor: pointer;' >分包审核未通过</span>";
}
if (d.startWorkStatus === "1"){
text = "<span style='color:red;cursor: pointer;' >开工申请未通过</span>";
}
if (d.consApplyStatus === "1"){
text = "<span style='color:red;cursor: pointer;' >承包商出场未通过</span>";
}
return text;
}
}
// , {
// field: 'auditStatus', width: 170, title: '审核状态', align: 'center', templet: d => {
// let text = "";
// if (d.auditStatus === "0") {
// text = "<span style='color:orange;cursor: pointer;' >待审核</span>";
// } else if (d.auditStatus === "1") {
// text = "<span style='color:red;cursor: pointer;' >未通过</span>";
// } else if (d.auditStatus === "2") {
// text = "<span style='color:#70e070;cursor: pointer;' >已通过</span>";
// } else if (d.auditStatus === "3") {
// text = "<span style='color:#28b9b4;cursor: pointer;' >审核中</span>";
// } else if (d.auditStatus === "4") {
// text = "<span style='color:#19ffbe;cursor: pointer;' >在场</span>";
// } else if (d.auditStatus === "5") {
// text = "<span style='color:#949493;cursor: pointer;' >撤回</span>";
// }else if (d.auditStatus === "6") {
// text = "<span style='color:#949493;cursor: pointer;' >暂存</span>";
// }
// if (d.subStatus === "2"){
// text = "<span style='color:red;cursor: pointer;' >分包审核未通过</span>";
// }
// if (d.startWorkStatus === "1"){
// text = "<span style='color:red;cursor: pointer;' >开工申请未通过</span>";
// }
// if (d.consApplyStatus === "1"){
// text = "<span style='color:red;cursor: pointer;' >承包商出场未通过</span>";
// }
// return text;
// }
// }
, {fixed: 'right', title: '操作', width: 300, align: 'center', toolbar: '#toolsBar'}
]]

43
src/main/resources/static/js/work/newSub/datumChecDetails_new.js
View File

@ -7,6 +7,7 @@ var startWorkStatus = localStorage.getItem("application_startWorkStatus");
var consApplyStatus = localStorage.getItem("application_consApplyStatus");
var ifMaster = localStorage.getItem("application_ifMaster");
localStorage.setItem("reUpload","false");
layui.use(['table', 'form', 'laydate', 'dropdown' ,'util'], function () {
var dropdown = layui.dropdown;
let table = layui.table;
@ -28,26 +29,33 @@ layui.use(['table', 'form', 'laydate', 'dropdown' ,'util'], function () {
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"){
$("#generalPackage_start_work_apply").css("display","none");
$("#subcontract_start_work_apply").css("display","none");
}
// 菜单点击事件
dropdown.on('click(demoMenu)', function(options){
if (options.title === '开工申请') {
openFrameTwo('开工申请', './startWorkApplication.html',"", consId, proId, startWorkStatus, proName, consName);
openFrameTwo('开工申请', './startWorkApplication.html',"", consId, proId, startWorkStatus, proName, consName,"");
}else{
if(startWorkStatus === "2"){
//根据 title 做出不同操作
if (options.title === '增加人员') {
openFrame('增加人员', './personAdd.html', consId, proId, proName, consName);
openFrame('增加人员', './personAdd.html', consId, proId, proName, consName,"");
} else if (options.title === '增加设备') {
openFrame('增加设备', './addEquipmentForm.html', consId, proId, proName, consName);
openFrame('增加设备', './addEquipmentForm.html', consId, proId, proName, consName,"");
} else if (options.title === '分包入场') {
openFrame('分包入场', './subAdmissionApplication.html', consId, proId, proName, consName);
openFrame('分包入场', './subAdmissionApplication.html', consId, proId, proName, consName,"");
} else if (options.title === '人员出场') {
openFrame('人员出场', './personExitSet.html', consId, proId, proName, consName);
openFrame('人员出场', './personExitSet.html', consId, proId, proName, consName,"");
} else if (options.title === '承包商出场') {
openFrameTwo('承包商出场', 'cbsAppearApply.html',ifMaster, consId, proId, consApplyStatus, proName, consName);
openFrameTwo('承包商出场', 'cbsAppearApply.html',ifMaster, consId, proId, consApplyStatus, proName, consName,"");
}else if (options.title === '人员出场延期申请'){
openFrame('人员出场延期申请', './deferExitApply.html', consId, proId, proName, consName);
openFrame('人员出场延期申请', './deferExitApply.html', consId, proId, proName, consName,"");
}
}else if (startWorkStatus === "10"){
layer.alert("未提交开工申请，不能进行操作");
@ -145,6 +153,9 @@ layui.use(['table', 'form', 'laydate', 'dropdown' ,'util'], function () {
case 'viewFlow':
viewFlow(obj.data);
break;
case 'reUpload':
reUpload(obj.data);
break;
default:
layer.msg("表格(table)工具条-意外的指令:" + obj.event);
}
@ -295,7 +306,16 @@ function viewFlow(data) {
}
function openFrame(title, contentUrl, consId, proId, proName, consName) {
function reUpload(data){
localStorage.setItem("reUpload", "true");
if(data.newDataMsg === "开工申请审核"){
openFrameTwo('开工申请重新上传', './startWorkApplication.html',"", consId, proId, startWorkStatus, proName, consName,data.auditProcess);
}else if(data.newDataMsg === "承包商出场审核"){
openFrameTwo('承包商出场重新上传', './cbsAppearApply.html',ifMaster, consId, proId, consApplyStatus, proName, consName,data.auditProcess);
}
}
function openFrame(title, contentUrl, consId, proId, proName, consName,auditProcess) {
localStorage.setItem("consId", consId);
localStorage.setItem("proId", proId);
if (proName === "null" || proName == null) {
@ -306,6 +326,7 @@ function openFrame(title, contentUrl, consId, proId, proName, consName) {
}
localStorage.setItem("proName", proName);
localStorage.setItem("consName", consName);
localStorage.setItem("auditProcess", auditProcess);
layerOpenForm(title,contentUrl,"");
}
@ -343,12 +364,14 @@ function layerOpenForm(title,contentUrl){
* @param consName
* @returns {*}
*/
function openFrameTwo(title, contentUrl,ifMaster, consId, proId, auditStatus, proName, consName) {
function openFrameTwo(title, contentUrl,ifMaster, consId, proId, auditStatus, proName, consName,auditr, ifMaster, auditProcess) {
localStorage.setItem("consId", consId);
localStorage.setItem("proId", proId);
localStorage.setItem("proName", proName);
localStorage.setItem("consName", consName);
localStorage.setItem("auditStatus", auditStatus);
localStorage.setItem("auditProcess", auditProcess);
//------------------------------------------------------------------
//------------------------------------------------------------------
//总包出场之前判断分包是否全部出场
var code = "success";

10
src/main/resources/static/js/work/newSub/startWorkApplication.js
View File

@ -1,5 +1,7 @@
var status = localStorage.getItem("auditStatus");
var auditStatus = localStorage.getItem("auditStatus");
var reUpload = localStorage.getItem("reUpload");
var auditProcess = localStorage.getItem("auditProcess");
var layer;
var fileNum = 0;
var fileList = new Array(), fileListtUp = new Array();
@ -35,7 +37,7 @@ $(function () {
var upload = layui.upload;
layer = layui.layer;
form.render();
if (status != "10") {
if (reUpload == "true") {
getPicList()
}
addDelete();
@ -384,13 +386,17 @@ function checkBasesave() {
'projectId': projectId,
'contratorId': contratorId,
'fileId': imgUuid,
'jypxFiled': imgUuid
'jypxFiled': imgUuid,
auditProcess:auditProcess,
reUpload : reUpload
}, //获取提交的表单字段
success: function (data) {
var resMsg = data.resMsg;
if (resMsg == "发起成功") {
layer.msg('开工申请发起成功', {icon: 1, time: 2000});
localStorage.setItem("application_startWorkStatus", "0");
localStorage.setItem("reUpload","false");
localStorage.removeItem("auditStatus")
window.parent.location.reload();
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭

19
src/main/resources/static/pages/work/newSubApply/datumCheckDetails.html
View File

@ -97,26 +97,25 @@
<ul id="generalPackage_ul">
<li><div class="layui-menu-body-title">增加人员</div></li>
<li><div class="layui-menu-body-title">增加设备</div></li>
<li><div class="layui-menu-body-title">开工申请</div></li>
<li id="generalPackage_start_work_apply"><div class="layui-menu-body-title" >
开工申请</div></li>
<li><div class="layui-menu-body-title">分包入场</div></li>
<li><div class="layui-menu-body-title">人员出场</div></li>
<li><div class="layui-menu-body-title">承包商出场</div></li>
<li id="generalPackage_cons_out_apply"><div class="layui-menu-body-title" >
承包商出场</div></li>
<li><div class="layui-menu-body-title">人员出场延期申请</div></li>
</ul>
<ul id="subcontract_ul" style="display: none">
<li><div class="layui-menu-body-title">增加人员</div></li>
<li><div class="layui-menu-body-title">增加设备</div></li>
<li><div class="layui-menu-body-title">开工申请</div></li>
<li id="subcontract_start_work_apply"><div class="layui-menu-body-title" >开工申请</div></li>
<li><div class="layui-menu-body-title">人员出场</div></li>
<li><div class="layui-menu-body-title">承包商出场</div></li>
<li id="subcontract_cons_out_apply"><div class="layui-menu-body-title" >承包商出场</div></li>
<li><div class="layui-menu-body-title">人员出场延期申请</div></li>
</ul>
</div>
</li>
</ul>
<!-- <button id="addButton" class="layui-btn layui-btn-sm">-->
<!-- 新增申请-->
<!-- </button>-->
</div>
</div>
@ -146,7 +145,10 @@
<script type="text/javascript" src="../../../js/work/newSub/datumChecDetails_new.js" defer="defer"></script>
<script type="text/html" id="barTable">
{{# if((d.newDataMsg == '开工申请审核' && d.auditStatus == 1) || (d.newDataMsg == '承包商出场审核' && d.auditStatus == 1)){ }}
<a lay-event="reUpload" style="color: #009688;font-size: 16px;cursor:pointer;">重新上传</a>
<span> | </span>
{{# } }}
{{# if(d.isCheck == '1' ){ }}
<a lay-event="check" style="color: #009688;font-size: 16px;cursor:pointer;">审核</a>
{{# } }}
@ -155,6 +157,7 @@
{{# } }}
<span> | </span>
<a lay-event="view" style="color: #009688;font-size: 16px;cursor:pointer;">审核流程</a>
<!-- <a class="layui-btn layui-btn-sm" lay-event="del">更多</a>-->
</script>