缴费审核

jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java

@@ -11,6 +11,7 @@ import com.jero.payment.service.IPayPaymentRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,6 +41,19 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
         return Result.OK(map);
     }
 
+    /**
+     *   来款子列表，详细记录列表
+     * @return
+     */
+    @ApiOperation(value="来款子列表，详细记录列表", notes="来款子列表，详细记录列表")
+    @GetMapping(value = "/amountReceivedSubList")
+    public Result<?> amountReceivedSubList(String id) {
+
+        List<PayPaymentRecordSub> list=payPaymentCheckService.amountReceivedSubList(id);
+
+        return Result.OK(list);
+    }
+
    @ApiOperation(value="申请", notes="申请")
    @PostMapping(value = "/applicant")
    public Result<?> applicant(@RequestBody PayPaymentRecord payPaymentRecord) {
@@ -54,6 +68,7 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
 
    @ApiOperation(value="审核", notes="审核")
    @PostMapping(value = "/check")
+   @RequiresPermissions("incomePaymentAndInvoiving:audit")
    public Result<?> check(@RequestBody PayPaymentRecord payPaymentRecord) {
        try{
            payPaymentCheckService.check(payPaymentRecord);

jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java

@@ -137,7 +137,7 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 		LambdaQueryWrapper<PayPaymentRecord> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(PayPaymentRecord::getProjectId, id);
 		wrapper.eq(PayPaymentRecord::getPaymentStatus, PaymentStatusEnum.COMPLETED.getCode());
-		wrapper.orderByAsc(PayPaymentRecord::getPaymentDate);
+		wrapper.orderByAsc(PayPaymentRecord::getCreateTime);
 		List<PayPaymentRecord> list = payPaymentRecordService.list(wrapper);
 
 		return Result.OK(list);

jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java

@@ -1,6 +1,7 @@
 package com.jero.payment.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -88,9 +89,12 @@ public class PayPaymentRecordSub implements Serializable {
      * 	COMPLETED("completed");//已同意
      */
     @ApiModelProperty(value = "缴费状态")
-    @Dict(dicCode = "payment_record_status")
+//    @Dict(dicCode = "payment_record_status")
     private String paymentStatus;
 
+    @TableField(exist = false)
+    private String paymentStatus_dictText;
+
     @ApiModelProperty(value = "审核人id")
     private String reviewerId;
 

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java

@@ -6,6 +6,7 @@ import com.jero.payment.entity.PayPaymentRecord;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,6 +18,11 @@ public interface IPayPaymentCheckService extends IService<PayPaymentRecordSub> {
      */
     Map<String,Object> amountReceivedList(String id, String projectType);
 
+    /**
+     *  来款子列表，详细记录列表
+     */
+    List<PayPaymentRecordSub> amountReceivedSubList(String id);
+
     /**
      *  申请
      * @param payPaymentRecord

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java

@@ -57,6 +57,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
     private PayPaymentCheckMapper payPaymentCheckMapper;
     @Autowired
     private IPayPaymentRecordService payPaymentRecordService;
+    @Autowired
+    private IPayPaymentCheckService payPaymentCheckService;
     @Resource
     private PayPaymentRecordMapper payPaymentRecordMapper;
     @Resource
@@ -88,7 +90,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         //列表
         LambdaQueryWrapper<PayPaymentRecord> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PayPaymentRecord::getProjectId, id);
-        wrapper.orderByDesc(PayPaymentRecord::getPaymentDate);
+        wrapper.orderByDesc(PayPaymentRecord::getCreateTime);
         List<PayPaymentRecord> list = payPaymentRecordService.list(wrapper);
         list.forEach(p-> {
             if(StringUtils.isNotBlank(p.getPaymentStatus())){
@@ -130,6 +132,25 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
         return map;
     }
+
+    /**
+     *  来款子列表，详细记录列表
+     */
+    @Override
+    public List<PayPaymentRecordSub> amountReceivedSubList(String id) {
+        //列表
+        LambdaQueryWrapper<PayPaymentRecordSub> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PayPaymentRecordSub::getProjectId, id);
+        wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime);
+        List<PayPaymentRecordSub> list = payPaymentCheckService.list(wrapper);
+        list.forEach(p -> {
+            if (StringUtils.isNotBlank(p.getPaymentStatus())) {
+                p.setPaymentStatus_dictText(sysBaseAPI.translateDict("payment_record_status", String.valueOf(p.getPaymentStatus())));
+            }
+        });
+
+        return list;
+    }
     /**
      *  申请
      * @param payPaymentRecord