Forráskód Böngészése

统一修改检查表排序字段

wuhonghao 4 éve
szülő
commit
2073467b10

+ 6 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbBlq.java

@@ -151,4 +151,10 @@ public class BusJcbBlq extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
+    @ApiModelProperty(value = "要排序的列")
+    private String orderBy;
+
+    @ApiModelProperty(value = "1-ASC 正序排序,0-DESC 倒序排序")
+    private String isAsc;
+
 }

+ 6 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbDmcgyq.java

@@ -142,4 +142,10 @@ public class BusJcbDmcgyq extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
+    @ApiModelProperty(value = "要排序的列")
+    private String orderBy;
+
+    @ApiModelProperty(value = "1-ASC 正序排序,0-DESC 倒序排序")
+    private String isAsc;
+
 }

+ 6 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbFdfxjyq.java

@@ -194,4 +194,10 @@ public class BusJcbFdfxjyq extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
+    @ApiModelProperty(value = "要排序的列")
+    private String orderBy;
+
+    @ApiModelProperty(value = "1-ASC 正序排序,0-DESC 倒序排序")
+    private String isAsc;
+
 }

+ 6 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbGlkg.java

@@ -292,4 +292,10 @@ public class BusJcbGlkg extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
+    @ApiModelProperty(value = "要排序的列")
+    private String orderBy;
+
+    @ApiModelProperty(value = "1-ASC 正序排序,0-DESC 倒序排序")
+    private String isAsc;
+
 }

+ 6 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbJcxc.java

@@ -195,4 +195,10 @@ public class BusJcbJcxc extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
+    @ApiModelProperty(value = "要排序的列")
+    private String orderBy;
+
+    @ApiModelProperty(value = "1-ASC 正序排序,0-DESC 倒序排序")
+    private String isAsc;
+
 }

+ 6 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbWjcxc.java

@@ -158,4 +158,10 @@ public class BusJcbWjcxc extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
+    @ApiModelProperty(value = "要排序的列")
+    private String orderBy;
+
+    @ApiModelProperty(value = "1-ASC 正序排序,0-DESC 倒序排序")
+    private String isAsc;
+
 }

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

@@ -470,6 +470,17 @@
         and t.del_flag=#{delFlag}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
 

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

@@ -433,6 +433,17 @@
         and t.user_id=#{userId}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
 </mapper>

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

@@ -471,265 +471,276 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    a.id,
-    a.fdfxjyq_id,
+    t.id,
+    t.fdfxjyq_id,
     v.station_name,
-    a.pillar_code,
-    a.fdh,
-    a.temperature,
-    a.check_date,
-    a.pic_url,
-    a.point_a,
-    a.point_b,
-    a.point_c,
-    a.point_d,
-    a.point_e,
-    a.point_f,
-    a.point_g,
-    a.point_h,
-    a.fcd,
-    a.fddmpsd,
-    a.jybj_fdjyqzjyzt,
-    a.jybj_fdjyqzjyzt_desc,
-    a.jybj_clsjyzzt,
-    a.jybj_clsjyzzt_desc,
-    a.lbjzt_ls,
-    a.lbjzt_ls_desc,
-    a.lbjzt_xdx,
-    a.lbjzt_xdx_desc,
-    a.lbjzt_phzj,
-    a.lbjzt_phzj_desc,
-    a.lbjzt_jcxjt,
-    a.lbjzt_jcxjt_desc,
-    a.lbjzt_xhj,
-    a.lbjzt_xhj_desc,
-    a.sbzt,
-    a.sbzt_desc,
-    a.check_user,
-    a.confirm_user,
-    a.czwt,
-    a.create_by,
-    a.create_time,
-    a.update_by,
-    a.update_time,
-    a.submit_state,
-    a.del_flag,
-    a.xlfd_xlpd,
-    a.xlfd_wgdg,
-    a.xlfd_fdsxlqj,
-    a.xlfd_fdczxlqj,
-    a.sdgjczt_sddg,
-    a.sdgjczt_sddg_desc
+    t.pillar_code,
+    t.fdh,
+    t.temperature,
+    t.check_date,
+    t.pic_url,
+    t.point_a,
+    t.point_b,
+    t.point_c,
+    t.point_d,
+    t.point_e,
+    t.point_f,
+    t.point_g,
+    t.point_h,
+    t.fcd,
+    t.fddmpsd,
+    t.jybj_fdjyqzjyzt,
+    t.jybj_fdjyqzjyzt_desc,
+    t.jybj_clsjyzzt,
+    t.jybj_clsjyzzt_desc,
+    t.lbjzt_ls,
+    t.lbjzt_ls_desc,
+    t.lbjzt_xdx,
+    t.lbjzt_xdx_desc,
+    t.lbjzt_phzj,
+    t.lbjzt_phzj_desc,
+    t.lbjzt_jcxjt,
+    t.lbjzt_jcxjt_desc,
+    t.lbjzt_xhj,
+    t.lbjzt_xhj_desc,
+    t.sbzt,
+    t.sbzt_desc,
+    t.check_user,
+    t.confirm_user,
+    t.czwt,
+    t.create_by,
+    t.create_time,
+    t.update_by,
+    t.update_time,
+    t.submit_state,
+    t.del_flag,
+    t.xlfd_xlpd,
+    t.xlfd_wgdg,
+    t.xlfd_fdsxlqj,
+    t.xlfd_fdczxlqj,
+    t.sdgjczt_sddg,
+    t.sdgjczt_sddg_desc
     FROM
