java/xizang.git

			@@ -5,6 +5,7 @@
			import com.ruoyi.common.constant.AmountConstant;
			import com.ruoyi.common.constant.CacheConstants;
			import com.ruoyi.common.core.redis.RedisCache;
			import com.ruoyi.common.enums.DisabledEnum;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.*;
			import com.ruoyi.common.utils.uuid.UUID;
			@@ -153,6 +154,7 @@
			if (presist.getPayFeesStatus().equals("3")){
			throw new ServiceException("该账单已缴费完成");
			}
			save.setBusinessDeptId(presist.getBusinessDeptId());
			switch (type){
			// 仅更新除金额字段外的属性
			case 1:
			@@ -251,6 +253,7 @@
			@Override
			@Transactional(rollbackFor = Exception.class)
			public void saveBill(TbillSaveDto bill) {
			bill.setManualAddition(DisabledEnum.YES.getCode());
			save(bill);
			if (bill.getBillType().equals("3")){
			if (bill.getDetails()==null \|\| bill.getDetails().size()==0){
			@@ -590,8 +593,29 @@
			* @return
			*/
			@Override
			public List<ScreenRentRankVO> getStreetRentRank() {
			return baseMapper.getStreetRentRank();
			public List<ScreenRentRankVO> getStreetRentRank(String businessDeptId) {
			return baseMapper.getStreetRentRank(businessDeptId);
			}
			/**
			* 查询季付账单
			* @param businessDeptId
			* @return
			*/
			@Override
			public List<TBill> getJiFuBillList(String businessDeptId) {
			return baseMapper.getJiFuBillList(businessDeptId,null,null);
			}

			/**
			* 查询当前季度的季付账单
			* @param businessDeptId
			* @param first
			* @param last
			* @return
			*/
			@Override
			public List<TBill> getJiFuBillListByTime(String businessDeptId, Date first, Date last) {
			return baseMapper.getJiFuBillList(businessDeptId,first,last);
			}

			@Override
			@@ -642,4 +666,10 @@
			// flow.setCreateBy(SecurityUtils.getUsername());
			// tFlowManagementService.save(flow);
			}


			@Override
			public List<ScreenRentRankVO> getStreetRentRank() {
			return null;
			}
			}