查询填报数据排序

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/MeterReadingManualController.java

@@ -93,12 +93,12 @@ public class MeterReadingManualController extends BaseController {
             meterReadingManualService.deleteById(meterRec.getId());
             dbItem.setMeterReading(meterRec.getMeterReading());
             fillData(meterRec);
+            int count = meterReadingManualService.insert(meterRec);
+            return toAjax(count);
         }
         catch (BusinessException e) {
             return error(e.getMessage());
         }
-
-        return toAjax(meterReadingManualService.update(meterRec));
     }
 
     /**

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/vo/QueryMeterReading.java

@@ -35,6 +35,11 @@ public class QueryMeterReading {
     /** 结束月份 */
     private String endMonth;
 
+    /**
+     * 排序方式
+     */
+    private String orderFlag = "ASC";
+
     public String getAreaCode() {
         return areaCode;
     }
@@ -74,4 +79,12 @@ public class QueryMeterReading {
     public void setEndMonth(String endMonth) {
         this.endMonth = endMonth;
     }
+
+    public String getOrderFlag() {
+        return orderFlag;
+    }
+
+    public void setOrderFlag(String orderFlag) {
+        this.orderFlag = orderFlag;
+    }
 }

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/MeterReadingManualMapper.xml

@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startMonth != null  and startMonth != ''"> and meter_month &gt;= #{startMonth}</if>
             <if test="endMonth != null  and endMonth != ''"> and meter_month &lt;= #{endMonth}</if>
         </where>
+        ORDER BY meter_month ${orderFlag}
     </select>
 
     <insert id="insert" parameterType="com.ruoyi.ems.domain.MeterReadingManual" useGeneratedKeys="true" keyProperty="id">