wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

安全例会未开始会议状态不可进入优化

dev
WenShiJun 2024-03-29 18:05:45 +08:00
parent 4ea47ce16a
commit c89d0c08f9
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java
View File

@ -77,10 +77,18 @@ public class TrafficSafetyMeetingController extends BaseController {
pd.put("VIDEO_NAME",pd.getString("CREATORNAME")); pd.put("VIDEO_NAME",pd.getString("CREATORNAME"));
} }
String meetingDate = pd.getString("MEETING_DATE"); String meetingDate = pd.getString("MEETING_DATE");
String[] dates = meetingDate.split(","); String[] dates = meetingDate.split(",");
if (dates.length == 2){ if (dates.length == 2) {
pd.put("MEETING_DATE_START", dates[0].trim()); pd.put("MEETING_DATE_START", dates[0].trim());
pd.put("MEETING_DATE_END", dates[1].trim()); pd.put("MEETING_DATE_END", dates[1].trim());
Date now = new Date();
Date meetingStart = DateUtil.fomatDate(dates[0].trim());
Date meetingEnd = DateUtil.fomatDate(dates[1].trim());
// 判断会议状态并更新MEETING_STATUS
String status = meetingEnd.before(now) ? "2" : (meetingStart.after(now) ? "0" : "1");
pd.put("MEETING_STATUS", status);
} }
trafficSafetyMeetingService.save(pd); trafficSafetyMeetingService.save(pd);

5
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml
View File

@ -179,7 +179,10 @@
, REPLYDATE=#{REPLYDATE} , REPLYDATE=#{REPLYDATE}
</if> </if>
<if test="TYPE != null and TYPE != ''"> <if test="TYPE != null and TYPE != ''">
, `TYPE`=#{TYPE} , TYPE=#{TYPE}
</if>
<if test="REPLY != null and REPLY != ''">
, REPLY=#{REPLY}
</if> </if>
<if test="REPLYCONTENT != null and REPLYCONTENT != ''"> <if test="REPLYCONTENT != null and REPLYCONTENT != ''">
, REPLYCONTENT=#{REPLYCONTENT} , REPLYCONTENT=#{REPLYCONTENT}

18
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
View File

@ -211,24 +211,22 @@
s.PHONE, s.PHONE,
t.OPERATTIME as STARTTIME, t.OPERATTIME as STARTTIME,
p.OPERATTIME as STOPTIME, p.OPERATTIME as STOPTIME,
c.PLATE_NUMBER,
c.APPROVED_TOTAL_MASS,
c.APPROVED_LOAD_CAPACITY,
c.VIN,
b.LOCATIONNAME AS ORIGIN_NAME, b.LOCATIONNAME AS ORIGIN_NAME,
b2.LOCATIONNAME AS DESTINATION_NAME, b2.LOCATIONNAME AS DESTINATION_NAME,
m.CUSTOMERNAME AS CLIENT_NAME, m.CUSTOMERNAME AS CLIENT_NAME,
e.FRAMES_NUMBER AS VIN,
c2.CUSTOMERNAME AS CONFIRMER_NAME c2.CUSTOMERNAME AS CONFIRMER_NAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join bus_traffic_operatingvehicle e on f.TRANSPORTVEHICLE = e.PLATE_NUMBER
left join sys_user s on s.USER_ID = f.PRACTITIONER left join sys_user s on s.USER_ID = f.PRACTITIONER
left join bus_traffic_driving_sign t on t.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and t.CHECKTYPE_ID = 'status001' left join bus_traffic_driving_sign t on t.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and t.CHECKTYPE_ID = 'status001'
left join bus_traffic_driving_sign p on p.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and p.CHECKTYPE_ID = 'status003' left join bus_traffic_driving_sign p on p.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and p.CHECKTYPE_ID = 'status003'
left join bus_traffic_mechanical_freighttrailer c on c.FREIGHTTRAILER_ID = f.TRUCKCART left join bus_traffic_mechanical_freighttrailer c on c.FREIGHTTRAILER_ID = f.TRUCKCART
left join bus_traffic_location_management b on f.ORIGIN = b.LOCATIONNAME_ID left join bus_traffic_location_management b on f.ORIGIN = b.LOCATIONNAME_ID
left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONNAME_ID left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONNAME_ID
left join bus_traffic_customer_management m on f.CLIENT = m.CUSTOMERNAME_ID left join bus_traffic_customer_management m on f.CLIENT = m.CUSTOMERNAME_ID
left join bus_traffic_customer_management c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID left join bus_traffic_customer_management c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID
where where
f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID} f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}
</select> </select>