优化费用

java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml

@@ -336,7 +336,7 @@
         select t.operate,t.sex,t.name,t.link,t.remark,t.owner_id ownerId,t.b_id bId,
         t.age,t.member_id memberId,
         t.owner_type_cd ownerTypeCd,t.community_id communityId,t.owner_flag ownerFlag,
-        t.id_card idCard,t.state,t.address,t.create_time createTime,uu.`name` userName,t.operate
+        t.id_card idCard,t.state,t.address,co.create_time createTime,uu.`name` userName,t.operate
         from business_building_owner t
         left join c_business cb on t.b_id = cb.b_id
         left join c_orders co on cb.o_id = co.o_id
@@ -511,4 +511,75 @@
         </if>
     </select>
 
+
+    <select id="queryHisRoomCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from business_building_room t
+        left join building_unit bu on t.unit_id = bu.unit_id
+        left join f_floor f on f.floor_id = bu.floor_id
+        left join c_business cb on t.b_id = cb.b_id
+        left join c_orders co on cb.o_id = co.o_id
+        left join u_user uu on co.user_id = uu.user_id
+        where 1=1
+        <if test="roomId != null and roomId != ''">
+            and t.room_id = #{roomId}
+        </if>
+        <if test="floorNum != null and floorNum != ''">
+            and f.floor_num = #{floorNum}
+        </if>
+        <if test="unitNum != null and unitNum != ''">
+            and bu.unit_num = #{unitNum}
+        </if>
+        <if test="roomNum != null and roomNum != ''">
+            and t.room_num = #{roomNum}
+        </if>
+        <if test="staffNameLike != null and staffNameLike != ''">
+            and uu.name like concat('%',#{staffNameLike},'%')
+        </if>
+        <if test="logStartTime != null and logStartTime != ''">
+            and co.create_time &gt; #{logStartTime}
+            and co.create_time &lt; #{logEndTime}
+        </if>
+        and t.community_id = #{communityId}
+    </select>
+
+    <select id="queryHisRooms" parameterType="Map" resultType="Map">
+        select t.operate,co.create_time createTime,uu.`name` userName,t.section,t.remark,t.room_sub_type
+        roomSubType,t.room_area roomArea,t.room_id
+        roomId,t.layer,t.fee_coefficient feeCoefficient,t.built_up_area
+        builtUpArea,t.room_num roomNum,t.unit_id unitId,t.state,td.name stateName,t.community_id
+        communityId,t.apartment,t.room_type roomType,t.room_rent roomRent,f.floor_num floorNum,bu.unit_num unitNum
+        from business_building_room t
+        left join building_unit bu on t.unit_id = bu.unit_id
+        left join f_floor f on f.floor_id = bu.floor_id
+        left join c_business cb on t.b_id = cb.b_id
+        left join c_orders co on cb.o_id = co.o_id
+        left join u_user uu on co.user_id = uu.user_id
+        where 1=1
+        <if test="roomId != null and roomId != ''">
+            and t.room_id = #{roomId}
+        </if>
+        <if test="floorNum != null and floorNum != ''">
+            and f.floor_num = #{floorNum}
+        </if>
+        <if test="unitNum != null and unitNum != ''">
+            and bu.unit_num = #{unitNum}
+        </if>
+        <if test="roomNum != null and roomNum != ''">
+            and t.room_num = #{roomNum}
+        </if>
+        <if test="staffNameLike != null and staffNameLike != ''">
+            and uu.name like concat('%',#{staffNameLike},'%')
+        </if>
+        <if test="logStartTime != null and logStartTime != ''">
+            and co.create_time &gt; #{logStartTime}
+            and co.create_time &lt; #{logEndTime}
+        </if>
+        and t.community_id = #{communityId}
+        order by t.create_time desc,t.operate
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+    </select>
+
 </mapper>

java110-interface/src/main/java/com/java110/intf/report/IReportCommunityInnerServiceSMO.java

@@ -95,4 +95,10 @@ public interface IReportCommunityInnerServiceSMO {
      */
     @RequestMapping(value = "/queryHisFeeConfigs", method = RequestMethod.POST)
     List<FeeConfigDto> queryHisFeeConfigs(@RequestBody FeeConfigDto feeDto);
+
+    @RequestMapping(value = "/queryHisRoomCount", method = RequestMethod.POST)
+    int queryHisRoomCount(@RequestBody RoomDto roomDto);
+
+    @RequestMapping(value = "/queryHisRooms", method = RequestMethod.POST)
+    List<RoomDto> queryHisRooms(@RequestBody RoomDto roomDto);
 }

service-report/src/main/java/com/java110/report/cmd/room/QueryHisRoomCmd.java

@@ -0,0 +1,65 @@
+package com.java110.report.cmd.room;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.intf.report.IReportCommunityInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询房屋变更记录
+ */
+@Java110Cmd(serviceCode = "owner.queryHisRoom")
+public class QueryHisRoomCmd extends Cmd {
+
+    @Autowired
+    private IReportCommunityInnerServiceSMO reportCommunityInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        int row = reqJson.getInteger("row");
+        RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);
+
+        String roomName = reqJson.getString("roomName");
+        if(StringUtil.isEmpty(roomName)){
+            String[] roomNames = roomName.split(roomName,3);
+            if(roomNames.length == 3) {
+                roomDto.setFloorNum(roomNames[0]);
+                roomDto.setUnitNum(roomNames[1]);
+                roomDto.setRoomNum(roomNames[2]);
+            }
+        }
+
+        int total = reportCommunityInnerServiceSMOImpl.queryHisRoomCount(roomDto);
+//        int count = 0;
+        List<RoomDto> roomDtos = null;
+        if (total > 0) {
+            roomDtos = reportCommunityInnerServiceSMOImpl.queryHisRooms(roomDto);
+        } else {
+            roomDtos = new ArrayList<>();
+        }
+
+        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, roomDtos);
+        context.setResponseEntity(responseEntity);
+    }
+}

