转账审批详情接口修改

gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/InvoiceManageController.java

@@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.finance.dto.InvoiceManageDTO;
 import com.gic.finance.qo.InvoiceManageListQueryQO;
 import com.gic.finance.service.InvoiceManageApiService;
-import com.gic.finance.web.utils.ResultControllerUtils;
 import com.gic.finance.web.vo.InvoiceManageListVO;
 
 /**

gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/TransferAccountsApprovalController.java

 package com.gic.finance.web.controller;
 
+import com.gic.finance.web.vo.TransferApprovalDetailVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,10 +8,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.finance.dto.TransferAccountsApprovalDTO;
 import com.gic.finance.qo.TransferListQueryQO;
 import com.gic.finance.service.TransferAccountsApprovalApiService;
-import com.gic.finance.web.utils.ResultControllerUtils;
 import com.gic.finance.web.vo.TransferApprovalListVO;
 
 /**
@@ -40,7 +41,7 @@ public class TransferAccountsApprovalController {
 
     @RequestMapping("/get-approval")
     public RestResponse getById(Integer id) {
-        return ResultControllerUtils.commonResult(transferAccountsApprovalApiService.getById(id));
+        return ResultControllerUtils.commonResultOne(transferAccountsApprovalApiService.getById(id), TransferApprovalDetailVO.class);
     }
 
     @RequestMapping("/agree-approval")

gic-platform-finance-web/src/main/java/com/gic/finance/web/utils/ResultControllerUtils.java

-package com.gic.finance.web.utils;
-
-import com.gic.api.base.commons.Page;
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.commons.util.EntityUtil;
-import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.enterprise.exception.CommonException;
-
-import java.util.List;
-/**
- * controller统一返回结果
- * @ClassName: ResultControllerUtils

- * @Description: 

- * @author guojuxing

- * @date 2019/8/27 10:14 AM

- */
-public class ResultControllerUtils {
-
-    /**
-     * 返回分页正确结果
-     * @Title: commonResultPage

-     * @Description:
-    
 * @author guojuxing
-     * @param response

-     * @return  java.lang.Object

-    
 */
-    public static Page commonResultPage(ServiceResponse response, Class<?> clazz) {
-        if (response.isSuccess()) {
-            Page page = (Page) response.getResult();
-            page.setResult(EntityUtil.changeEntityListNew(clazz, page.getResult()));
-            return page;
-        } else {
-            throw new CommonException(response);
-        }
-    }
-
-    /**
-     * 统一返回成功结果（分页DTO转为VO）
-     * @Title: commonResultOfListVO

-     * @Description:
-    
 * @author guojuxing
-     * @param response
-     * @param clazz

-     * @return  com.gic.commons.webapi.reponse.RestResponse

-    
 */
-    public static RestResponse commonPageResult(ServiceResponse response, Class<?> clazz) {
-        if (response.isSuccess()) {
-            Page page = (Page) response.getResult();
-            page.setResult(EntityUtil.changeEntityListNew(clazz, page.getResult()));
-            return RestResponse.success(page);
-        } else {
-            return RestResponse.failure(response.getCode(), response.getMessage());
-        }
-    }
-
-    /**
-     * 统一返回成功结果（DTO转为VO）
-     * @Title: commonResultOfListVO

-     * @Description:
-    
 * @author guojuxing
-     * @param response
-     * @param clazz

-     * @return  com.gic.commons.webapi.reponse.RestResponse

-    
 */
-    public static RestResponse commonResult(ServiceResponse response, Class<?> clazz) {
-        if (response.isSuccess()) {
-            return RestResponse.success(EntityUtil.changeEntityListNew(clazz, (List<?>) response.getResult()));
-        } else {
-            return RestResponse.failure(response.getCode(), response.getMessage());
-        }
-    }
-
-    /**
-     * 返回正确结果
-     * @Title: commonResultObject

-     * @Description:
-    
 * @author guojuxing
-     * @param response

-     * @return  java.lang.Object

-    
 */
-    public static Object commonResultObject(ServiceResponse response) {
-        if (response.isSuccess()) {
-            return response.getResult();
-        } else {
-            throw new CommonException(response);
-        }
-    }
-
-    /**
-     * 返回分页正确结果
-     * @Title: commonResultPage

-     * @Description:
-    
 * @author guojuxing
-     * @param response

-     * @return  java.lang.Object

-    
 */
-    public static Page commonResultPage(ServiceResponse response) {
-        if (response.isSuccess()) {
-            return (Page) response.getResult();
-        } else {
-            throw new CommonException(response);
-        }
-    }
-
-    /**
-     * 统一返回成功结果
-     * @Title: commonResult

-     * @Description:
-    
 * @author guojuxing
-     * @param response

-     * @return  java.lang.Object

-    
 */
-    public static RestResponse commonResult(ServiceResponse response) {
-        if (response.isSuccess()) {
-            return RestResponse.success(response.getResult());
-        } else {
-            return RestResponse.failure(response.getCode(), response.getMessage());
-        }
-    }
-}

gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalDetailVO.java

