优化代码

java110-bean/src/main/java/com/java110/dto/meterWater/MeterWaterDto.java

@@ -24,6 +24,7 @@ public class MeterWaterDto extends PageDto implements Serializable {
     private String waterId;
     private String curDegrees;
     private String meterType;
+    private String meterTypeName;
     private String preDegrees;
     private String objId;
     private String objName;
@@ -161,4 +162,12 @@ public class MeterWaterDto extends PageDto implements Serializable {
     public void setPrice(double price) {
         this.price = price;
     }
+
+    public String getMeterTypeName() {
+        return meterTypeName;
+    }
+
+    public void setMeterTypeName(String meterTypeName) {
+        this.meterTypeName = meterTypeName;
+    }
 }

java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml

@@ -124,8 +124,9 @@
         curReadingTime,t.water_id,t.water_id waterId,t.cur_degrees,t.cur_degrees curDegrees,t.create_time,t.create_time
         createTime,t.meter_type,t.meter_type meterType,t.pre_degrees,t.pre_degrees preDegrees,t.obj_id,t.obj_id
         objId,t.pre_reading_time,t.pre_reading_time preReadingTime,t.b_id,t.b_id bId,t.community_id,t.community_id
-        communityId,t.obj_type,t.obj_type objType,t.fee_id,t.fee_id feeId,t.obj_name,t.obj_name objName,t.price
+        communityId,t.obj_type,t.obj_type objType,t.fee_id,t.fee_id feeId,t.obj_name,t.obj_name objName,t.price,mt.type_name meterTypeName
         from meter_water t
+        left join meter_type mt on t.meter_type = mt.type_id and mt.status_cd = '0'
         left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         where 1 =1
         <if test="remark !=null and remark != ''">

java110-generator/src/main/resources/newBack/template_1.json

@@ -7,14 +7,13 @@
     "text1": "text1",
     "text2": "text2",
     "paId": "pa_id",
-    "textId": "text_id",
     "statusCd": "status_cd",
     "communityId": "community_id"
   },
-  "name": "parkingAreaText",
+  "name": "",
   "shareColumn": "community_id",
-  "id": "textId",
-  "shareName": "community",
+  "id": "",
+  "shareName": "",
   "autoMove": true,
   "required": [
     {
@@ -50,7 +49,7 @@
       "code": "voice"
     }
   ],
-  "desc": "停车场道闸文字语音配置",
+  "desc": "",
   "shareParam": "communityId",
   "tableName": "parking_area_text"
 }

service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java

@@ -3,6 +3,7 @@ package com.java110.community.bmo.assets.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.community.bmo.assets.IQueryAssetsInspectionBMO;
+import com.java110.core.annotation.Java110Transactional;
 import com.java110.dto.inspectionPlan.InspectionTaskDto;
 import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
 import com.java110.utils.util.DateUtil;