-    bus_jcb_fdfxjyq a
-    left join base_fdfxjyq b on a.fdfxjyq_id = b.id
+    bus_jcb_fdfxjyq t
+    left join base_fdfxjyq b on t.fdfxjyq_id = b.id
     LEFT JOIN v_station v on b.station_id = v.dept_station_id
-    where a.del_flag='0' and b.del_flag='0' and b.del_flag='0' and a.id = #{id}
+    where t.del_flag='0' and b.del_flag='0' and b.del_flag='0' and a.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    a.id,
-    a.fdfxjyq_id,
+    t.id,
+    t.fdfxjyq_id,
     v.station_name,
-    a.pillar_code,
-    a.fdh,
-    a.temperature,
-    a.check_date,
-    a.pic_url,
-    a.point_a,
-    a.point_b,
-    a.point_c,
-    a.point_d,
-    a.point_e,
-    a.point_f,
-    a.point_g,
-    a.point_h,
-    a.fcd,
-    a.fddmpsd,
-    a.jybj_fdjyqzjyzt,
-    a.jybj_fdjyqzjyzt_desc,
-    a.jybj_clsjyzzt,
-    a.jybj_clsjyzzt_desc,
-    a.lbjzt_ls,
-    a.lbjzt_ls_desc,
-    a.lbjzt_xdx,
-    a.lbjzt_xdx_desc,
-    a.lbjzt_phzj,
-    a.lbjzt_phzj_desc,
-    a.lbjzt_jcxjt,
-    a.lbjzt_jcxjt_desc,
-    a.lbjzt_xhj,
-    a.lbjzt_xhj_desc,
-    a.sbzt,
-    a.sbzt_desc,
-    a.check_user,
-    a.confirm_user,
-    a.czwt,
-    a.create_by,
-    a.create_time,
-    a.update_by,
-    a.update_time,
-    a.submit_state,
-    a.del_flag,
-    a.xlfd_xlpd,
-    a.xlfd_wgdg,
-    a.xlfd_fdsxlqj,
-    a.xlfd_fdczxlqj,
-    a.sdgjczt_sddg,
-    a.sdgjczt_sddg_desc
+    t.pillar_code,
+    t.fdh,
+    t.temperature,
+    t.check_date,
+    t.pic_url,
+    t.point_a,
+    t.point_b,
+    t.point_c,
+    t.point_d,
+    t.point_e,
+    t.point_f,
+    t.point_g,
+    t.point_h,
+    t.fcd,
+    t.fddmpsd,
+    t.jybj_fdjyqzjyzt,
+    t.jybj_fdjyqzjyzt_desc,
+    t.jybj_clsjyzzt,
+    t.jybj_clsjyzzt_desc,
+    t.lbjzt_ls,
+    t.lbjzt_ls_desc,
+    t.lbjzt_xdx,
+    t.lbjzt_xdx_desc,
+    t.lbjzt_phzj,
+    t.lbjzt_phzj_desc,
+    t.lbjzt_jcxjt,
+    t.lbjzt_jcxjt_desc,
+    t.lbjzt_xhj,
+    t.lbjzt_xhj_desc,
+    t.sbzt,
+    t.sbzt_desc,
+    t.check_user,
+    t.confirm_user,
+    t.czwt,
+    t.create_by,
+    t.create_time,
+    t.update_by,
+    t.update_time,
+    t.submit_state,
+    t.del_flag,
+    t.xlfd_xlpd,
+    t.xlfd_wgdg,
+    t.xlfd_fdsxlqj,
+    t.xlfd_fdczxlqj,
+    t.sdgjczt_sddg,
+    t.sdgjczt_sddg_desc
     FROM
-    bus_jcb_fdfxjyq a
-    left join base_fdfxjyq b on a.fdfxjyq_id = b.id
+    bus_jcb_fdfxjyq t
+    left join base_fdfxjyq b on t.fdfxjyq_id = b.id
     LEFT JOIN v_station v on b.station_id = v.dept_station_id
     <where>
-      and a.del_flag='0' and b.del_flag='0'
+      and t.del_flag='0' and b.del_flag='0'
       <if test="fdfxjyqId!=null and fdfxjyqId!=''">
-        and a.fdfxjyq_id=#{fdfxjyqId}
+        and t.fdfxjyq_id=#{fdfxjyqId}
       </if>
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
-        and a.pillar_code=#{pillarCode}
+        and t.pillar_code=#{pillarCode}
       </if>
       <if test="fdh!=null and fdh!=''">
-        and a.fdh=#{fdh}
+        and t.fdh=#{fdh}
       </if>
       <if test="temperature!=null and temperature!=''">
-        and a.temperature=#{temperature}
+        and t.temperature=#{temperature}
       </if>
       <if test="checkDate!=null and checkDate!=''">
-        and a.check_date=#{checkDate}
+        and t.check_date=#{checkDate}
       </if>
       <if test="picUrl!=null and picUrl!=''">
-        and a.pic_url=#{picUrl}
+        and t.pic_url=#{picUrl}
       </if>
       <if test="pointA!=null and pointA!=''">
-        and a.point_a=#{pointA}
+        and t.point_a=#{pointA}
       </if>
       <if test="pointB!=null and pointB!=''">
-        and a.point_b=#{pointB}
+        and t.point_b=#{pointB}
       </if>
       <if test="pointC!=null and pointC!=''">
-        and a.point_c=#{pointC}
+        and t.point_c=#{pointC}
       </if>
       <if test="pointD!=null and pointD!=''">
-        and a.point_d=#{pointD}
+        and t.point_d=#{pointD}
       </if>
       <if test="pointE!=null and pointE!=''">
-        and a.point_e=#{pointE}
+        and t.point_e=#{pointE}
       </if>
       <if test="pointF!=null and pointF!=''">
-        and a.point_f=#{pointF}
+        and t.point_f=#{pointF}
       </if>
       <if test="pointG!=null and pointG!=''">
-        and a.point_g=#{pointG}
+        and t.point_g=#{pointG}
       </if>
       <if test="pointH!=null and pointH!=''">
-        and a.point_h=#{pointH}
+        and t.point_h=#{pointH}
       </if>
       <if test="fcd!=null and fcd!=''">
-        and a.fcd=#{fcd}
+        and t.fcd=#{fcd}
       </if>
       <if test="fddmpsd!=null and fddmpsd!=''">
-        and a.fddmpsd=#{fddmpsd}
+        and t.fddmpsd=#{fddmpsd}
       </if>
       <if test="jybjFdjyqzjyzt!=null and jybjFdjyqzjyzt!=''">
-        and a.jybj_fdjyqzjyzt=#{jybjFdjyqzjyzt}
+        and t.jybj_fdjyqzjyzt=#{jybjFdjyqzjyzt}
       </if>
       <if test="jybjFdjyqzjyztDesc!=null and jybjFdjyqzjyztDesc!=''">
-        and a.jybj_fdjyqzjyzt_desc=#{jybjFdjyqzjyztDesc}
+        and t.jybj_fdjyqzjyzt_desc=#{jybjFdjyqzjyztDesc}
       </if>
       <if test="jybjClsjyzzt!=null and jybjClsjyzzt!=''">
-        and a.jybj_clsjyzzt=#{jybjClsjyzzt}
+        and t.jybj_clsjyzzt=#{jybjClsjyzzt}
       </if>
       <if test="jybjClsjyzztDesc!=null and jybjClsjyzztDesc!=''">
-        and a.jybj_clsjyzzt_desc=#{jybjClsjyzztDesc}
+        and t.jybj_clsjyzzt_desc=#{jybjClsjyzztDesc}
       </if>
       <if test="lbjztLs!=null and lbjztLs!=''">
-        and a.lbjzt_ls=#{lbjztLs}
+        and t.lbjzt_ls=#{lbjztLs}
       </if>
       <if test="lbjztLsDesc!=null and lbjztLsDesc!=''">
-        and a.lbjzt_ls_desc=#{lbjztLsDesc}
+        and t.lbjzt_ls_desc=#{lbjztLsDesc}
       </if>
       <if test="lbjztXdx!=null and lbjztXdx!=''">
-        and a.lbjzt_xdx=#{lbjztXdx}
+        and t.lbjzt_xdx=#{lbjztXdx}
       </if>
       <if test="lbjztXdxDesc!=null and lbjztXdxDesc!=''">
-        and a.lbjzt_xdx_desc=#{lbjztXdxDesc}
+        and t.lbjzt_xdx_desc=#{lbjztXdxDesc}
       </if>
       <if test="lbjztPhzj!=null and lbjztPhzj!=''">
-        and a.lbjzt_phzj=#{lbjztPhzj}
+        and t.lbjzt_phzj=#{lbjztPhzj}
       </if>
       <if test="lbjztPhzjDesc!=null and lbjztPhzjDesc!=''">
