diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java index 7b5a785..bb7e4a2 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java @@ -77,10 +77,18 @@ public class TrafficSafetyMeetingController extends BaseController { pd.put("VIDEO_NAME",pd.getString("CREATORNAME")); } String meetingDate = pd.getString("MEETING_DATE"); - String[] dates = meetingDate.split(","); - if (dates.length == 2){ + String[] dates = meetingDate.split(","); + if (dates.length == 2) { pd.put("MEETING_DATE_START", dates[0].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); diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml index f6c968d..012be6e 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml @@ -179,7 +179,10 @@ , REPLYDATE=#{REPLYDATE} - , `TYPE`=#{TYPE} + , TYPE=#{TYPE} + + + , REPLY=#{REPLY} , REPLYCONTENT=#{REPLYCONTENT} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index 42e4938..c394ba8 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -211,24 +211,22 @@ s.PHONE, t.OPERATTIME as STARTTIME, p.OPERATTIME as STOPTIME, - c.PLATE_NUMBER, - c.APPROVED_TOTAL_MASS, - c.APPROVED_LOAD_CAPACITY, - c.VIN, b.LOCATIONNAME AS ORIGIN_NAME, b2.LOCATIONNAME AS DESTINATION_NAME, m.CUSTOMERNAME AS CLIENT_NAME, + e.FRAMES_NUMBER AS VIN, c2.CUSTOMERNAME AS CONFIRMER_NAME from 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 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_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 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 c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID + 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_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_customer_management m on f.CLIENT = m.CUSTOMERNAME_ID + left join bus_traffic_customer_management c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID where f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}