@ -24,7 +24,7 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
@Select("<script>"+
"SELECT rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.DIKE_CODE as dikeCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime, "+
"df.dike_name as dikeName, df.river_location as riverLocation, gl.engineering_management_unit as engineeringManagementUnit, df.adcd_start as adcdStart, df.adcd_end as adcdEnd , fz.name as groupName, rw.remark,rw.FINISH_TIME as finishTime "+
"df.dike_name as dikeName, df.river_location as riverLocation, gl.engineering_management_unit as engineeringManagementUnit, df.adcd_start as adcdStart, df.adcd_end as adcdEnd , fz.name as groupName, if(rw.remark is null, '0', rw.remark) remark,rw.FINISH_TIME as finishTime "+
"FROM bs_sgc_df_bxgcrw rw "+
"LEFT JOIN bs_sgc_df_gcda df ON df.dike_code = rw.dike_code "+
"LEFT JOIN bs_sgc_df_gcgl gl ON gl.dike_code = rw.dike_code "+
@ -55,7 +55,12 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
"<if test='dto.state != null and dto.state != \"\"'>"+
"AND rw.state = #{dto.state} "+
"</if>"+
"ORDER BY rw.create_time asc"+
"<if test='dto.isOrder != null and dto.isOrder != \"\"'>"+
"ORDER BY CASE WHEN CAST(rw.remark AS UNSIGNED) = 100 THEN 1 ELSE 0 END, CAST(rw.remark AS UNSIGNED) DESC, rw.FINISH_TIME ASC "+
"</if>"+
"<if test='dto.isOrder == null or dto.isOrder == \"\"'>"+
@ -23,7 +24,7 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
@Select("<script>"+
"SELECT rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.WAGA_CODE as wagaCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime, "+
"df.waga_name as wagaName, gl.engineering_management_unit as engineeringManagementUnit, df.adcd as adcd, df.ENG_SCAL as engScal , df.waga_type as wagaType, fz.name as groupName, rw.remark ,rw.FINISH_TIME as finishTime "+
"df.waga_name as wagaName, gl.engineering_management_unit as engineeringManagementUnit, df.adcd as adcd, df.ENG_SCAL as engScal , df.waga_type as wagaType, fz.name as groupName, if(rw.remark is null, '0', rw.remark) remark ,rw.FINISH_TIME as finishTime "+
"FROM bs_sgc_sz_bxgcrw rw "+
"LEFT JOIN bs_sgc_sz_jbxx df ON df.waga_code = rw.waga_code "+
"LEFT JOIN bs_sgc_sz_gcgl gl ON rw.waga_code = gl.waga_code "+
@ -54,7 +55,12 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
"<if test='dto.state != null and dto.state != \"\"'>"+
"AND rw.state = #{dto.state} "+
"</if>"+
"ORDER BY rw.create_time asc"+
"<if test='dto.isOrder != null and dto.isOrder != \"\"'>"+
"ORDER BY CASE WHEN CAST(rw.remark AS UNSIGNED) = 100 THEN 1 ELSE 0 END, CAST(rw.remark AS UNSIGNED) DESC, rw.FINISH_TIME ASC "+
"</if>"+
"<if test='dto.isOrder == null or dto.isOrder == \"\"'>"+
huangrenya
1 year ago