BUG优化

src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java

@@ -60,8 +60,7 @@ public class MaintenanceController extends BaseController {
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));    //添加时间
         pd.put("ISDELETE", "0");    //是否删除(0:有效 1：删除)
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
-        pd.put("ARCHIVES_TYPE", "正常");    //档案状态
+        pd.put("ARCHIVES_TYPE", "0");    //档案状态
-
         maintenanceService.save(pd);
         map.put("pd", pd);
         map.put("result", errInfo);
@@ -157,6 +156,11 @@ public class MaintenanceController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
         List<PageData> varList = maintenanceService.list(page);    //列出Question列表
+        for (PageData operation : varList) {
+            if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
+                operation.put("ARCHIVES_TYPE", "2");
+            }
+        }
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/controller/operations/OperationsController.java

@@ -60,7 +60,7 @@ public class OperationsController extends BaseController {
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));    //添加时间
         pd.put("ISDELETE", "0");    //是否删除(0:有效 1：删除)
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
-        pd.put("ARCHIVES_TYPE", "正常");    //档案状态
+        pd.put("ARCHIVES_TYPE", "0");    //档案状态
         operationsService.save(pd);
         map.put("pd", pd);
         map.put("result", errInfo);
@@ -156,6 +156,11 @@ public class OperationsController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
         List<PageData> varList = operationsService.list(page);    //列出Question列表
+        for (PageData operation : varList) {
+            if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
+                operation.put("ARCHIVES_TYPE", "2");
+            }
+        }
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java

@@ -82,5 +82,7 @@ public interface FreightTrailerMapper {
     void editScrapStatus(PageData pd);
 
     PageData findByPlateNumber(PageData pd2);
+
+    PageData vehicle(PageData pd);
 }
 

src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java

@@ -82,5 +82,7 @@ public interface FreightTrailerService {
     void editScrapStatus(PageData pd);
 
     PageData findByPlateNumber(PageData pd2);
+
+    PageData vehicle(PageData pd);
 }
 

src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java

@@ -122,5 +122,10 @@ public class FreightTrailerServiceImpl implements FreightTrailerService {
     public PageData findByPlateNumber(PageData pd2) {
         return freightTrailerMapper.findByPlateNumber(pd2);
     }
+
+    @Override
+    public PageData vehicle(PageData pd) {
+        return freightTrailerMapper.vehicle(pd);
+    }
 }
 

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

@@ -57,6 +57,7 @@
         f.OPERATORNAME,
         f.OPERATTIME,
         f.AGE,
+        f.GENDER,
         f.EDUCATIONALLEVEL,
         f.DEPARTMENT,
         f.JOBTYPE,
@@ -111,6 +112,7 @@
         OPERATORNAME,
         OPERATTIME,
         AGE,
+        GENDER,
         EDUCATIONALLEVEL,
         DEPARTMENT,
         JOBTYPE,
@@ -165,6 +167,7 @@
         #{OPERATORNAME},
         #{OPERATTIME},
         #{AGE},
+        #{GENDER},
         #{EDUCATIONALLEVEL},
         #{DEPARTMENT},
         #{JOBTYPE},

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

@@ -160,6 +160,7 @@
         <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">
             and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
         </if>
+        ORDER BY c.OPERATTIME DESC
     </select>
 
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml

@@ -247,6 +247,19 @@
 		</if>
 	</select>
 
+	<!-- 货运挂车列表ALL -->
+	<select id="vehicle" parameterType="pd" resultType="pd">
+		select
+		bto.*,
+		btmf.*
+		from
+		v_traffic f
+		LEFT JOIN bus_traffic_operatingvehicle bto on bto.OPERATING_ID = f.ID
+		LEFT JOIN bus_traffic_mechanical_freighttrailer on btmf.FREIGHTTRAILER_ID = f.ID
+		where
+		f.ID = #{ID}
+	</select>
+
 	<select id="listOut" parameterType="pd" resultType="pd">
 		select
 		<include refid="Field2"></include>

src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml

@@ -51,7 +51,8 @@
         OPERATTIME,
         DELETEOR,
         DELETEORNAME,
-        DELETTIME
+        DELETTIME,
+        ARCHIVES_TYPE
     </sql>
 
     <!-- 字段值定义 -->
