diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index cc158fac..22b59d0d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -25,9 +25,6 @@ import com.jero.contract.service.IPayIncomeContractAuditService; import com.jero.contract.service.IPayIncomeContractInstallmentService; import com.jero.contract.service.IPayIncomeContractService; import com.jero.contract.vo.*; -import com.jero.project.entity.PayCommonProject; -import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; @@ -67,18 +64,9 @@ public class PayIncomeContractController extends JeroController listAll(PayCommonProject payCommonProject,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCommonProject, req.getParameterMap()); List list = payCommonProjectService.list(queryWrapper); - return Result.OK(list); + List listNew = new ArrayList<>(); + if(!CollectionUtils.isEmpty(list)){ + String str = JSON.toJSONString(list); + listNew = JSONArray.parseArray(str,PayCommonProjectOutput.class); + listNew.forEach(p->{ + if(!StringUtils.isBlank(p.getChargeUse())){ + p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",p.getChargeUse())); + } + }); + } + return Result.OK(listNew); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java new file mode 100644 index 00000000..8533f85a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java @@ -0,0 +1,15 @@ +package com.jero.project.vo; + +import com.jero.project.entity.PayCommonProject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +@Data +public class PayCommonProjectOutput extends PayCommonProject implements Serializable { + /** + * 来款用途 + */ + @ApiModelProperty(value = "来款用途") + private String chargeUse_dictText; +}