From 19dcb4dc4995f58a3324575cdb509dbbd69820d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 7 Sep 2021 10:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayIncomeContractController.java          | 12 -----------
 .../PayCommonProjectController.java           | 21 ++++++++++++++++++-
 .../project/vo/PayCommonProjectOutput.java    | 15 +++++++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java

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<PayIncomeContrac
 	@Autowired
 	private IPayIncomeContractInstallmentService payIncomeContractInstallmentService;
 	@Autowired
-	private IPayCommonProjectService payCommonProjectService;
-	@Autowired
-	private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
-	@Autowired
-	private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
-	@Autowired
-	private IPayWorkingGroupService payWorkingGroupService;
-	@Autowired
 	private IPayIncomeContractAuditService payIncomeContractAuditService;
 	@Autowired
 	private Environment env;
-
 	@Autowired
 	private ISysBaseAPI sysBaseAPI;
 	
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 0bded230..99a6c06d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -1,15 +1,20 @@
 package com.jero.project.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.service.ProjectDetailService;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.ValidUtil;
@@ -18,7 +23,9 @@ import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.project.vo.PayCommonProjectOutput;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,6 +48,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	private IPayCommonProjectService payCommonProjectService;
 	@Autowired
 	private ProjectDetailService projectDetailService;
+	@Autowired
+	private ISysBaseAPI sysBaseAPI;
 	 /**
 	 * 分页列表查询
 	 *
@@ -78,7 +87,17 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	public Result<?> listAll(PayCommonProject payCommonProject,HttpServletRequest req) {
 		QueryWrapper<PayCommonProject> queryWrapper = QueryGenerator.initQueryWrapper(payCommonProject, req.getParameterMap());
 		List<PayCommonProject> list = payCommonProjectService.list(queryWrapper);
-		return Result.OK(list);
+		List<PayCommonProjectOutput> 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;
+}