@@ -97,7 +98,8 @@
         #{OPERATTIME},
         #{DELETEOR},
         #{DELETEORNAME},
-        #{DELETTIME}
+        #{DELETTIME},
+        #{ARCHIVES_TYPE}
     </sql>
 
     <!-- 新增-->
@@ -148,7 +150,8 @@
         NOTES = #{NOTES},
         OPERATOR = #{OPERATOR},
         OPERATORNAME = #{OPERATORNAME},
-        OPERATTIME = #{OPERATTIME}
+        OPERATTIME = #{OPERATTIME},
+        ARCHIVES_TYPE = #{ARCHIVES_TYPE}
         where
         MAINTENANCE_ID = #{MAINTENANCE_ID}
     </update>
@@ -221,14 +224,16 @@
         select
         f.*,
         case when f.DUE_DATE &lt; NOW() then 0 else 1 end as DUE_DATE_TYPE,
-        v1.PLATE_NUMBER
+        v1.PLATE_NUMBER,
+        o.ISSCRAP AS OPEAR_ISSCRAP,
+        btmf.ISSCRAP AS FREIGHT_ISSCRAP
         from
         <include refid="tableName"></include>
         f
         INNER JOIN v_traffic v1 on f.VEHICLE = v1.ID
         LEFT JOIN BUS_TRAFFIC_OPERATINGVEHICLE o on o.OPERATING_ID = f.VEHICLE
         LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE
-        where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} AND (o.ISSCRAP = '0' OR btmf.ISSCRAP = '0')
+        where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
         <if test="pd.BASICINFO_LICENSE_PLATE != null and pd.BASICINFO_LICENSE_PLATE != ''">
             and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%')
         </if>

src/main/resources/mybatis/datasource/operations/OperationsMapper.xml

@@ -48,7 +48,8 @@
         OPERATTIME,
         DELETEOR,
         DELETEORNAME,
-        DELETTIME
+        DELETTIME,
+        ARCHIVES_TYPE
     </sql>
 
     <!-- 字段值 -->
@@ -91,7 +92,8 @@
         #{OPERATTIME},
         #{DELETEOR},
         #{DELETEORNAME},
-        #{DELETTIME}
+        #{DELETTIME},
+        #{ARCHIVES_TYPE}
     </sql>
 
 
@@ -140,6 +142,7 @@
         OPERATOR = #{OPERATOR},
         OPERATORNAME = #{OPERATORNAME},
         OPERATTIME = #{OPERATTIME}
+        ARCHIVES_TYPE = #{ARCHIVES_TYPE}
         where
         OPERATIONS_ID = #{OPERATIONS_ID}
     </update>
@@ -187,10 +190,11 @@
         f.OPERATTIME,
         f.DELETEOR,
         f.DELETEORNAME,
-        f.DELETTIME
+        f.DELETTIME,
+        v.PLATE_NUMBER
         from
-        <include refid="tableName"></include>
+        <include refid="tableName"></include> f
-        f
+        INNER JOIN v_traffic v on v.ID = f.VEHICLE
         where
         f.OPERATIONS_ID = #{OPERATIONS_ID}
     </select>
@@ -263,14 +267,16 @@
         f.*,
         case when f.DUE_DATE &lt; NOW() then 0 else 1 end as DUE_DATE_TYPE,
         v1.PLATE_NUMBER,
-        v1.TRAFFIC_TYPE
+        v1.TRAFFIC_TYPE,
+        o.ISSCRAP AS OPEAR_ISSCRAP,
+        btmf.ISSCRAP AS FREIGHT_ISSCRAP
         from
         <include refid="tableName"></include> f
         left join sys_dictionaries b on b.DICTIONARIES_ID=f.CYCLE AND b.PARENT_ID='8b7dea3977fd4360a3cc8112368b90ff'
         INNER JOIN v_traffic v1 on f.VEHICLE = v1.ID
         LEFT JOIN BUS_TRAFFIC_OPERATINGVEHICLE o on o.OPERATING_ID = f.VEHICLE
         LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE
-        WHERE f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} AND (o.ISSCRAP = '0' OR btmf.ISSCRAP = '0')
+        WHERE f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
         <if test="pd.BASICINFO_LICENSE_PLATE != null and pd.BASICINFO_LICENSE_PLATE != ''">
             and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%')
         </if>