+package com.gic.finance.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.gic.finance.constant.EnterprisePlatformTypeEnum;
+import com.gic.finance.constant.InitiatorTypeEnum;
+import com.gic.finance.constant.TransferAccountApprovalStatusEnum;
+
+/**
+ * 转账审批详情VO
+ * @ClassName: TransferApprovalListVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/9 5:38 PM

+ */
+public class TransferApprovalDetailVO implements Serializable{
+
+    private static final long serialVersionUID = -5498377111887141636L;
+    private Integer transferApprovalId;
+
+    /**
+     * 关联订单平台方（商户类型）1:GIC 2: 好办
+     */
+    private Integer platformType;
+    /**
+     * 商户类型名称
+     */
+    private String platformTypeStr;
+
+    /**
+     * 商户名称
+     */
+    private String enterpriseName;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 发起方1：商户 2:运维后台
+     */
+    private Integer initiatorType;
+    /**
+     * 发起方名称
+     */
+    private String initiatorTypeStr;
+
+    /**
+     * 发起方姓名
+     */
+    private String initiatorName;
+
+    /**
+     * 发起方电话
+     */
+    private String initiatorPhone;
+    /**
+     * 发起方手机国际区号
+     */
+    private String initiatorPhoneCode;
+
+    /**
+     * 订单创建时间时间
+     */
+    private Date initiatorCreateTime;
+
+    /**
+     * 计划金额
+     */
+    private Double plannedAmount;
+
+    /**
+     * 坏账金额
+     */
+    private Double badAmount;
+
+    /**
+     * 验证码
+     */
+    private String verifyCode;
+
+    /**
+     * 审批流水号
+     */
+    private String approvalNumber;
+
+    /**
+     * 审批状态 1:待审批 2:已取消 3:已驳回 4:审批通过
+     */
+    private Integer approvalStatus;
+    /**
+     * 审批状态 名称
+     */
+    private String approvalStatusStr;
+
+    /**
+     * 审批人姓名
+     */
+    private String approvalName;
+
+    /**
+     * 审批人手机号码
+     */
+    private String approvalPhone;
+
+    /**
+     * 审批人手机号国际区号
+     */
+    private String approvalPhoneAreaCode;
+
+    /**
+     * 审批时间
+     */
+    private Date approvalTime;
+
+    public Integer getTransferApprovalId() {
+        return transferApprovalId;
+    }
+
+    public void setTransferApprovalId(Integer transferApprovalId) {
+        this.transferApprovalId = transferApprovalId;
+    }
+
+    public void setPlatformType(Integer platformType) {
+        this.platformType = platformType;
+    }
+
+    public String getPlatformTypeStr() {
+        return EnterprisePlatformTypeEnum.getMessageByCode(platformType);
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public void setInitiatorType(Integer initiatorType) {
+        this.initiatorType = initiatorType;
+    }
+
+    public String getInitiatorTypeStr() {
+        return InitiatorTypeEnum.getMessageByCode(initiatorType);
+    }
+
+    public String getInitiatorName() {
+        return initiatorName;
+    }
+
+    public void setInitiatorName(String initiatorName) {
+        this.initiatorName = initiatorName;
+    }
+
+    public Double getPlannedAmount() {
+        return plannedAmount;
+    }
+
+    public void setPlannedAmount(Double plannedAmount) {
+        this.plannedAmount = plannedAmount;
+    }
+
+    public Double getBadAmount() {
+        return badAmount;
+    }
+
+    public void setBadAmount(Double badAmount) {
+        this.badAmount = badAmount;
+    }
+
+    public String getVerifyCode() {
+        return verifyCode;
+    }
+
+    public void setVerifyCode(String verifyCode) {
+        this.verifyCode = verifyCode;
+    }
+
+    public String getApprovalNumber() {
+        return approvalNumber;
+    }
+
+    public void setApprovalNumber(String approvalNumber) {
+        this.approvalNumber = approvalNumber;
+    }
+
+    public void setApprovalStatus(Integer approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getApprovalStatusStr() {
+        return TransferAccountApprovalStatusEnum.getMessageBuCode(approvalStatus);
+    }
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
+    }
+
+    public Date getApprovalTime() {
+        return approvalTime;
+    }
+
+    public void setApprovalTime(Date approvalTime) {
+        this.approvalTime = approvalTime;
+    }
+
+    public String getInitiatorPhone() {
+        return initiatorPhone;
+    }
+
+    public void setInitiatorPhone(String initiatorPhone) {
+        this.initiatorPhone = initiatorPhone;
+    }
+
+    public String getInitiatorPhoneCode() {
+        return initiatorPhoneCode;
+    }
+
+    public void setInitiatorPhoneCode(String initiatorPhoneCode) {
+        this.initiatorPhoneCode = initiatorPhoneCode;
+    }
+
+    public Date getInitiatorCreateTime() {
+        return initiatorCreateTime;
+    }
+
+    public void setInitiatorCreateTime(Date initiatorCreateTime) {
+        this.initiatorCreateTime = initiatorCreateTime;
+    }
+
+    public String getApprovalPhone() {
+        return approvalPhone;
+    }
+
+    public void setApprovalPhone(String approvalPhone) {
+        this.approvalPhone = approvalPhone;
+    }
+
+    public String getApprovalPhoneAreaCode() {
+        return approvalPhoneAreaCode;
+    }
+
+    public void setApprovalPhoneAreaCode(String approvalPhoneAreaCode) {
+        this.approvalPhoneAreaCode = approvalPhoneAreaCode;
+    }
+}