winter 1 год назад
Родитель
Сommit
5665821355
3 измененных файлов: 22 добавлений и 2 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +19
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java Просмотреть файл

@@ -21,6 +21,8 @@ public interface WxAllBillMapper extends CommonMapper<WxAllBill, Long> {
List<WxAllBill> findContractSamePeriodSum(WxAllBill wxBillRent); List<WxAllBill> findContractSamePeriodSum(WxAllBill wxBillRent);
List<WxAllBill> findContractFeesSamePeriodSum(WxAllBill wxBillRent);
List<Long> getShopIdList(WxAllBill record); List<Long> getShopIdList(WxAllBill record);
BigDecimal getMerchantAdvanceGroupSum(WxAllBill wxBillRent); BigDecimal getMerchantAdvanceGroupSum(WxAllBill wxBillRent);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -330,7 +330,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillRent.setEnergyFeesId(null); wxBillRent.setEnergyFeesId(null);
wxBillRent.setBillType(EnumBillAllType.PROPERTY.getCode()); wxBillRent.setBillType(EnumBillAllType.PROPERTY.getCode());
wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode()); wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode());
List<WxAllBill> unFixedList = wxAllBillMapper.findContractSamePeriodSum(wxBillRent);
List<WxAllBill> unFixedList = wxAllBillMapper.findContractFeesSamePeriodSum(wxBillRent);
Map<Long,List<WxAllBill>> childMap = null; Map<Long,List<WxAllBill>> childMap = null;
if (null != unFixedList && unFixedList.size() > 0 ) { if (null != unFixedList && unFixedList.size() > 0 ) {
childMap = new HashMap<Long,List<WxAllBill>>(); childMap = new HashMap<Long,List<WxAllBill>>();


+ 19
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -239,6 +239,24 @@
</select> </select>
<select id="findContractSamePeriodSum" parameterType="com.iformall.domain.po.WxAllBill" resultMap="BaseResultMap"> <select id="findContractSamePeriodSum" parameterType="com.iformall.domain.po.WxAllBill" resultMap="BaseResultMap">
select
sum(CAST(need_pay AS DECIMAL(20,2))) need_pay ,
sum(CAST(receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(ifnull(pay,'0') AS DECIMAL(20,2))) pay,
sum(CAST(ifnull(set_off,'0') AS DECIMAL(20,2))) set_off,
sum(CAST(ifnull(use_money,'0') AS DECIMAL(20,2))) use_money,
sum(CAST(ifnull(return_pay,'0') AS DECIMAL(20,2))) return_pay,
sum(CAST(ifnull(bussiness_manage_fee_need_pay,'0') AS DECIMAL(20,2))) bussiness_manage_fee_need_pay,
sum(CAST(ifnull(operating_manage_fee_need_pay,'0') AS DECIMAL(20,2))) operating_manage_fee_need_pay,
starttime,
endtime
from wx_all_bill
<include refid="dynamicWhereConditions"/>
group by starttime,endtime
order by starttime asc
</select>
<select id="findContractFeesSamePeriodSum" parameterType="com.iformall.domain.po.WxAllBill" resultMap="BaseResultMap">
select select
sum(CAST(need_pay AS DECIMAL(20,2))) need_pay , sum(CAST(need_pay AS DECIMAL(20,2))) need_pay ,
sum(CAST(receive_pay AS DECIMAL(20,2))) receive_pay , sum(CAST(receive_pay AS DECIMAL(20,2))) receive_pay ,
@@ -256,7 +274,7 @@
energy_fees_id energy_fees_id
from wx_all_bill from wx_all_bill
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
group by starttime,endtime
group by energy_fees_id,starttime,endtime
order by starttime asc order by starttime asc
</select> </select>


Загрузка…
Отмена
Сохранить