diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractDepositTypeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractDepositTypeController.java index a8ad15795..f805ea5e5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractDepositTypeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractDepositTypeController.java @@ -5,8 +5,16 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumBillAllType; +import com.iformall.enums.EnumFeesStandardsCalcuteUnit; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.*; + +import io.swagger.annotations.ApiOperation; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +47,21 @@ public class WxRentContractDepositTypeController extends WxContractBaseControlle } return new ResultData(page.getList()); } + + @ApiOperation("查询物业合同计量单位列表") + @GetMapping("typeCalcuteUnitList") + public ResultData typeCalcuteUnitList() { + List enumList = EnumBillAllType.getCalucuteUnites(EnumBillAllType.RENT_DEPOSIT.getCode()); + if (null != enumList) { + Map retMap = new HashMap(); + for (int i = 0 ; i < enumList.size(); i++) { + EnumFeesStandardsCalcuteUnit cu = enumList.get(i); + retMap.put(cu.getCode(), cu.getMessage()); + } + return new ResultData(retMap); + } + return new ResultData(); + } } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java index 3a38a8e73..c677c8320 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java @@ -70,7 +70,7 @@ public enum EnumBillAllType { //需要计算的费用,非一次性费用 List retList = new ArrayList(); if (type.intValue() == RENT.getCode().intValue() || type.intValue() == RENT_BUSSINESS_MANAGE.getCode().intValue() - || type.intValue() == RENT_OPERATION_MANAGE.getCode().intValue() || type.intValue() == PROPERTY.getCode().intValue()) { + || type.intValue() == RENT_OPERATION_MANAGE.getCode().intValue() || type.intValue() == PROPERTY.getCode().intValue() || type.intValue() == RENT_DEPOSIT.getCode().intValue()) { retList.add(EnumFeesStandardsCalcuteUnit.MM); retList.add(EnumFeesStandardsCalcuteUnit.HU); }else if (type.intValue() == DAILY.getCode().intValue()) {