高风险代码质量修复
This commit is contained in:
parent
6c14d5dddd
commit
e8e90506c7
|
|
@ -20,4 +20,13 @@ public class CheckSafeBean {
|
|||
|
||||
private List<CheckFileBean> safeFile;
|
||||
|
||||
//审核类型
|
||||
private String auditType;
|
||||
|
||||
//审核流程id
|
||||
private String auditProcess;
|
||||
|
||||
//点击样式 1审核 2查看
|
||||
private String clickType;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ public class HistoryBeans {
|
|||
private String auditType;
|
||||
private String fileType;
|
||||
private String jsonStr;
|
||||
private String auditProcess;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,4 +126,14 @@ public class SubDatumBean {
|
|||
|
||||
private String returnId;
|
||||
|
||||
//审核类型
|
||||
private String auditType;
|
||||
|
||||
//审核流程id
|
||||
private String auditProcess;
|
||||
|
||||
//点击样式 1审核 2查看
|
||||
private String clickType;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public interface New_CheckManageDao {
|
|||
|
||||
void updateConsPerson(CheckManageBean o);
|
||||
|
||||
void updateTool(CheckManageBean o);
|
||||
void updateTool(CheckManageBean o);
|
||||
|
||||
void updateConsPersonEntrance(CheckManageBean o);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,22 +3,18 @@ package com.bonus.nxdt.energy.newcheck.service.impl;
|
|||
import cn.hutool.http.HttpRequest;
|
||||
import com.bonus.nxdt.energy.basic.entity.AmProcessType;
|
||||
import com.bonus.nxdt.energy.basic.entity.R;
|
||||
import com.bonus.nxdt.energy.constrator.dao.CheckManageDao;
|
||||
import com.bonus.nxdt.energy.constrator.entity.CheckManageBean;
|
||||
import com.bonus.nxdt.energy.constrator.entity.MapBean;
|
||||
import com.bonus.nxdt.energy.manager.utils.DateTimeHelper;
|
||||
import com.bonus.nxdt.energy.manager.utils.StringHelper;
|
||||
import com.bonus.nxdt.energy.manager.utils.UserUtil;
|
||||
import com.bonus.nxdt.energy.manager.utils.WorkConfig;
|
||||
import com.bonus.nxdt.energy.newSubApply.dao.SubCheckManageDao;
|
||||
import com.bonus.nxdt.energy.newSubApply.entity.*;
|
||||
import com.bonus.nxdt.energy.newSubApply.service.SubCheckManageService;
|
||||
import com.bonus.nxdt.energy.newcheck.dao.New_CheckManageDao;
|
||||
import com.bonus.nxdt.energy.newcheck.dao.New_SubCheckManageDao;
|
||||
import com.bonus.nxdt.energy.newcheck.service.New_SubCheckManageService;
|
||||
import com.bonus.nxdt.energy.newcheck.service.New_SubTeamService;
|
||||
import com.bonus.nxdt.energy.subManage.beans.ContractorTeamBean;
|
||||
import com.bonus.nxdt.energy.subManage.service.SubTeamService;
|
||||
import com.bonus.nxdt.energy.util.excel.StringUtils;
|
||||
import com.google.gson.Gson;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
|
@ -77,7 +73,19 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService
|
|||
//1.1 判断是否已经通过或未通过
|
||||
if (!"1".equals(i.getAuditStatus()) && !"2".equals(i.getAuditStatus())) {
|
||||
//主流程未结束
|
||||
i.setJumpPage("3");
|
||||
if("1".equals(auditType) || "2".equals(auditType) || "3".equals(auditType)){
|
||||
i.setJumpPage("3");
|
||||
}
|
||||
|
||||
if("4".equals(auditType)){
|
||||
i.setJumpPage("4");
|
||||
}
|
||||
|
||||
if("6".equals(auditType)){
|
||||
i.setJumpPage("5");
|
||||
i.setJumpType("1");
|
||||
}
|
||||
|
||||
//1.2 判断是否是董事长
|
||||
isManager(phone, i);
|
||||
} else {
|
||||
|
|
@ -248,13 +256,16 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService
|
|||
//checkOtherRemark其他材料 checkOtherFileId 其他材料id
|
||||
subDatumBean.setContractorId(checkManageBean.getId());
|
||||
System.err.println("subDatumBean="+subDatumBean);
|
||||
|
||||
if(StringHelper.isEmpty(subDatumBean.getAuditProcess())){
|
||||
subDatumBean.setAuditProcess(checkManageBean.getAuditId());
|
||||
}
|
||||
SubDatumBean sbBean = HistoryDatum(subDatumBean);
|
||||
System.err.println("sbBean="+sbBean);
|
||||
System.err.println("checkManageBean="+checkManageBean);
|
||||
|
||||
CheckManageBean publicBean = new CheckManageBean();
|
||||
HistoryBeans b = new HistoryBeans();
|
||||
b.setAuditProcess(subDatumBean.getAuditProcess());
|
||||
CheckManageBean oldFileBean =dao.getAllFileIdById(subDatumBean.getProId(),subDatumBean.getContractorId(),checkManageBean.getJumpPage(),checkManageBean.getJumpType());
|
||||
//3资质审核 4开工申请 5 人员、承包商出场
|
||||
String jumpPage = subDatumBean.getJumpPage();
|
||||
|
|
@ -699,6 +710,11 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService
|
|||
subDatumBean.setFourFile(list1);
|
||||
subDatumBean.setCompanyFile(list2);
|
||||
subDatumBean.setOtherFile(list3);
|
||||
|
||||
|
||||
// String auditType = o.getAuditType();
|
||||
// String auditProcess = o.getAuditProcess();
|
||||
|
||||
//查询人员和工器具
|
||||
List<CheckPersonBean> checkPersonBeans = dao.getPersonList(o);
|
||||
boolean isNewPerson = true;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
,is_active = '0',return_id = #{returnId}
|
||||
</if>
|
||||
,check_process_id = #{auditId}
|
||||
where contrator_id = #{id} and is_active = '1' and check_process_status in('0','3')
|
||||
where contrator_id = #{id} and is_active = '1' and check_process_status in('0','3') and check_process_id = #{auditId}
|
||||
</update>
|
||||
|
||||
<update id="updateTool">
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
,is_active = '0',return_id = #{returnId}
|
||||
</if>
|
||||
,process_id = #{auditId}
|
||||
where contrator_id = #{id} and is_active = '1' and audit_status in('0','3')
|
||||
where contrator_id = #{id} and is_active = '1' and audit_status in('0','3') and process_id = #{auditId}
|
||||
</update>
|
||||
|
||||
<update id="updateStartWork">
|
||||
|
|
|
|||
|
|
@ -163,7 +163,13 @@
|
|||
cpq.contrator_id = #{contractorId}
|
||||
and (cpq.appera_status != '2' OR cpq.appera_status is null)
|
||||
and is_active ='1'
|
||||
ORDER BY
|
||||
<if test="clickType == 1 or clickType =='1'">
|
||||
<if test="auditType ==2 or auditType =='2'">
|
||||
and (cpq.check_process_id = #{auditProcess} or cpq.check_process_status ='2')
|
||||
</if>
|
||||
</if>
|
||||
|
||||
ORDER BY
|
||||
CASE cpq.check_process_status
|
||||
WHEN '0' then 1
|
||||
WHEN '3' then 2
|
||||
|
|
@ -240,9 +246,9 @@ SELECT
|
|||
|
||||
<insert id="setHistoryData" parameterType="com.bonus.nxdt.energy.newSubApply.entity.HistoryBeans">
|
||||
insert into pm_history_audit (
|
||||
project_id,cons_id,user_id,audit_type,json_str,file_type
|
||||
project_id,cons_id,user_id,audit_type,json_str,file_type,audit_process
|
||||
) values (
|
||||
#{projectId},#{consId},#{userId},#{auditType},#{jsonStr},#{fileType}
|
||||
#{projectId},#{consId},#{userId},#{auditType},#{jsonStr},#{fileType},#{auditProcess}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
|
@ -258,6 +264,12 @@ SELECT
|
|||
WHERE
|
||||
sa.contrator_id = #{contractorId}
|
||||
and is_active = '1'
|
||||
<if test="clickType == 1 or clickType =='1'">
|
||||
<if test="auditType ==3 or auditType =='3'">
|
||||
and (sa.process_id = #{auditProcess} or sa.audit_status ='2')
|
||||
</if>
|
||||
</if>
|
||||
|
||||
ORDER BY
|
||||
CASE sa.audit_status
|
||||
WHEN '0' then 1
|
||||
|
|
|
|||
|
|
@ -509,12 +509,15 @@ function initData() {
|
|||
$.ajax({
|
||||
type: "POST",
|
||||
async: false, // 默认异步true,false表示同步
|
||||
url: ctxPath + "/subCheckManage/getDatum",
|
||||
url: ctxPath + "/new_subCheckManage/getDatum",
|
||||
data: {
|
||||
'jumpPage':checkData.jumpPage,
|
||||
'jumpType':checkData.jumpType,
|
||||
'contractorId': checkData.contractorId,
|
||||
'proId': checkData.proId,
|
||||
'auditType':checkData.auditType,
|
||||
'auditProcess': checkData.auditProcess,
|
||||
'clickType':'1'
|
||||
}, //获取提交的表单字段
|
||||
dataType: "json",// 服务器返回数据类型
|
||||
success: function (data) {
|
||||
|
|
|
|||
|
|
@ -164,7 +164,8 @@ function check(data) {
|
|||
'jumpType': data.jumpType,
|
||||
'isManger': data.isManger,
|
||||
'processType':data.processType,
|
||||
'childId':data.childId
|
||||
'childId':data.childId,
|
||||
'auditType':data.auditType
|
||||
}
|
||||
});
|
||||
let page = 'datumCheckForm3_new.html';
|
||||
|
|
|
|||
|
|
@ -182,7 +182,11 @@ function upData(num,buttonType){
|
|||
consId: checkData.contractorId,
|
||||
proId: checkData.proId,
|
||||
jumpType: jumpType,
|
||||
jumpPage: num
|
||||
jumpPage: num,
|
||||
processType:checkData.processType,
|
||||
childId:checkData.childId,
|
||||
auditId: checkData.auditProcess
|
||||
|
||||
};
|
||||
//审批流数据
|
||||
let processType = checkData.processType;
|
||||
|
|
@ -303,6 +307,7 @@ function upData(num,buttonType){
|
|||
}else{
|
||||
layer.msg("if判断类型不对")
|
||||
}
|
||||
debugger;
|
||||
console.log("params="+JSON.stringify(params));
|
||||
//setHistoryData(params);
|
||||
thisParam = params;
|
||||
|
|
|
|||
Loading…
Reference in New Issue