优化算费

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

@@ -315,6 +315,7 @@ public class BwMeterReadPlanController extends BaseController {
         if (StringUtils.isBlank(mrBooks)) {
             return ResultRespone.failed("算费失败：抄表册参数为空！");
         }
+        mrBooks = "'" + mrBooks.replace(",", "','") + "'";
         ArrayList arrayList = bwMeterReadPlanMapper.getMeterCardIds(mrBooks);
         if (arrayList.size() == 0) {
             return ResultRespone.failed("算费失败：当前所选的抄表册不存在需算费的用户！");

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

@@ -66,7 +66,7 @@
     <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.audit_flag='1' and a.cal_flag = '0'
+        where a.mr_flag = '1' and a.audit_flag='1' and a.cal_flag = '0' and a.cal_state='1'
         <!--所属公司-->
         <if test="companyBranch!=null and companyBranch!=''">
             and a.company_branch=#{companyBranch}
@@ -82,7 +82,7 @@
     </select>
     <!--通过抄表本集合查询已抄表待算费的抄表卡ID集-->
     <select id="getMeterCardIds" resultType="java.util.ArrayList">
-        select meter_card_id from tf_ywys_bw_meter_read_plan where mr_flag='1' and audit_flag='1' and cal_flag='0'
+        select meter_card_id from tf_ywys_bw_meter_read_plan where cal_state='1' and mr_flag='1' and audit_flag='1' and cal_flag='0'
         <!--抄表本集合-->
         <if test="mrBooks!=null and mrBooks!=''">
             and mr_book in(${mrBooks})