winter пре 1 година
родитељ
комит
bfc165cc49
3 измењених фајлова са 8 додато и 1 уклоњено
  1. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Прегледај датотеку

@@ -743,8 +743,12 @@ public class WxRentContractController extends WxContractBaseController {
if (null != s) { if (null != s) {
bill.setSales(s.getSaleMoney()); bill.setSales(s.getSaleMoney());
bill.setSalesTime(s.getUpdateTime()); bill.setSalesTime(s.getUpdateTime());
//已锁定的不能再设置
if (s.getIsConfirm() == EnumYesOrNo.YES.getCode()) { if (s.getIsConfirm() == EnumYesOrNo.YES.getCode()) {
// //
//TODO 年度已经汇算的不能再设置
//}else if() {
}else { }else {
validBillList.add(bill); validBillList.add(bill);
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Прегледај датотеку

@@ -204,7 +204,7 @@ public class WxBillAllHelper {
bq.setIsPreview(EnumYesOrNo.NO.getCode()); bq.setIsPreview(EnumYesOrNo.NO.getCode());
bq.setBillType(EnumBillAllType.RENT.getCode()); bq.setBillType(EnumBillAllType.RENT.getCode());
bq.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId()); bq.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId());
bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode());
//bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode());
bq.setStarttimeEqual(starttime); bq.setStarttimeEqual(starttime);
bq.setEndtimeEqual(endtime); bq.setEndtimeEqual(endtime);
return bq; return bq;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Прегледај датотеку

@@ -2589,6 +2589,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
billDel.setStarttimeEqual(startime); billDel.setStarttimeEqual(startime);
wxAllBillMapper.deleteByRentReveneuSales(billDel); wxAllBillMapper.deleteByRentReveneuSales(billDel);
//上面删除掉生成的账单之后,再重新查询,只剩下主账单
rentBillList = wxAllBillMapper.findList(bq);
//加上物业 //加上物业
List<WxAllBill> propertyBillList = null; List<WxAllBill> propertyBillList = null;
BigDecimal propertyPrice = new BigDecimal(0); BigDecimal propertyPrice = new BigDecimal(0);


Loading…
Откажи
Сачувај