之前修改提交

ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java

@@ -27,6 +27,10 @@ public class TcYqzs extends BaseEntity
     @ApiModelProperty(value = "id")
     private Long id;
 
+    /** 是否正序 */
+    @ApiModelProperty(value = "是否正序 ,1或者null，2否")
+    private Long isOrthodox;
+
     /** 区域id */
 //,readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城"
     @Excel(name = "区域id")

ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.tcZz.mapper.TcYqzsMapper">
-    
+
     <resultMap type="TcYqzs" id="TcYqzsResult">
-        <result property="id"    column="id"    />
-        <result property="areaId"    column="area_id"    />
-        <result property="dateTime"    column="date_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="count1"    column="count1"    />
-        <result property="count2"    column="count2"    />
+        <result property="id" column="id"/>
+        <result property="areaId" column="area_id"/>
+        <result property="dateTime" column="date_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="count1" column="count1"/>
+        <result property="count2" column="count2"/>
     </resultMap>
 
     <sql id="selectTcYqzsVo">
-        select id, area_id, date_time, create_by, create_time, update_by, update_time, remark, count1, count2 from tc_yqzs
+        select id, area_id, date_time, create_by, create_time, update_by, update_time, remark, count1, count2 from
+        tc_yqzs
     </sql>
 
     <select id="selectTcYqzsList" parameterType="TcYqzs" resultMap="TcYqzsResult">
@@ -37,22 +38,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''">
                 and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}
             </if>
-            <if test="beginDateTime != null  and endDateTime != null "> and date_time between #{beginDateTime} and #{endDateTime}</if>
+            <if test="beginDateTime != null  and endDateTime != null ">and date_time between #{beginDateTime} and
+                #{endDateTime}
+            </if>
             <if test="beginDateTime != null">and date_time &gt;= #{beginDateTime}</if>
             <if test="endDateTime != null">and date_time &lt;= #{endDateTime}</if>
             <if test="remark != null  and remark != ''">and remark = #{remark}</if>
             <if test="count1 != null ">and count1 = #{count1}</if>
             <if test="count2 != null ">and count2 = #{count2}</if>
-            <if test="dateTime != null ">and date_time  like concat('%', #{dateTime}, '%')</if>
+            <if test="dateTime != null ">and date_time like concat('%', #{dateTime}, '%')</if>
         </where>
-        order by date_time asc
+        <if test="isOrthodox == 2 and isOrthodox != null">
+            order by date_time desc
+        </if>
+        <if test="isOrthodox == null">
+            order by date_time asc
+        </if>
+        <if test="isOrthodox == 1 and isOrthodox != null">
+            order by date_time asc
+        </if>
     </select>
-    
+
     <select id="selectTcYqzsById" parameterType="Long" resultMap="TcYqzsResult">
         <include refid="selectTcYqzsVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTcYqzs" parameterType="TcYqzs" useGeneratedKeys="true" keyProperty="id">
         insert into tc_yqzs
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -65,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
             <if test="count1 != null">count1,</if>
             <if test="count2 != null">count2,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="areaId != null">#{areaId},</if>
             <if test="dateTime != null">#{dateTime},</if>
@@ -76,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="count1 != null">#{count1},</if>
             <if test="count2 != null">#{count2},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTcYqzs" parameterType="TcYqzs">
@@ -101,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTcYqzsByIds" parameterType="String">
-        delete from tc_yqzs where id in 
+        delete from tc_yqzs where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>