-        and a.lbjzt_phzj_desc=#{lbjztPhzjDesc}
+        and t.lbjzt_phzj_desc=#{lbjztPhzjDesc}
       </if>
       <if test="lbjztJcxjt!=null and lbjztJcxjt!=''">
-        and a.lbjzt_jcxjt=#{lbjztJcxjt}
+        and t.lbjzt_jcxjt=#{lbjztJcxjt}
       </if>
       <if test="lbjztJcxjtDesc!=null and lbjztJcxjtDesc!=''">
-        and a.lbjzt_jcxjt_desc=#{lbjztJcxjtDesc}
+        and t.lbjzt_jcxjt_desc=#{lbjztJcxjtDesc}
       </if>
       <if test="lbjztXhj!=null and lbjztXhj!=''">
-        and a.lbjzt_xhj=#{lbjztXhj}
+        and t.lbjzt_xhj=#{lbjztXhj}
       </if>
       <if test="lbjztXhjDesc!=null and lbjztXhjDesc!=''">
-        and a.lbjzt_xhj_desc=#{lbjztXhjDesc}
+        and t.lbjzt_xhj_desc=#{lbjztXhjDesc}
       </if>
       <if test="sbzt!=null and sbzt!=''">
-        and a.sbzt=#{sbzt}
+        and t.sbzt=#{sbzt}
       </if>
       <if test="sbztDesc!=null and sbztDesc!=''">
-        and a.sbzt_desc=#{sbztDesc}
+        and t.sbzt_desc=#{sbztDesc}
       </if>
       <if test="checkUser!=null and checkUser!=''">
-        and a.check_user=#{checkUser}
+        and t.check_user=#{checkUser}
       </if>
       <if test="confirmUser!=null and confirmUser!=''">
-        and a.confirm_user=#{confirmUser}
+        and t.confirm_user=#{confirmUser}
       </if>
       <if test="czwt!=null and czwt!=''">
-        and a.czwt=#{czwt}
+        and t.czwt=#{czwt}
       </if>
       <if test="createBy!=null and createBy!=''">
-        and a.create_by=#{createBy}
+        and t.create_by=#{createBy}
       </if>
       <if test="createTime!=null and createTime!=''">
-        and a.create_time=#{createTime}
+        and t.create_time=#{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
-        and a.update_by=#{updateBy}
+        and t.update_by=#{updateBy}
       </if>
       <if test="updateTime!=null and updateTime!=''">
-        and a.update_time=#{updateTime}
+        and t.update_time=#{updateTime}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and a.submit_state=#{submitState}
+        and t.submit_state=#{submitState}
       </if>
       <if test="delFlag!=null and delFlag!=''">
-        and a.del_flag=#{delFlag}
+        and t.del_flag=#{delFlag}
       </if>
       <if test="xlfdXlpd!=null and xlfdXlpd!=''">
-        and a.xlfd_xlpd=#{xlfdXlpd}
+        and t.xlfd_xlpd=#{xlfdXlpd}
       </if>
       <if test="xlfdWgdg!=null and xlfdWgdg!=''">
-        and a.xlfd_wgdg=#{xlfdWgdg}
+        and t.xlfd_wgdg=#{xlfdWgdg}
       </if>
       <if test="xlfdFdsxlqj!=null and xlfdFdsxlqj!=''">
-        and a.xlfd_fdsxlqj=#{xlfdFdsxlqj}
+        and t.xlfd_fdsxlqj=#{xlfdFdsxlqj}
       </if>
       <if test="xlfdFdczxlqj!=null and xlfdFdczxlqj!=''">
-        and a.xlfd_fdczxlqj=#{xlfdFdczxlqj}
+        and t.xlfd_fdczxlqj=#{xlfdFdczxlqj}
       </if>
       <if test="sdgjcztSddg!=null and sdgjcztSddg!=''">
-        and a.sdgjczt_sddg=#{sdgjcztSddg}
+        and t.sdgjczt_sddg=#{sdgjcztSddg}
       </if>
       <if test="sdgjcztSddgDesc!=null and sdgjcztSddgDesc!=''">
-        and a.sdgjczt_sddg_desc=#{sdgjcztSddgDesc}
+        and t.sdgjczt_sddg_desc=#{sdgjcztSddgDesc}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by a.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
   <select id="getLastOne" resultMap="BaseResultMap">

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

@@ -893,7 +893,17 @@
         and t.del_flag=#{delFlag}
       </if>
     </where>
-    order by str_to_date(t.check_date,'%Y-%m-%d') desc
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
   <select id="getLastOne" resultMap="BaseResultMap">

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

@@ -610,6 +610,17 @@
         and t.user_id=#{userId}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
 </mapper>

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

@@ -539,6 +539,17 @@
         and t.del_flag=#{delFlag}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
 </mapper>