sz

src/main/java/com/jpsoft/smart/modules/base/controller/ElectricClientInfoController.java

@@ -30,7 +30,6 @@ public class ElectricClientInfoController {
     @Autowired
     private DataDictionaryService dataDictionaryService;
 
-
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<ElectricClientInfo> create(){
@@ -188,7 +187,7 @@ public class ElectricClientInfoController {
 
     @ApiOperation(value="批量删除")
     @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList, @RequestAttribute String subject){
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
@@ -239,7 +238,6 @@ public class ElectricClientInfoController {
 
         List<Sort> sortList = new ArrayList<>();
 
-
         if (StringUtils.isNotEmpty(id)) {
             searchParams.put("id","%" + id + "%");
         }

src/main/java/com/jpsoft/smart/modules/base/controller/RechargeRecordController.java

@@ -232,10 +232,10 @@ public class RechargeRecordController {
             searchParams.put("serialNumber","%" + serialNumber + "%");
         }
 
+
         Page<RechargeRecord> page = rechargeRecordService.pageSearch(searchParams,pageIndex,pageSize,sortList);
         List<RechargeRecord> resultRecordList = new ArrayList<>();
         List<RechargeRecord> recordList = page.getResult();
-
         for(RechargeRecord rechargeRecord :recordList){
             RoomInfo room = roomInfoService.get(rechargeRecord.getRoomId());
             RoomInfo building = new RoomInfo();
@@ -246,7 +246,6 @@ public class RechargeRecordController {
                     area = roomInfoService.get(building.getParentId());
                 }
             }
-
             rechargeRecord.setRoom(room);
             rechargeRecord.setBuilding(building);
             rechargeRecord.setArea(area);

src/main/java/com/jpsoft/smart/modules/base/service/RoomInfoService.java

@@ -18,5 +18,5 @@ public interface RoomInfoService {
 	int deleteClient(RoomInfo roomInfo);
 	List<RoomInfo> list();
 	Page<RoomInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
-    List<RoomInfo> findByTypeAndParentId(@Param("type") String type,@Param("parentId") String parentId);
+    List<RoomInfo> findByTypeAndParentId(@Param("type") String type, @Param("parentId") String parentId);
 }

src/main/java/com/jpsoft/smart/modules/business/service/impl/RechargeServiceImpl.java

@@ -13,6 +13,7 @@ import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket
 import com.jpsoft.smart.modules.communication.server.protocol.MeterSendPacket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

src/main/resources/mapper/base/ElectricClientInfo.xml

@@ -21,6 +21,7 @@
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
 			</resultMap>
+
 	<insert id="insert" parameterType="ElectricClientInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">

src/main/resources/mapper/base/ElectricMeterInfo.xml

@@ -17,6 +17,7 @@
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
 			</resultMap>
+
 	<insert id="insert" parameterType="ElectricMeterInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">

src/main/resources/mapper/base/RechargeRecord.xml

@@ -25,6 +25,7 @@
 			<result property="openId" column="open_id" />
 			<result property="errorLog" column="error_log" />
 			</resultMap>
+
 	<insert id="insert" parameterType="RechargeRecord">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -149,12 +150,6 @@
 			<if test="searchParams.serialNumber != null">
 				and serial_number like #{searchParams.serialNumber}
 			</if>
-			<if test="searchParams.roomId != null">
-				and room_id = #{searchParams.roomId}
-			</if>
-			<if test="searchParams.paymentStatus != null">
-				and payment_status = #{searchParams.paymentStatus}
-			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

src/main/resources/mapper/base/RoomInfo.xml

@@ -19,8 +19,9 @@
 		<result property="delFlag" column="del_flag" />
 		<result property="hasChildren" column="has_children" />
 		<association property="useTypeN" column="use_type" select="com.jpsoft.smart.modules.sys.dao.DataDictionaryDAO.getName"/>
-		<!--<association property="children" column="id_" select="com.jpsoft.epay.modules.base.dao.RoomInfoDAO.getChildren"/>-->
+		<!--<association property="children" column="id_" select="com.jpsoft.smart.modules.base.dao.RoomInfoDAO.getChildren"/>-->
 	</resultMap>
+
 	<insert id="insert" parameterType="RoomInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">

src/main/resources/mapper/base/TerminalInfo.xml

@@ -14,6 +14,7 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="sortNo" column="sort_no" />
 			</resultMap>
+
 	<insert id="insert" parameterType="TerminalInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">