BUG优化 营运车辆和货运挂车的部门显示ID

事故的人员显示ID

src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java

@@ -217,7 +217,6 @@ public class OperatingVehiclesController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
         List<PageData> varList = operatingVehiclesService.list(page);    //列出Question列表
-
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);

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

@@ -361,10 +361,12 @@
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
         select
         <include refid="Field"></include>,
-        i.CORP_NAME
+        i.CORP_NAME,
+        su.NAME AS CASUALTYNAME
         from
         <include refid="tableName"></include> f
         left join bus_corp_info i on f.DEPARTMENT = i.CORPINFO_ID
+        LEFT JOIN sys_user su on su.USER_ID = f.USER_ID
         where
         f.ACCIDENTINVESTIGATION_ID = #{ACCIDENTINVESTIGATION_ID}
     </select>

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

@@ -216,10 +216,12 @@
 		f.CREATORNAME,
 		f.CREATTIME,
 		f.ISDELETE,
-		b.COMPANY_AREA
+		b.COMPANY_AREA,
+		dep.NAME AS DEPARTMENTNAME
 		from
 		<include refid="tableName"></include> f
 		inner join bus_corp_info b on f.CORPINFO_ID = b.CORPINFO_ID
+		LEFT JOIN oa_department dep ON dep.DEPARTMENT_ID = f.BELONGING_DEPT
 		where
 		f.FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}
 		AND

src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml

@@ -298,9 +298,11 @@
 	<!-- 通过ID获取数据 -->
 	<select id="findById" parameterType="pd" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,
+		dep.NAME AS DEPARTMENTNAME
 		from
 		<include refid="tableName"></include> f
+		LEFT JOIN oa_department dep on dep.DEPARTMENT_ID = f.BELONGING_DEPARTMENT
 		where
 		f.OPERATING_ID = #{OPERATING_ID} AND
 		f.ISDELETE = '0' AND
@@ -561,9 +563,11 @@
 	<!-- 列表(全部) -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,
+		dep.NAME AS DEPARTMENTNAME
 		from
 		<include refid="tableName"></include> f
+		inner join oa_department dep on dep.DEPARTMENT_ID = f.BELONGING_DEPARTMENT
 		where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
 		<if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''"><!-- 关键词检索 -->
 			and f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%')