缴费审核

jero-boot-incoming-payment/src/main/java/com/jero/common/enums/PaymentStatusEnum.java

@@ -8,7 +8,7 @@ public enum PaymentStatusEnum {
 	TO_BE_UPLOADED("toBeUploaded"),//待上传
 	TO_BE_REVIEWED("toBeReviewed"),//待审核
 	REJECTED("rejected"),//已拒绝
-	COMPLETED("completed");//已完结
+	COMPLETED("completed");//在外层项目列表代表已完结、在阶段记录列表代表已同意
 
 	private String code;
 

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

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.common.aspect.annotation.Dict;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -86,9 +87,10 @@ public class PayPaymentRecord implements Serializable {
     /**
      * TO_BE_REVIEWED("toBeReviewed"),//待审核
      * 	REJECTED("rejected"),//已拒绝
-     * 	COMPLETED("completed");//已完结
+     * 	COMPLETED("completed");//已同意
      */
     @ApiModelProperty(value = "缴费状态")
+    @Dict(dicCode = "payment_record_status")
     private String paymentStatus;
 
     @ApiModelProperty(value = "审核人id")

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -82,12 +83,12 @@ public class PayPaymentRecordSub implements Serializable {
     private String applicantName;
 
     /**
-     *  toBeUploaded 待上传
-     * 	toBeReviewed 待审核
-     * 	rejected 已拒绝
-     * 	completed 已完结
+     * TO_BE_REVIEWED("toBeReviewed"),//待审核
+     * 	REJECTED("rejected"),//已拒绝
+     * 	COMPLETED("completed");//已同意
      */
     @ApiModelProperty(value = "缴费状态")
+    @Dict(dicCode = "payment_record_status")
     private String paymentStatus;
 
     @ApiModelProperty(value = "审核人id")

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

@@ -157,6 +157,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         //插入来款记录表、子表
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
         payPaymentRecord.setApplicantName(sysUser.getRealname());
+        payPaymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
         payPaymentRecordMapper.insert(payPaymentRecord);
 
         PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();