Ver código fonte

单机性能分析排序接口修改

xieshengjie 3 anos atrás
pai
commit
68c75ace6b

+ 16 - 0
src/main/java/com/gyee/frame/model/auto/WindturbinegoodnessExample.java

@@ -30,6 +30,22 @@ public class WindturbinegoodnessExample {
      */
     protected List<Criteria> oredCriteria;
 
+    public String isAsc;
+
+    public void setIsAsc(String isAsc) {
+        this.isAsc = isAsc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbinegoodness
+     *
+     * @mbg.generated
+     */
+    public String getIsAsc() {
+        return isAsc;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table windturbinegoodness

+ 13 - 8
src/main/java/com/gyee/frame/service/goodness/WindturbinegoodnessService.java

@@ -48,17 +48,22 @@ public class WindturbinegoodnessService {
         {
             StringBuilder sb=new StringBuilder();
             sb.append(" ").append(tablepar.getOrderByColumn());
-            if(StringUtils.isNotEmpty(tablepar.getIsAsc()))
-            {
-                sb.append(" ").append(tablepar.getIsAsc());
-            }else
-            {
-                sb.append(" asc ");
-            }
+
             example.setOrderByClause(String.valueOf(sb));
         }else {
-            example.setOrderByClause("windturbineid ASC");
+            example.setOrderByClause("windturbineid");
+
         }
+        StringBuilder sb1=new StringBuilder();
+        if(StringUtils.isNotEmpty(tablepar.getIsAsc()))
+        {
+            sb1.append(" ").append(tablepar.getIsAsc());
+            example.setIsAsc(String.valueOf(sb1));
+        }else
+        {
+            example.setIsAsc("asc");
+        }
+
 
 
         PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());

+ 12 - 1
src/main/resources/mybatis/auto/WindturbinegoodnessMapper.xml

@@ -110,9 +110,20 @@
       <include refid="Example_Where_Clause" />
     </if>
     <if test="orderByClause != null">
-      order by ${orderByClause}
+      order by to_number(substr(${orderByClause},INSTR(${orderByClause},'_',-1)+1))
+--       order by ${orderByClause}
     </if>
+    <if test="isAsc != null">
+      <if test="isAsc.trim() == 'asc'">
+        asc
+      </if>
+      <if test="isAsc.trim() == 'desc'">
+        desc
+      </if>
+    </if>
+
   </select>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated