BMS结算主体字段查询显示

mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml

@@ -142,6 +142,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="contractManageDO.contractType != null">
             and contract_type = #{contractManageDO.contractType}
         </if>
+        <if test="contractManageDO.settlementCustomers != null">
+            and settlement_customers like concat('%', #{contractManageDO.settlementCustomers}, '%')
+        </if>
         <if test="contractManageDO.settlementCustomersCode != null">
             and settlement_customers_code = #{contractManageDO.settlementCustomersCode}
         </if>

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/service/BillingStatementDomainService.java

@@ -393,11 +393,45 @@ public class BillingStatementDomainService {
      */
     private void handleData(BillingStatementDO billingStatementDO) {
         //查询合同信息，赋值合同周期信息
+        //优先通过合同编号获取合同信息
         if(StringUtils.isNotEmpty(billingStatementDO.getContractNumber())){
             AjaxResult ajaxResult = systemServiceFeign.getInfoByCode(billingStatementDO.getContractNumber());
             if("200".equals(String.valueOf(ajaxResult.get("code")))){
                 ContractManagePO contractManagePO = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), ContractManagePO.class);
                 if(null != contractManagePO){
+                    //根据合同判断计费流水的周期开始日期和周期结束日期
+                    setCycleTimeByContract(billingStatementDO, contractManagePO);
+                    billingStatementDO.setContractType(contractManagePO.getContractType());
+                }
+            }
+        }
+        //根据结算对象获取收支类型
+        if(StringUtils.isNotEmpty(billingStatementDO.getSettlementCustomersCode())){
+            SettlementCustomers settlementCustomers = settlementCustomersDomainService.queryByCode(billingStatementDO.getSettlementCustomersCode());
+            if(null != settlementCustomers){
+                if(settlementCustomers.getMainRole()==1){
+                    billingStatementDO.setAccountExpenseType(1);
+                }else {
+                    billingStatementDO.setAccountExpenseType(2);
+                }
+            }
+        }
+    }
+
+    /**
+     * 根据合同判断计费流水的周期开始日期和周期结束日期
+     * （1）周期开始日期：根据合同明细的计费属性判断
+     *     - 实时计费、按天计费：周期开始日期 = 业务日期
+     *     - 按账期计费：周期开始日期 = 业务日期
+     *     - 按周计费：周期开始日期 = 业务日期
+     * （2）周期结束日期：根据合同明细的计费属性判断
+     *     - 实时计费、按天计费：周期结束日期 = 业务日期
+     *     - 按账期计费：周期结束日期 = 合同的出账日期（paymentDate）
+     *     - 按周计费：周期结束日期 = 业务日期往后推一周
+     * @param billingStatementDO 计费流水对象
+     * @param contractManagePO 合同管理对象
+     */
+    private void setCycleTimeByContract(BillingStatementDO billingStatementDO, ContractManagePO contractManagePO) {
         //取值合同详情，对比费用科目，取值计费周期
         if(contractManagePO.getContractManageDetailPOList()!=null && contractManagePO.getContractManageDetailPOList().size()>0){
             List<ContractManageDetailPO> contractManageDetailPOList = contractManagePO.getContractManageDetailPOList();
@@ -428,21 +462,6 @@ public class BillingStatementDomainService {
             billingStatementDO.setCycleBeginTime(cycleBeginTime);
             billingStatementDO.setCycleEndTime(cycleEndTime);
         }
-                    billingStatementDO.setContractType(contractManagePO.getContractType());
-                }
-            }
-        }
-        //根据结算对象获取收支类型
-        if(StringUtils.isNotEmpty(billingStatementDO.getSettlementCustomersCode())){
-            SettlementCustomers settlementCustomers = settlementCustomersDomainService.queryByCode(billingStatementDO.getSettlementCustomersCode());
-            if(null != settlementCustomers){
-                if(settlementCustomers.getMainRole()==1){
-                    billingStatementDO.setAccountExpenseType(1);
-                }else {
-                    billingStatementDO.setAccountExpenseType(2);
-                }
-            }
-        }
     }