【CHG】增加返回记录ID

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebRecordVo.java

@@ -16,6 +16,9 @@ public class JcebRecordVo implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
+
   @ApiModelProperty(value = "所属部门")
   private String deptName;
 

railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml

@@ -512,19 +512,20 @@
   </select>
 
   <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="check_date" property="operationDate"/>
-    <result column="operator" property="operator"/>
+    <result column="check_user" property="operator"/>
     <result column="jcebType" property="jcebType"/>
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT v.dept_name, v.station_name, t.check_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
     FROM bus_jcb_blq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
@@ -550,7 +551,7 @@
     FROM bus_jcb_blq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbDmcgyqMapper.xml

@@ -458,19 +458,20 @@
   </select>
 
   <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="check_date" property="operationDate"/>
-    <result column="operator" property="operator"/>
+    <result column="check_user" property="operator"/>
     <result column="jcebType" property="jcebType"/>
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT v.dept_name, v.station_name, t.check_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
     FROM bus_jcb_dmcgyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
@@ -496,7 +497,7 @@
     FROM bus_jcb_dmcgyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbFdfxjyqMapper.xml

@@ -675,19 +675,20 @@
   </select>
 
   <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="check_date" property="operationDate"/>
-    <result column="operator" property="operator"/>
+    <result column="check_user" property="operator"/>
     <result column="jcebType" property="jcebType"/>
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT v.dept_name, v.station_name, t.check_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
     FROM bus_jcb_fdfxjyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
@@ -713,7 +714,7 @@
     FROM bus_jcb_fdfxjyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -931,19 +931,20 @@
   </select>
 
   <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="check_date" property="operationDate"/>
-    <result column="operator" property="operator"/>
+    <result column="check_user" property="operator"/>
     <result column="jcebType" property="jcebType"/>
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT v.dept_name, v.station_name, t.check_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
     FROM bus_jcb_glkg t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
@@ -969,7 +970,7 @@
     FROM bus_jcb_glkg t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbJcxcMapper.xml

@@ -635,19 +635,20 @@
   </select>
 
   <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="check_date" property="operationDate"/>
-    <result column="operator" property="operator"/>
+    <result column="check_user" property="operator"/>
     <result column="jcebType" property="jcebType"/>
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT v.dept_name, v.station_name, t.check_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
     FROM bus_jcb_jcxc t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
@@ -673,7 +674,7 @@
     FROM bus_jcb_jcxc t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbWjcxcMapper.xml

@@ -564,19 +564,20 @@
   </select>
 
   <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="check_date" property="operationDate"/>
-    <result column="operator" property="operator"/>
+    <result column="check_user" property="operator"/>
     <result column="jcebType" property="jcebType"/>
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT v.dept_name, v.station_name, t.check_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
     FROM bus_jcb_wjcxc t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
@@ -602,7 +603,7 @@
     FROM bus_jcb_wjcxc t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml

@@ -369,6 +369,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -377,7 +378,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_gjsfx t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebJddzMapper.xml

@@ -287,6 +287,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -295,7 +296,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_jddz t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebJyzqsjlMapper.xml

@@ -256,6 +256,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -264,7 +265,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_jyzqsjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebLbjghjlMapper.xml

@@ -293,6 +293,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -301,7 +302,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_lbjghjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebQmjcjlMapper.xml

@@ -333,6 +333,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -341,7 +342,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_qmjcjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebXsjcjlMapper.xml

@@ -317,6 +317,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -325,7 +326,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_xsjcjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>