阀控记录导出

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayControlRecordController.java

@@ -59,7 +59,7 @@ public class PayControlRecordController {
                 payControlRecordDto.setResult(new Integer(result));
             }
             if(StringUtils.isNotBlank(state)){
-                payControlRecordDto.setResult(new Integer(state));
+                payControlRecordDto.setState(new Integer(state));
             }
             if(StringUtils.isNotBlank(beginTime)){
                 beginTime = beginTime +"000000";
@@ -190,7 +190,7 @@ public class PayControlRecordController {
                 payControlRecordDto.setResult(new Integer(result));
             }
             if(StringUtils.isNotBlank(state)){
-                payControlRecordDto.setResult(new Integer(state));
+                payControlRecordDto.setState(new Integer(state));
             }
             if(StringUtils.isNotBlank(beginTime)){
                 beginTime = beginTime +"000000";
@@ -239,7 +239,7 @@ public class PayControlRecordController {
                 payControlRecordDto.setResult(new Integer(result));
             }
             if(StringUtils.isNotBlank(state)){
-                payControlRecordDto.setResult(new Integer(state));
+                payControlRecordDto.setState(new Integer(state));
             }
             if(StringUtils.isNotBlank(beginTime)){
                 beginTime = beginTime +"000000";

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/PayControlRecordDto.java

@@ -23,7 +23,7 @@ public class PayControlRecordDto extends PayControlRecord {
     @ApiModelProperty(value = "设备型号")
     private String deviceModel;
     @ApiModelProperty(value = "设备状态 1正常 2故障 3无 4预警 5未启用")
-    private String deviceStatus;
+    private Integer deviceStatus;
     @ApiModelProperty(value = "故障天数")
     private Integer days;
     @ApiModelProperty(value = "安装地址")

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayControlRecordServiceImpl.java

@@ -84,15 +84,45 @@ public class PayControlRecordServiceImpl implements PayControlRecordService {
         Object[] objs = null;
         for(int i=0; i<payControlRecordList.size() ; i++){
             PayControlRecordDto payControlRecordDto1 = payControlRecordList.get(i);
+            String temp = "";
             objs = new Object[rowsName.length];
             objs[0] = i;
             objs[1] = payControlRecordDto1.getWaterMeterNo() != null ? payControlRecordDto1.getWaterMeterNo() : "";//水表电子号
             objs[2] = payControlRecordDto1.getMeterCode() != null ? payControlRecordDto1.getMeterCode() : "";//水表档案号
             objs[3] = payControlRecordDto1.getDeviceModel() != null ? payControlRecordDto1.getDeviceModel() : "";
-            objs[4] = payControlRecordDto1.getState() != null ? payControlRecordDto1.getState() : ""; //设备状态
+
+            if(payControlRecordDto1.getDeviceStatus() != null){
+                //设备状态 1正常 2故障 3无 4预警 5未启用
+                switch (payControlRecordDto1.getDeviceStatus()){
+                    case 1:{
+                        temp="正常";
+                        break;
+                    }
+                    case 2:{
+                        temp="故障";
+                        if(payControlRecordDto1.getDays() != null){
+                            temp += String.format("%s天",payControlRecordDto1.getDays().toString());
+                        }
+                        break;
+                    }
+                    case 3:{
+                        temp="无";
+                        break;
+                    }
+                    case 4:{
+                        temp="预警";
+                        break;
+                    }
+                    case 5:{
+                        temp ="未启用";
+                        break;
+                    }
+                }
+            }
+            objs[4] = payControlRecordDto1.getState() != null ? payControlRecordDto1.getDeviceStatus() : ""; //设备状态
             objs[5] = payControlRecordDto1.getLocDesc() != null ? payControlRecordDto1.getLocDesc() : "";//安装地址
             objs[6] = payControlRecordDto1.getControlRuleIdName() != null ? payControlRecordDto1.getControlRuleIdName() : "";//操作原因
-            String temp = "";
+
             if(payControlRecordDto1.getType() != null){
                 switch (payControlRecordDto1.getType()){
                     case 0:{
@@ -133,11 +163,11 @@ public class PayControlRecordServiceImpl implements PayControlRecordService {
                 temp = payControlRecordDto1.getState().toString();
                 switch (temp){
                     case "0":{
-                        temp="关阀";
+                        temp="阀关";
                         break;
                     }
                     case "1":{
-                        temp="开阀";
+                        temp="阀开";
                         break;
                     }
                     case "2":{
@@ -145,7 +175,7 @@ public class PayControlRecordServiceImpl implements PayControlRecordService {
                         break;
                     }
                     case "3":{
-                        temp="异常";
+                        temp="阀门异常";
                         break;
                     }
                     default:{
@@ -227,11 +257,11 @@ public class PayControlRecordServiceImpl implements PayControlRecordService {
                 temp = payControlRecordDto1.getState().toString();
                 switch (temp){
                     case "0":{
-                        temp="关阀";
+                        temp="阀关";
                         break;
                     }
                     case "1":{
-                        temp="开阀";
+                        temp="阀开";
                         break;
                     }
                     case "2":{
@@ -239,7 +269,7 @@ public class PayControlRecordServiceImpl implements PayControlRecordService {
                         break;
                     }
                     case "3":{
-                        temp="异常";
+                        temp="阀门异常";
                         break;
                     }
                     default:{

smart-city-platform/src/main/resources/mapper/pay/PayControlRecordMapper.xml

@@ -134,7 +134,7 @@
         <if test="siteId != null"> and pcr.site_id = #{siteId}</if>
         <if test="customerId != null"> and pcr.customer_id = #{customerId}</if>
         and DATE_FORMAT(pcr.create_date,'%Y')=#{year}
-        order by pcr.update_date desc
+        order by pcr.create_date desc
     </select>
 
     <insert id="add" useGeneratedKeys="true" keyColumn="id">