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

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java

@@ -81,6 +81,14 @@ public class TrafficSafetyMeetingController extends BaseController {
         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);
 

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml

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

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml

@@ -211,16 +211,14 @@
         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
         <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 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'