三跨标识

This commit is contained in:
马三炮 2025-12-03 09:14:11 +08:00
parent 2cc801a32d
commit a9a2acc608
2 changed files with 2 additions and 5 deletions

View File

@ -998,7 +998,6 @@ public class JjBusinessService {
todayTaskVoIn.setStartDate(DateUtils.formatDate(new Date(),"yyyy-MM-dd"));
if (o.getWorkGx().contains("导地线展放") || o.getWorkGx().contains("紧线、挂线作业")|| o.getWorkGx().contains("附件安装")){
//对这个工程进行标识是三跨工程
XxlJobHelper.log("三级TodayTaskVo-->"+o);
TodayTaskVo todayTaskVoNew = new TodayTaskVo();
todayTaskVoNew.setSingleProjectCode(o.getSingleProjectCode());
todayTaskVoNew.setStartDate(DateUtils.formatDate(new Date(),"yyyy-MM-dd"));
@ -1053,7 +1052,7 @@ public class JjBusinessService {
}
}
log.error("执行项目三跨标识**********************end");
}catch (Exception e){
log.error(e.toString(),e);
XxlJobHelper.log(e);
@ -1083,7 +1082,6 @@ public class JjBusinessService {
todayTaskVoNew.setStartDate(DateUtils.formatDate(new Date(),"yyyy-MM-dd"));
//查看以前这个班组是否被标识
TodayTaskVo todayTaskNew= mapper.getTeamIdentify(todayTaskVoNew);
XxlJobHelper.log("today-->"+todayTaskNew);
todayTaskVoIn.setThreeSpan("");
todayTaskVoIn.setClassId(todayTaskVoOld.getClassId());
todayTaskVoIn.setStartDate(DateUtils.formatDate(new Date(),"yyyy-MM-dd"));
@ -1124,7 +1122,6 @@ public class JjBusinessService {
todayTaskVoIn.setStartDate(DateUtils.formatDate(new Date(),"yyyy-MM-dd"));
mapper.delClassMeetingSpan(todayTaskVoIn);
mapper.insertClassMeetingSpan(todayTaskVoIn);
mapper.insertTeamIdentify(todayTaskVoNew);
}
}
}

View File

@ -527,7 +527,7 @@
FROM jj_class_metting_info jcmi
LEFT JOIN jj_class_meetting jcm on jcmi.class_id = jcm.id
LEFT JOIN jj_class_metting_span jcms on jcms.class_id = jcm.id
WHERE jcmi.work_day = #{workDay} and (jcm.re_assessment_risk_level ='2' or jcm.re_assessment_risk_level ='3' and (jcms.three_span = '否'|| jcms.three_span is null))
WHERE jcmi.work_day = #{workDay} and (jcm.re_assessment_risk_level ='2' or (jcm.re_assessment_risk_level ='3' and (jcms.three_span = '否' OR jcms.three_span is null)))
</select>
<select id="getTeamIdentify" resultType="com.xxl.job.executor.inter.entity.TodayTaskVo">