Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue

@@ -310,10 +310,6 @@ export default {
       }
     }
   },
-  created() {
-    // 初始化变量
-    this.getList()
-  },
   mounted() {
     getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
       if (res.success) {
@@ -383,11 +379,28 @@ export default {
       this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.listQuery.params.menuUrl = this.$route.path
-      req.listPage(this.listQuery).then(response => {
+      req.listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
+          if (this.list.length > 0) {
+            this.list.forEach((e) => {
+              if (e.updateDate !== '' && e.updateDate !== null) {
+                if (new Date(e.dueDate) > new Date(e.updateDate)) {
+                  e.nowOverdue = '1'
+                } else {
+                  if ((parseFloat(e.outstandingMoney !== '' ? e.outstandingMoney : 0) + parseFloat(e.bankBeInter !== '' ? e.bankBeInter : 0) + parseFloat(e.fund !== '' ? e.fund : 0)) > 0) {
+                    e.nowOverdue = '1'
+                  } else {
+                    e.nowOverdue = '0'
+                  }
+                }
+              } else {
+                e.nowOverdue = '1'
+              }
+            })
+          }
         } else {
           this.list = []
           this.listQuery.total = 0

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java

@@ -86,4 +86,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
     void saveList(@Param("list") List<LoanRepaymentHistory> list);
 
     List<AppRepaymentHistoryRecord> selSchSidAndVinNo(@Param("scheduleSid") String scheduleSid,@Param("vinNo") String vinNo);
+
+    IPage<RepaymentStatisticsVo> repaymentStatistics2(IPage<LoanRepaymentHistory> page, @Param(Constants.WRAPPER)QueryWrapper<LoanRepaymentHistory> qw);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -920,4 +920,84 @@
         WHERE d.vinNo = #{vinNo}
           AND h.scheduleSid = #{scheduleSid}
     </select>
+    <select id="repaymentStatistics2"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsVo">
+        SELECT
+        a.*,
+        (SELECT
+        (fjj.reveivableMoney - fjj.m)
+        FROM
+        (SELECT
+        IFNULL((SELECT SUM(subscriptionMoney) FROM anrui_fin.fin_selected_receivables_detailed as s
+        WHERE s.auditState = '3'
+        and s.receivablesSid = fj.sid),0) as m,
+        fj.*
+        FROM
+        (SELECT j.busSid,j.sid,j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j
+        WHERE j.payCostTitleKey = '006') as fj ) as fjj
+        WHERE fjj.busSid = a.sid) as fund
+        FROM
+        (
+        SELECT
+        pd.busVinSid,
+        pd.dueDate,
+        pd.createBySid,
+        pd.orgSidPath,
+        pd.sid,
+        pd.useOrgName,
+        pd.dept,
+        pd.bankName,
+        pd.staffName,
+        pd.loanContractNo,
+        pd.vinNo,
+        pd.bankContractNo,
+        pd.customer,
+        pd.borrowerName,
+        pd.period,
+        pd.paymentMoney,
+        pd.paymentInterest as bankBeInter,
+        pd.dueMoney,
+        t.repaidMoney,
+        t.outstandingMoney,
+        pd.overdue as dueOverdue,
+        pd.updateTime as updateDate,
+        CASE
+        WHEN t.repaidMoney = 0 THEN
+        '01'
+        WHEN t.repaidMoney &gt; 0
+        AND t.repaidMoney &lt; pd.dueMoney THEN '02' WHEN t.repaidMoney &gt; 0
+        AND t.repaidMoney &gt;= pd.dueMoney THEN
+        '03'
+        END AS returnState
+        FROM
+        loan_repayment_plan_details AS pd
+        LEFT JOIN (
+        SELECT
+        p.sid,
+        IFNULL((SELECT
+        SUM(
+        IFNULL( h.actualMoney, 0 ))
+        FROM
+        loan_repayment_history AS h
+        WHERE
+        h.planDetailSid = p.sid
+        AND h.updateState = '1'),0) as repaidMoney
+        ,
+        IFNULL(
+        (p.dueMoney - IFNULL((SELECT
+        SUM(IFNULL( h.actualMoney, 0 ))
+        FROM
+        loan_repayment_history AS h
+        WHERE
+        h.planDetailSid = p.sid
+        AND h.updateState = '1'
+        ),0)),0) AS outstandingMoney
+        FROM
+        loan_repayment_plan_details AS p
+        ) AS t ON pd.sid = t.sid
+        ) AS a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java

@@ -153,7 +153,7 @@ public class LoanRepaymentHistoryRest implements LoanRepaymentHistoryFeign {
     @Override
     public ResultBean<PagerVo<RepaymentStatisticsVo>> repaymentStatistics(PagerQuery<RepaymentStatisticsQuery> pq) {
         ResultBean<PagerVo<RepaymentStatisticsVo>> rb = ResultBean.fireFail();
-        PagerVo<RepaymentStatisticsVo> pv = loanRepaymentHistoryService.repaymentStatistics(pq);
+        PagerVo<RepaymentStatisticsVo> pv = loanRepaymentHistoryService.repaymentStatistics2(pq);
         return rb.success().setData(pv);
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -1332,7 +1332,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.apply(StringUtils.isNotEmpty(updateStartDate), "date_format (a.updateDate,'%Y-%m-%d') >= date_format('" + updateStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(updateEndDate), "date_format (a.updateDate,'%Y-%m-%d') <= date_format('" + updateEndDate + "','%Y-%m-%d')"
                 );
-        qw.eq("1", "1");
         qw.orderBy(true, true, "a.useOrgName")
                 .orderBy(true, true, "a.vinNo")
                 .orderBy(true, true, "a.period")
@@ -1393,6 +1392,107 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         return pagerVo;
     }
 
+
+    public PagerVo<RepaymentStatisticsVo> repaymentStatistics2(PagerQuery<RepaymentStatisticsQuery> pq) {
+        IPage<LoanRepaymentHistory> page = PagerUtil.queryToPage(pq);
+        RepaymentStatisticsQuery pagerQuery = pq.getParams();
+        QueryWrapper<LoanRepaymentHistory> qw = new QueryWrapper<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //=======================
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
+        privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
+        privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
+        privilegeQuery.setUserSid(pagerQuery.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = pagerQuery.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("a.createBySid", pagerQuery.getUserSid());
+            } else {
+                PagerVo<RepaymentStatisticsVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<RepaymentStatisticsVo> p = new PagerVo<>();
+            return p;
+        }
+        //=======================
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
+            qw.like("a.useOrgName", pagerQuery.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
+            qw.like("a.vinNo", pagerQuery.getVinNo());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getDept())) {
+            qw.like("a.dept", pagerQuery.getDept());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getReturnState())) {
+            qw.eq("a.returnState", pagerQuery.getReturnState());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
+            qw.like("a.staffName", pagerQuery.getStaffName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
+            qw.like("a.loanContractNo", pagerQuery.getLoanContractNo());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getPeriod())) {
+            qw.eq("a.period", pagerQuery.getPeriod());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
+            qw.like("a.bankName", pagerQuery.getBankName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) {
+            qw.like("a.bankContractNo", pagerQuery.getBankContractNo());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getCustomer())) {
+            qw.like("a.customer", pagerQuery.getCustomer());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) {
+            qw.like("a.borrowerName", pagerQuery.getBorrowerName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getDueOverdue())) {
+            qw.eq("a.dueOverdue", pagerQuery.getDueOverdue());
+        }
+        String dueStartDate = pagerQuery.getDueStartDate();
+        String dueEndDate = pagerQuery.getDueEndDate();
+        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
+                );
+        String updateStartDate = pagerQuery.getUpdateStartDate();
+        String updateEndDate = pagerQuery.getUpdateEndDate();
+        qw.apply(StringUtils.isNotEmpty(updateStartDate), "date_format (a.updateDate,'%Y-%m-%d') >= date_format('" + updateStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(updateEndDate), "date_format (a.updateDate,'%Y-%m-%d') <= date_format('" + updateEndDate + "','%Y-%m-%d')"
+                );
+        qw.orderBy(true, true, "a.useOrgName")
+                .orderBy(true, true, "a.vinNo")
+                .orderBy(true, true, "a.period")
+                .orderBy(true, true, "a.loanContractNo")
+        ;
+        IPage<RepaymentStatisticsVo> pagging = baseMapper.repaymentStatistics2(page, qw);
+        PagerVo<RepaymentStatisticsVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     /**
      * 分页方法
      */
@@ -1529,7 +1629,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (a.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(updateEndTime), "date_format (a.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("1", "1");
         qw.orderBy(true, true, "a.useOrgName")
                 .orderBy(true, true, "a.vinNo")
                 .orderBy(true, false, "a.createTime")
@@ -1615,7 +1714,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.apply(StringUtils.isNotEmpty(head), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(last), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
                 );
-        qw.eq("1", "1");
         qw.orderBy(true, true, "a.useOrgName")
                 .orderBy(true, true, "a.vinNo")
                 .orderBy(true, true, "a.period")
@@ -1835,7 +1933,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.apply(StringUtils.isNotEmpty(updateStartDate), "date_format (a.updateDate,'%Y-%m-%d') >= date_format('" + updateStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(updateEndDate), "date_format (a.updateDate,'%Y-%m-%d') <= date_format('" + updateEndDate + "','%Y-%m-%d')"
                 );
-        qw.eq("1", "1");
         qw.orderBy(true, true, "a.useOrgName")
                 .orderBy(true, true, "a.vinNo")
                 .orderBy(true, true, "a.period")
@@ -1998,7 +2095,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (a.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(updateEndTime), "date_format (a.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("1", "1");
         qw.orderBy(true, true, "a.useOrgName")
                 .orderBy(true, true, "a.vinNo")
                 .orderBy(true, true, "a.period")

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue

@@ -41,8 +41,8 @@
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
               <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
-              <el-button type="primary" size="small">待确认返利</el-button>
-              <el-button type="primary" size="small">未调整</el-button>
+<!--              <el-button type="primary" size="small">待确认返利</el-button>-->
+<!--              <el-button type="primary" size="small">未调整</el-button>-->
             </div>
           </div>
         </div>
@@ -62,7 +62,7 @@
             </el-table-column>
             <el-table-column label="状态" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.state === '0' ? '未计提' : scope.row.state === '1' ? '已计提' : scope.row.state === '2' ? '已核对' : '' }}</span>
+                <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : '' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="品牌" align="center" width="200">
@@ -290,15 +290,23 @@ export default {
       rebateType_list: [],
       state_list: [
         {
-          dictKey: 0,
+          dictKey: '0',
           dictValue: '未计提'
         },
         {
-          dictKey: 1,
-          dictValue: '已计提'
+          dictKey: '1',
+          dictValue: '计提中'
         },
         {
-          dictKey: 2,
+          dictKey: '2',
+          dictValue: '待核对'
+        },
+        {
+          dictKey: '3',
+          dictValue: '核对中'
+        },
+        {
+          dictKey: '4',
           dictValue: '已核对'
         }
       ],