winter 1 год назад
Родитель
Сommit
967eda7876
3 измененных файлов: 47 добавлений и 23 удалений
  1. +39
    -20
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java
  3. +6
    -1
      mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml

+ 39
- 20
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Просмотреть файл

@@ -116,24 +116,57 @@ public class WxFinanceController extends BaseController {
return new ResultData(list);
}
@ApiOperation("合同费用科目列表")
@GetMapping("contractFeesList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData contractFeesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
//查询非能源费用科目
List<Integer> billTypeList = new ArrayList<Integer>();
billTypeList.add(EnumBillAllType.RENT_DEPOSIT.getCode());
billTypeList.add(EnumBillAllType.PROPERTY.getCode());
record.setBillTypeList(billTypeList);
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false);
return new ResultData(page);
}
@ApiOperation("费用科目列表")
@GetMapping("feesList")
@ApiOperation("其他费用科目列表")
@GetMapping("otherFeesList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData feesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) {
public ResultData otherFeesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
//查询非能源费用科目
record.setCommonOperate(EnumYesOrNo.YES.getCode());
List<Integer> billTypeList = new ArrayList<Integer>();
billTypeList.add(EnumBillAllType.OTHER.getCode());
billTypeList.add(EnumBillAllType.OTHER_DEPOSIT.getCode());
record.setBillTypeList(billTypeList);
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false);
return new ResultData(page);
}
@ApiOperation("预收科目列表")
@GetMapping("advanceFeesList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData advanceTypeList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
record.setBillType(EnumBillAllType.ADVANCE.getCode());
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true);
return new ResultData(page);
}
@ApiOperation("费用区间列表")
@PostMapping("saveFees")
public ResultData saveFees(@RequestBody WxEnergyFees record) {
@@ -181,20 +214,6 @@ public class WxFinanceController extends BaseController {
return new ResultData();
}
@ApiOperation("预收科目列表")
@GetMapping("advanceFeesList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData advanceTypeList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
record.setBillType(EnumBillAllType.ADVANCE.getCode());
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true);
return new ResultData(page);
}
@ApiOperation("预收科目新增修改")
@PostMapping("saveAdvanceFees")
public ResultData saveAdvanceType(@RequestBody WxEnergyFees record) {


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java Просмотреть файл

@@ -175,9 +175,9 @@ public class WxEnergyFees extends TenantEntity {
return null;
}
@TableField(exist = false)
private Integer commonOperate;//通用可配置类型
@TableField(exist = false)
private Integer notSetOff;
@TableField(exist = false)
private List<Integer> billTypeList;
}

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

@@ -39,7 +39,6 @@
<if test=" null != publicCalcute ">and `public_calcute` = #{publicCalcute}</if>
<if test=" null != type ">and `type` = #{type}</if>
<if test=" null != billType ">and `bill_type` = #{billType}</if>
<if test=" null != commonOperate ">and `bill_type` != 3 and `bill_type` != 6</if>
<if test=" null != notSetOff ">and `bill_type` != 6</if>
<if test=" null != isSystem ">and `is_system` = #{isSystem}</if>
<if test=" null != fixedPrice ">and `fixed_price` = #{fixedPrice}</if>
@@ -47,6 +46,12 @@
<if test=" null != timeUnit ">and `time_unit` = #{timeUnit}</if>
<if test=" null != name and '' != name ">and name like concat('%', #{name},'%')</if>
<if test=" null != isDespoit ">and `is_despoit` = #{isDespoit}</if>
<if test=" null != billTypeList ">
and bill_type in
<foreach collection="billTypeList" index="index" item="billTypeItem" open="(" separator="," close=")">
#{billTypeItem}
</foreach>
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


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