抄表算费：查询抄表册选择列表数据；获取可算费的用户明细数据

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/meterreadingmgt/controller/BwMeterReadPlanController.java

@@ -45,8 +45,8 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/api/bwmeterreadplan")
-@Api(tags = "抄表管理-抄表录入接口")
+@RequestMapping("/api/bwMeterReadPlan")
+@Api(tags = "抄表管理-抄表算费接口")
 public class BwMeterReadPlanController extends BaseController {
 
     private final IBwMeterReadPlanService bwMeterReadPlanService;
@@ -223,4 +223,47 @@ public class BwMeterReadPlanController extends BaseController {
         }
         //endregion
     }
+
+
+    /**
+     * 抄表算费：查询抄表册选择列表数据
+     *
+     * @param page          分页对象
+     * @param companyBranch 公司编码值
+     * @param mrArea        抄表片区值
+     * @return
+     */
+    @PostMapping("/getMrBookList")
+    @ApiOperation(value = "抄表算费-查询抄表册列表数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyBranch", value = "公司", dataType = "String"),
+            @ApiImplicitParam(name = "mrArea", value = "片区", dataType = "String")
+    })
+    public ResultRespone getMrBookList(Page page, String companyBranch, String mrArea) {
+        PageSortHelper.setPageSort(page, null);
+        IPage<Map<String, Object>> pageList = bwMeterReadPlanMapper.getMrBookList(page, companyBranch, mrArea);
+        return ResultRespone.success(pageList);
+    }
+
+    /**
+     * 抄表算费：获取可算费的用户明细数据
+     *
+     * @param page          分页对象
+     * @param companyBranch 公司编码值
+     * @param mrBooks       抄表本集合
+     * @param searchText    关键字（用户姓名、地址、用户编号）
+     * @return
+     */
+    @PostMapping("/getUserList")
+    @ApiOperation(value = "抄表算费-获取可算费的用户明细数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyBranch", value = "公司", dataType = "String"),
+            @ApiImplicitParam(name = "mrBooks", value = "抄表本集合", dataType = "String"),
+            @ApiImplicitParam(name = "searchText", value = "关键字（用户姓名、地址、用户编号）", dataType = "String")
+    })
+    public ResultRespone getUserList(Page page, String companyBranch, String mrBooks, String searchText) {
+        PageSortHelper.setPageSort(page, null);
+        IPage<Map<String, Object>> pageList = bwMeterReadPlanMapper.getUserList(page, companyBranch, mrBooks, searchText);
+        return ResultRespone.success(pageList);
+    }
 }

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/meterreadingmgt/mapper/BwMeterReadPlanMapper.java

@@ -22,12 +22,36 @@ import java.util.Map;
 public interface BwMeterReadPlanMapper extends BaseMapper<BwMeterReadPlan> {
 
     /**
-     * 查询MyBatis数据
+     * 抄表录入列表数据
      */
     @MapKey("meter_card_id")
     Page<Map<String, Object>> getMeterReadList(Page page, String companyBranch, String mrArea
             , String mrBook, String mrOCode, String mrMode, String mrFlag, String calFlag, String searchText);
 
+    /**
+     * 抄表算费：查询抄表册选择列表数据
+     *
+     * @param page          分页对象
+     * @param companyBranch 公司编码值
+     * @param mrArea        抄表片区值
+     * @return
+     */
+    @MapKey("cbbbm")
+    Page<Map<String, Object>> getMrBookList(Page page, String companyBranch, String mrArea);
+
+    /**
+     * 抄表算费：获取可算费的用户明细数据
+     *
+     * @param page          分页对象
+     * @param companyBranch 公司编码值
+     * @param mrBooks       抄表本集合
+     * @param searchText    关键字（用户姓名、地址、用户编号）
+     * @return
+     */
+    @MapKey("meter_card_id")
+    Page<Map<String, Object>> getUserList(Page page, String companyBranch, String mrBooks,String searchText);
+
+
     int delByNo(String no);
 
     /**

collect-fees/collect-fees-service/src/main/resources/mapper/meterreadingmgt/BwMeterReadPlanMapper.xml

@@ -47,6 +47,39 @@
             AND (a.customer_no like '%${searchText}%' or b.customer_name like '%${searchText}%')
         </if>
     </select>
+    <!--抄表算费：查询抄表册选择列表数据-->
+    <select id="getMrBookList" resultType="java.util.Map">
+        select a.mr_book cbbbm,b.name cbbmc,count(0) yhsl
+        from tf_ywys_bw_meter_read_plan a,tf_ywys_bm_mr_book b
+        where a.mr_book = b.code and a.mr_flag = '1' and a.cal_flag = '0' and a.cal_state='1'
+        <!--所属公司-->
+        <if test="companyBranch!=null and companyBranch!=''">
+            and a.company_branch=#{companyBranch}
+        </if>
+        <!--所属片区-->
+        <if test="mrArea!=null and mrArea!=''">
+            and a.mr_area=#{mrArea}
+        </if>
+        group by a.mr_book,b.name
+    </select>
+    <!--抄表算费：获取可算费的用户明细数据-->
+    <select id="getUserList" resultType="java.util.Map">
+        select a.meter_card_id,a.customer_no,b.customer_name,b.customer_address,a.quantity
+        from tf_ywys_bw_meter_read_plan a inner join tf_ywys_da_customer b on a.customer_no=b.customer_no
+        where a.mr_flag = '1' and a.cal_flag = '0'
+        <!--所属公司-->
+        <if test="companyBranch!=null and companyBranch!=''">
+            and a.company_branch=#{companyBranch}
+        </if>
+        <if test="searchText != null and searchText != ''">
+            AND (a.customer_no like '%${searchText}%' or b.customer_name like '%${searchText}%' or b.customer_address
+            like '%${searchText}%')
+        </if>
+        <!--抄表本集合-->
+        <if test="mrBooks!=null and mrBooks!=''">
+            and a.mr_book in('#{mrBooks}')
+        </if>
+    </select>
     <delete id="delByNo">
         delete
         from Tf_Ywys_Da_Customer