| @@ -368,7 +368,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| } | } | ||||
| WxAllBill abq = new WxAllBill(); | WxAllBill abq = new WxAllBill(); | ||||
| abq.updateTenantInfo(dto); | abq.updateTenantInfo(dto); | ||||
| abq.setFeesStandarsId(dto.getFeesId()); | |||||
| abq.setEnergyFeesId(dto.getFeesId()); | |||||
| abq.setBillType(EnumBillAllType.ADVANCE.getCode()); | abq.setBillType(EnumBillAllType.ADVANCE.getCode()); | ||||
| abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode()); | abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode()); | ||||
| abq.setSortColumns(SortField.Createtime_ASC); | abq.setSortColumns(SortField.Createtime_ASC); | ||||
| @@ -1251,6 +1251,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| advanceBill.setIsPreview(EnumYesOrNo.NO.getCode()); | advanceBill.setIsPreview(EnumYesOrNo.NO.getCode()); | ||||
| advanceBill.setBillRemark(record.getBillRemark()); | advanceBill.setBillRemark(record.getBillRemark()); | ||||
| advanceBill.setCanEdit(EnumYesOrNo.YES.getCode()); | advanceBill.setCanEdit(EnumYesOrNo.YES.getCode()); | ||||
| advanceBill.setRentArea(wxShop.getRentArea()); | |||||
| wxBillAllHelper.saveOrUpdateBill(advanceBill, user); | wxBillAllHelper.saveOrUpdateBill(advanceBill, user); | ||||
| } | } | ||||
| @@ -83,7 +83,7 @@ | |||||
| <if test=" null != endtimeEqual">and `endtime` = #{endtimeEqual}</if> | <if test=" null != endtimeEqual">and `endtime` = #{endtimeEqual}</if> | ||||
| <if test=" null != extraCreateFrom">and `extra_create_from` = #{extraCreateFrom}</if> | <if test=" null != extraCreateFrom">and `extra_create_from` = #{extraCreateFrom}</if> | ||||
| <if test=" null != noExtraCreateFrom">and `extra_create_from` is null</if> | <if test=" null != noExtraCreateFrom">and `extra_create_from` is null</if> | ||||
| <if test=" null != advanceHasMoney">and bill_type = 6 and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0</if> | |||||
| <if test=" null != advanceHasMoney">and bill_type = 6 and IFNULL(`pay`,'0') -IFNULL(`return_pay`,'0') - IFNULL(`use_money`,'0') > 0</if> | |||||
| <if test=" null != canEdit">and `can_edit` = #{canEdit}</if> | <if test=" null != canEdit">and `can_edit` = #{canEdit}</if> | ||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month} | and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month} | ||||