Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -37,6 +37,7 @@ public enum BillTypeEnum {
     JCECQRD("JCECQRD", "交车资料二次确认单"),
     HKSQ("HKSQ", "划扣申请单据编号"),
     DSDFSQ("DSDFSQ", "代收代付申请单据编号"),
+    YHJT("YHJT", "月还计提单据编号"),
     FKCEQRSQ("FKCEQRSQ", "放款差额确认申请");
 
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java

@@ -23,6 +23,7 @@ public enum LoanFileEnum {
     BUCKLE_APPLY("014", "划扣申请附件"),
     BEPADSINCERE("015", "逾期垫款附件"),
     TRANSFERPAYMENT("016", "代收代付附件"),
+    ACCRUALAPPLY("017", "月还计提附件"),
     ;
 
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply;
 
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.flow.TransferDelegateQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -15,5 +16,75 @@ import java.util.List;
 public class LoanMonthlyAccrualApplyFallback implements LoanMonthlyAccrualApplyFeign {
 
 
+    @Override
+    public ResultBean<LoanMonthlyAccrualApplyInit> accrualInit(String orgPath) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> saveAccrual(LoanMonthlyAccrualApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<LoanMonthlyAccrualApplyVo>> listPage(PagerQuery<LoanMonthlyAccrualApplyQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanMonthlyAccrualApplyInit> accrualDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean submitRecordApplication(SubmitAccrualDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(AccrualCompleteDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(AccrualTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean taskReject(AccrualTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(AccrualTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean flowRecord(String procInsId) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<AccrualGetNodeVo>> getNextNodesForSubmit(AccrualGetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<AccrualGetNodeVo>> getPreviousNodesForReject(AccrualGetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delegate(AccrualDelegateQuery query) {
+        return null;
+    }
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java

@@ -1,7 +1,19 @@
 package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply;
 
+import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.flow.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 
 /**
@@ -17,6 +29,65 @@ import org.springframework.cloud.openfeign.FeignClient;
         fallback = LoanMonthlyAccrualApplyFallback.class)
 public interface LoanMonthlyAccrualApplyFeign {
 
+    @ApiOperation("新增初始化")
+    @GetMapping("/accrualInit")
+    @ResponseBody
+    public ResultBean<LoanMonthlyAccrualApplyInit> accrualInit(@RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveAccrual")
+    @ResponseBody
+    public ResultBean<String> saveAccrual(@RequestBody LoanMonthlyAccrualApplyDto dto);
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanMonthlyAccrualApplyVo>> listPage(@RequestBody PagerQuery<LoanMonthlyAccrualApplyQuery> pq);
+
+    @ApiOperation("详情查看")
+    @GetMapping("/accrualDetails")
+    @ResponseBody
+    public ResultBean<LoanMonthlyAccrualApplyInit> accrualDetails(@RequestParam("sid") String sid);
+
+    @ApiOperation("批量删除")
+    @DeleteMapping("/deleteBySids")
+    @ResponseBody
+    public ResultBean deleteBySids(@RequestBody String[] sids);
+
+    //---------------------------流程---------------------------------------
+
+    @ApiOperation("提交")
+    @PostMapping("/submit")
+    public ResultBean submitRecordApplication(@RequestBody @Valid SubmitAccrualDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody AccrualCompleteDto dto);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody AccrualTaskQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody AccrualTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@RequestBody AccrualTaskQuery query);
+
+    @ApiOperation(value = "流程历史流转记录")
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<AccrualGetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AccrualGetNodeQuery query);
 
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<AccrualGetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AccrualGetNodeQuery query);
 
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody AccrualDelegateQuery query);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyVo.java

@@ -32,5 +32,4 @@ public class LoanMonthlyAccrualApplyVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks; // 备注
 
-
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyPlanRecord.java

@@ -18,8 +18,6 @@ public class LoanMonthlyPlanRecord {
     private String bankName;
     @ApiModelProperty("资方合同")
     private String bankContractNo;
-    @ApiModelProperty("客户")
-    private String customer;
     @ApiModelProperty("借款人名称")
     private String borrowerName;
     @ApiModelProperty("期数")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.java

@@ -7,18 +7,25 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApply;
+import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyVo;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 
 @Mapper
 public interface LoanMonthlyAccrualApplyMapper extends BaseMapper<LoanMonthlyAccrualApply> {
+    List<LoanMonthlyAccrualApply> selByNewDate(@Param(Constants.WRAPPER) QueryWrapper<LoanMonthlyAccrualApply> qw);
+
+    List<LoanRepaymentPlanDetails> selRepaymentDetailsByDueDate(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentPlanDetails> queryWrapper);
+
+    int selectNum(String bill);
+
+    IPage<LoanMonthlyAccrualApplyVo> listPage(IPage<LoanMonthlyAccrualApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanMonthlyAccrualApply> qw);
+
+    int updateFlowFiled(Map<String, Object> map);
 
-//    IPage<LoanBuckleApplyVo> listPage(IPage<LoanBuckleApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanBuckleApply> qw);
-//
-//    int updateFlowFiled(Map<String, Object> map);
-//
-//    int selectNum(String bill);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyMapper">
     <update id="updateFlowFiled">
-        UPDATE loan_buckle_apply
+        UPDATE loan_monthly_accrual_apply
         SET nodeState=#{nodeState}
         , nodeSid=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
@@ -17,7 +17,7 @@
         WHERE sid = #{sid}
     </update>
 
-    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo">
+    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyVo">
         SELECT
         sid,
         nodeState,
@@ -29,14 +29,32 @@
         billNo,
         procDefId,
         procInstId
-        FROM loan_buckle_apply
+        FROM loan_monthly_accrual_apply
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
     <select id="selectNum" resultType="java.lang.Integer">
         select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
-        from loan_buckle_apply
+        from loan_monthly_accrual_apply
         where billNo LIKE concat(#{bill}, '%')
     </select>
+    <select id="selByNewDate"
+            resultType="com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApply">
+        SELECT
+        *
+        FROM loan_monthly_accrual_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="selRepaymentDetailsByDueDate"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
+        SELECT
+        *
+        FROM loan_repayment_plan_details
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java

@@ -3,10 +3,8 @@ package com.yxt.anrui.riskcenter.biz.loanmonthlyaccrualapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.riskcenter.api.loanbuckleapply.*;
-import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
-import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyFeign;
+import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.*;
+import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -26,82 +24,80 @@ public class LoanMonthlyAccrualApplyRest implements LoanMonthlyAccrualApplyFeign
     @Autowired
     LoanMonthlyAccrualApplyService loanMonthlyAccrualApplyService;
 
-//    @Override
-//    public ResultBean<PagerVo<LoanBuckleApplyVo>> listPage(PagerQuery<LoanBuckleApplyQuery> pq) {
-//        ResultBean<PagerVo<LoanBuckleApplyVo>> rb = ResultBean.fireFail();
-//        PagerVo<LoanBuckleApplyVo> pv = loanBuckleApplyService.listPage(pq);
-//        return rb.success().setData(pv);
-//    }
-//
-//    @Override
-//    public ResultBean<LoanBuckleApplyInit> buckleInit(String[] sids) {
-//        return loanBuckleApplyService.buckleInit(sids);
-//    }
-//
-//
-//
-//    @Override
-//    public ResultBean<String> saveBuckle(LoanBuckleApplyDto dto) {
-//        return loanBuckleApplyService.saveBuckle(dto);
-//    }
-//
-//    @Override
-//    public ResultBean<LoanBuckleApplyInit> buckleDetails(String sid) {
-//        return loanBuckleApplyService.buckleDetails(sid);
-//    }
-//
-//    @Override
-//    public ResultBean deleteBySids(String[] sids) {
-//        return loanBuckleApplyService.deleteBySids(sids);
-//    }
-
-//    @Override
-//    public ResultBean submitRecordApplication(SubmitBuckleDto dto) {
-//        return loanBuckleApplyService.submitRecordApplication(dto);
-//    }
-//
-//    @Override
-//    public ResultBean complete(BuckleCompleteDto dto) {
-//        BusinessVariables bv = new BusinessVariables();
-//        BeanUtil.copyProperties(dto, bv);
-//        bv.setModelId(ProcDefEnum.LOANBUCKLEAPPLLY.getProDefId());
-//        return loanBuckleApplyService.complete(bv);
-//    }
-//
-//    @Override
-//    public ResultBean revokeProcess(BuckleTaskQuery query) {
-//        return loanBuckleApplyService.revokeProcess(query);
-//    }
-//
-//    @Override
-//    public ResultBean taskReject(BuckleTaskQuery query) {
-//        return loanBuckleApplyService.taskReject(query);
-//    }
-//
-//    @Override
-//    public ResultBean breakProcess(BuckleTaskQuery query) {
-//        return loanBuckleApplyService.breakProcess(query);
-//    }
-//
-//    @Override
-//    public ResultBean flowRecord(String procInsId) {
-//        return loanBuckleApplyService.flowRecord(procInsId);
-//    }
-//
-//    @Override
-//    public ResultBean<List<BuckleGetNodeVo>> getNextNodesForSubmit(BuckleGetNodeQuery query) {
-//        return loanBuckleApplyService.getNextNodesForSubmit(query);
-//    }
-//
-//    @Override
-//    public ResultBean<List<BuckleGetNodeVo>> getPreviousNodesForReject(BuckleGetNodeQuery query) {
-//        return loanBuckleApplyService.getPreviousNodesForReject(query);
-//    }
-//
-//    @Override
-//    public ResultBean delegate(BuckleDelegateQuery query) {
-//        return loanBuckleApplyService.delegate(query);
-//    }
+    @Override
+    public ResultBean<PagerVo<LoanMonthlyAccrualApplyVo>> listPage(PagerQuery<LoanMonthlyAccrualApplyQuery> pq) {
+        ResultBean<PagerVo<LoanMonthlyAccrualApplyVo>> rb = ResultBean.fireFail();
+        PagerVo<LoanMonthlyAccrualApplyVo> pv = loanMonthlyAccrualApplyService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<LoanMonthlyAccrualApplyInit> accrualInit(String orgPath) {
+        return loanMonthlyAccrualApplyService.accrualInit(orgPath);
+    }
+
+    @Override
+    public ResultBean<String> saveAccrual(LoanMonthlyAccrualApplyDto dto) {
+        return loanMonthlyAccrualApplyService.saveAccrual(dto);
+    }
+
+    @Override
+    public ResultBean<LoanMonthlyAccrualApplyInit> accrualDetails(String sid) {
+        return loanMonthlyAccrualApplyService.accrualDetails(sid);
+    }
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return loanMonthlyAccrualApplyService.deleteBySids(sids);
+    }
+
+    @Override
+    public ResultBean submitRecordApplication(SubmitAccrualDto dto) {
+        return loanMonthlyAccrualApplyService.submitRecordApplication(dto);
+    }
+
+    @Override
+    public ResultBean complete(AccrualCompleteDto dto) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(dto, bv);
+        bv.setModelId(ProcDefEnum.MONTHLYACCRUAL.getProDefId());
+        return loanMonthlyAccrualApplyService.complete(bv);
+    }
+
+    @Override
+    public ResultBean revokeProcess(AccrualTaskQuery query) {
+        return loanMonthlyAccrualApplyService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean taskReject(AccrualTaskQuery query) {
+        return loanMonthlyAccrualApplyService.taskReject(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(AccrualTaskQuery query) {
+        return loanMonthlyAccrualApplyService.breakProcess(query);
+    }
+
+    @Override
+    public ResultBean flowRecord(String procInsId) {
+        return loanMonthlyAccrualApplyService.flowRecord(procInsId);
+    }
+
+    @Override
+    public ResultBean<List<AccrualGetNodeVo>> getNextNodesForSubmit(AccrualGetNodeQuery query) {
+        return loanMonthlyAccrualApplyService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean<List<AccrualGetNodeVo>> getPreviousNodesForReject(AccrualGetNodeQuery query) {
+        return loanMonthlyAccrualApplyService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean delegate(AccrualDelegateQuery query) {
+        return loanMonthlyAccrualApplyService.delegate(query);
+    }