bug

src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java

@@ -145,7 +145,10 @@ public class TaPointsRecordsController extends BaseController {
                         result.getRecords().get(i).setRecordName("资料审核");
                         break;
                     case CommConstant.POINTS_PAYMENT:
-                        result.getRecords().get(i).setRecordName("缴费成功");
+                        result.getRecords().get(i).setRecordName("物业缴费");
+                        break;
+                    case CommConstant.POINTS_USER_VERIFY:
+                        result.getRecords().get(i).setRecordName("业主认证");
                         break;
                 }
             }

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -149,9 +149,11 @@ public class BillController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/bill/downloadExcel", method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
+    public void exportExcel(@RequestParam(value = "phaseId",required = false) String phaseId,
+                            @RequestParam(value = "buildingId",required = false) String buildingId,
+            HttpServletResponse response, HttpServletRequest request) {
         TaUser userElement = getTaUser(request);
-        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement).getData();
+        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement,phaseId,buildingId).getData();
 //        this.setResponseHeader(response, "缴费单模板.xls");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

@@ -65,4 +65,6 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
 //            "and level_id=#{levelId}")
     List<TpRoomNo> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
 
+    List<TpRoomNo> selectComunityList(@Param("orgId") Integer orgId, @Param("phaseId") String phaseId, @Param("buildingId") String buildingId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
 }

src/main/java/com/huiju/estateagents/property/service/IBillService.java

@@ -86,7 +86,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean downloadExcel(TaUser userElement);
+	ResponseBean downloadExcel(TaUser userElement,String phaseId,String buildingId);
 
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据

src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java

@@ -608,7 +608,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     }
 
     @Override
-    public ResponseBean downloadExcel(TaUser userElement) {
+    public ResponseBean downloadExcel(TaUser userElement,String phaseId,String buildingId) {
         ResponseBean responseBean = new ResponseBean();
 
         InputStream inputStream = null;
@@ -631,7 +631,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         Integer pageSize = 10;
         // 分页查询
 
-        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), pageNum * pageSize, pageSize);
+        List<TpRoomNo> records = tpRoomNoMapper.selectComunityList(userElement.getOrgId(), phaseId,buildingId,pageNum * pageSize, pageSize);
         // 总页数
         Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId());
 

src/main/resources/mapper/property/TpRoomNoMapper.xml

@@ -60,4 +60,23 @@
             AND n.id = #{buildingId}
             AND q.id = #{phaseId}
     </select>
+    <select id="selectComunityList" resultType="com.huiju.estateagents.property.model.TpRoomNo">
+        SELECT
+        t.*
+        FROM
+        tp_room_no t
+        INNER JOIN tp_level s ON s.id = t.level_id
+        INNER JOIN tp_unit m ON m.id = t.unit_id
+        INNER JOIN tp_building n ON n.id = t.building_id
+        INNER JOIN tp_phase q ON q.id = t.phase_id
+        WHERE
+        t.org_id = #{orgId}
+        <if test="phaseId != null and phaseId != ''" >
+            and t.phase_id = #{phaseId,jdbcType=VARCHAR}
+        </if>
+        <if test="buildingId != null and buildingId != ''" >
+            and t.building_id = #{buildingId,jdbcType=VARCHAR}
+        </if>
+        LIMIT #{pageNum}, #{pageSize}
+    </select>
 </mapper>