service-report/src/main/java/com/java110/report/dao/IReportCommunityServiceDao.java

@@ -104,7 +104,11 @@ public interface IReportCommunityServiceDao {
 
     List<Map> queryHisFees(Map info);
 
-    int queryHisFeeConfigCount(Map map);
+    int queryHisFeeConfigCount(Map info);
 
-    List<Map> queryHisFeeConfigs(Map map);
+    List<Map> queryHisFeeConfigs(Map info);
+
+    int queryHisRoomCount(Map info);
+
+    List<Map> queryHisRooms(Map info);
 }

service-report/src/main/java/com/java110/report/dao/impl/ReportCommunityServiceDaoImpl.java

@@ -170,6 +170,27 @@ public class ReportCommunityServiceDaoImpl extends BaseServiceDao implements IRe
         return businessOwnerCarInfos;
     }
 
+    @Override
+    public int queryHisRoomCount(Map info) {
+        logger.debug("查询 queryHisRoomCount 入参 info : {}", info);
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportCommunityServiceDaoImpl.queryHisRoomCount", info);
+        if (infos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(infos.get(0).get("count").toString());
+    }
+
+    @Override
+    public List<Map> queryHisRooms(Map info) {
+        logger.debug("查询 queryHisRooms 入参 info : {}", info);
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportCommunityServiceDaoImpl.queryHisRooms", info);
+
+        return infos;
+    }
+
     @Override
     public int queryHisFeeCount(Map info) {
         logger.debug("查询queryHisFeeCount 入参 info : {}", info);
@@ -211,4 +232,6 @@ public class ReportCommunityServiceDaoImpl extends BaseServiceDao implements IRe
 
         return infos;
     }
+
+
 }

service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java

@@ -121,6 +121,26 @@ public class ReportCommunityInnerServiceSMOImpl extends BaseServiceSMO implement
         return ownerDtos;
     }
 
+
+    @Override
+    public int queryHisRoomCount(@RequestBody RoomDto roomDto) {
+        return reportCommunityServiceDaoImpl.queryHisRoomCount(BeanConvertUtil.beanCovertMap(roomDto));
+    }
+
+    @Override
+    public List<RoomDto> queryHisRooms(@RequestBody RoomDto roomDto) {
+        int page = roomDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            roomDto.setPage((page - 1) * roomDto.getRow());
+        }
+
+        List<RoomDto> roomDtos = BeanConvertUtil.covertBeanList(
+                reportCommunityServiceDaoImpl.queryHisRooms(BeanConvertUtil.beanCovertMap(roomDto)),
+                RoomDto.class);
+        return roomDtos;
+    }
+
     @Override
     public int queryHisFeeCount(@RequestBody FeeDto feeDto) {
         return reportCommunityServiceDaoImpl.queryHisFeeCount(BeanConvertUtil.beanCovertMap(feeDto));
@@ -161,6 +181,8 @@ public class ReportCommunityInnerServiceSMOImpl extends BaseServiceSMO implement
         return feeDtos;
     }
 
+
+
     /**
      * 获取批量userId
      *