Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -344,33 +344,26 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         dailyReportAppVo.setRow4(row4);*/
         List<String> row4 = dailyReportVoList.stream().map(v -> {
             String saleOfStockRatio = "";
-            try {
+            String saleAllToThree = String.valueOf(v.getSaleAllToThree());
-
+            String stock_total = String.valueOf(v.getStock_total());
-                Field field = v.getClass().getDeclaredField(String.valueOf(v.getSaleAllToThree()));
+            if (StringUtils.isBlank(saleAllToThree)) {
-                field.setAccessible(true);
+                saleOfStockRatio = stock_total + ":1";
-                String saleAllToThree = (String) field.get(v);//前三个月销售台数之和
+            } else {
-                Field fieldStockTotal = v.getClass().getDeclaredField(String.valueOf(v.getStock_total()));
+                if ("0".equals(saleAllToThree)) {
-                fieldStockTotal.setAccessible(true);
+                    saleOfStockRatio = stock_total + ":1";
-                String stock_total = (String) fieldStockTotal.get(v);//库存总计
+                } else {
-                if(StringUtils.isBlank(saleAllToThree)){
+                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
-                    saleOfStockRatio =stock_total+":1";
-                }else{
-                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
                 }
-                return saleOfStockRatio;
-
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                e.printStackTrace();
             }
             return saleOfStockRatio;
         }).collect(Collectors.toList());
-        int saleAllToThreeAll = dailyReportVoList.stream().mapToInt(v->v.getSaleAllToThree()).sum();
+        int saleAllToThreeAll = dailyReportVoList.stream().mapToInt(v -> v.getSaleAllToThree()).sum();
-        int stock_totalAll = dailyReportVoList.stream().mapToInt(v->v.getStock_total()).sum();
+        int stock_totalAll = dailyReportVoList.stream().mapToInt(v -> v.getStock_total()).sum();
         String saleOfStockRatioString = "";
-        if(saleAllToThreeAll == 0){
+        if (saleAllToThreeAll == 0) {
-            saleOfStockRatioString = stock_totalAll+":1";
+            saleOfStockRatioString = stock_totalAll + ":1";
-        }else{
+        } else {
-            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
+            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
         }
         row4.add(saleOfStockRatioString);
         dailyReportAppVo.setRow4(row4);
@@ -617,13 +610,13 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             for (int i = 0; i < recordList.size(); i++) {
                 DailyReportListVo dailyReportListVo = recordList.get(i);
                 String ratio = "";
-                if(StringUtils.isBlank(dailyReportListVo.getSaleAllToThree())){
+                if (StringUtils.isBlank(dailyReportListVo.getSaleAllToThree())) {
-                    ratio = dailyReportListVo.getStock_subtotal()+":1";
+                    ratio = dailyReportListVo.getStock_subtotal() + ":1";
-                }else{
+                } else {
-                    if("0".equals(dailyReportListVo.getSaleAllToThree())){
+                    if ("0".equals(dailyReportListVo.getSaleAllToThree())) {
-                        ratio = dailyReportListVo.getStock_subtotal()+":1";
+                        ratio = dailyReportListVo.getStock_subtotal() + ":1";
-                    }else{
+                    } else {
-                        ratio = new BigDecimal(dailyReportListVo.getStock_subtotal()).divide((new BigDecimal(dailyReportListVo.getSaleAllToThree()).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
+                        ratio = new BigDecimal(dailyReportListVo.getStock_subtotal()).divide((new BigDecimal(dailyReportListVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
                     }
                 }
                 dailyReportListVo.setSaleOfStockRatio(ratio);
@@ -642,13 +635,13 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         }
         ReportVo reportVo = baseMapper.getReport(qw);
         String ratio = "";
-        if(StringUtils.isBlank(reportVo.getSaleAllToThree())){
+        if (StringUtils.isBlank(reportVo.getSaleAllToThree())) {
-            ratio = reportVo.getStock_subtotal()+":1";
+            ratio = reportVo.getStock_subtotal() + ":1";
-        }else{
+        } else {
-            if("0".equals(reportVo.getSaleAllToThree())){
+            if ("0".equals(reportVo.getSaleAllToThree())) {
-                ratio = reportVo.getStock_subtotal()+":1";
+                ratio = reportVo.getStock_subtotal() + ":1";
-            }else{
+            } else {
-                ratio = new BigDecimal(reportVo.getStock_subtotal()).divide((new BigDecimal(reportVo.getSaleAllToThree()).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
+                ratio = new BigDecimal(reportVo.getStock_subtotal()).divide((new BigDecimal(reportVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
             }
         }
         reportVo.setSaleOfStockRatio(ratio);
@@ -691,33 +684,26 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         dailyReportAppVo.setRow4(row4);*/
         List<String> row4 = dailyReportVoList.stream().map(v -> {
             String saleOfStockRatio = "";
-            try {
+            String saleAllToThree = String.valueOf(v.getSaleAllToThree());
-
+            String stock_total = String.valueOf(v.getStock_total());
-                Field field = v.getClass().getDeclaredField(String.valueOf(v.getSaleAllToThree()));
+            if (StringUtils.isBlank(saleAllToThree)) {
-                field.setAccessible(true);
+                saleOfStockRatio = stock_total + ":1";
-                String saleAllToThree = (String) field.get(v);//前三个月销售台数之和
+            } else {
-                Field fieldStockTotal = v.getClass().getDeclaredField(String.valueOf(v.getStock_total()));
+                if ("0".equals(saleAllToThree)) {
-                fieldStockTotal.setAccessible(true);
+                    saleOfStockRatio = stock_total + ":1";
-                String stock_total = (String) fieldStockTotal.get(v);//库存总计
+                } else {
-                if(StringUtils.isBlank(saleAllToThree)){
+                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
-                    saleOfStockRatio =stock_total+":1";
-                }else{
-                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
                 }
-                return saleOfStockRatio;
-
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                e.printStackTrace();
             }
             return saleOfStockRatio;
         }).collect(Collectors.toList());
-        int saleAllToThreeAll = dailyReportVoList.stream().mapToInt(v->v.getSaleAllToThree()).sum();
+        int saleAllToThreeAll = dailyReportVoList.stream().mapToInt(v -> v.getSaleAllToThree()).sum();
-        int stock_totalAll = dailyReportVoList.stream().mapToInt(v->v.getStock_total()).sum();
+        int stock_totalAll = dailyReportVoList.stream().mapToInt(v -> v.getStock_total()).sum();
         String saleOfStockRatioString = "";
-        if(saleAllToThreeAll == 0){
+        if (saleAllToThreeAll == 0) {
-            saleOfStockRatioString = stock_totalAll+":1";
+            saleOfStockRatioString = stock_totalAll + ":1";
-        }else{
+        } else {
-            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
+            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
         }
         row4.add(saleOfStockRatioString);
         dailyReportAppVo.setRow4(row4);
@@ -985,33 +971,26 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         dailyReportAppVo.setRow4(row4);*/
         List<String> row4 = dailyReportVoList.stream().map(v -> {
             String saleOfStockRatio = "";
-            try {
+            String saleAllToThree = String.valueOf(v.getSaleAllToThree());
-
+            String stock_total = String.valueOf(v.getStock_total());
-                Field field = v.getClass().getDeclaredField(String.valueOf(v.getSaleAllToThree()));
+            if (StringUtils.isBlank(saleAllToThree)) {
-                field.setAccessible(true);
+                saleOfStockRatio = stock_total + ":1";
-                String saleAllToThree = (String) field.get(v);//前三个月销售台数之和
+            } else {
-                Field fieldStockTotal = v.getClass().getDeclaredField(String.valueOf(v.getStock_total()));
+                if ("0".equals(saleAllToThree)) {
-                fieldStockTotal.setAccessible(true);
+                    saleOfStockRatio = stock_total + ":1";
-                String stock_total = (String) fieldStockTotal.get(v);//库存总计
+                } else {
-                if(StringUtils.isBlank(saleAllToThree)){
+                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
-                    saleOfStockRatio =stock_total+":1";
-                }else{
-                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
                 }
-                return saleOfStockRatio;
-
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                e.printStackTrace();
             }
             return saleOfStockRatio;
         }).collect(Collectors.toList());
-        int saleAllToThreeAll = dailyReportVoList.stream().mapToInt(v->v.getSaleAllToThree()).sum();
+        int saleAllToThreeAll = dailyReportVoList.stream().mapToInt(v -> v.getSaleAllToThree()).sum();
-        int stock_totalAll = dailyReportVoList.stream().mapToInt(v->v.getStock_total()).sum();
+        int stock_totalAll = dailyReportVoList.stream().mapToInt(v -> v.getStock_total()).sum();
         String saleOfStockRatioString = "";
-        if(saleAllToThreeAll == 0){
+        if (saleAllToThreeAll == 0) {
-            saleOfStockRatioString = stock_totalAll+":1";
+            saleOfStockRatioString = stock_totalAll + ":1";
-        }else{
+        } else {
-            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
+            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
         }
         row4.add(saleOfStockRatioString);
         dailyReportAppVo.setRow4(row4);
@@ -1305,33 +1284,26 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         dailyReportAppVo.setRow4(row4);*/
         List<String> row4 = dailyReportVoList.stream().map(v -> {
             String saleOfStockRatio = "";
-            try {
+            String saleAllToThree = String.valueOf(v.getSaleAllToThree());
-
+            String stock_total = String.valueOf(v.getStock_total());
-                Field field = v.getClass().getDeclaredField(String.valueOf(v.getSaleAllToThree()));
+            if (StringUtils.isBlank(saleAllToThree)) {
-                field.setAccessible(true);
+                saleOfStockRatio = stock_total + ":1";
-                String saleAllToThree = (String) field.get(v);//前三个月销售台数之和
+            } else {
-                Field fieldStockTotal = v.getClass().getDeclaredField(String.valueOf(v.getStock_total()));
+                if ("0".equals(saleAllToThree)) {
-                fieldStockTotal.setAccessible(true);
+                    saleOfStockRatio = stock_total + ":1";
-                String stock_total = (String) fieldStockTotal.get(v);//库存总计
+                } else {
-                if(StringUtils.isBlank(saleAllToThree)){
+                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
-                    saleOfStockRatio =stock_total+":1";
-                }else{
-                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
                 }
-                return saleOfStockRatio;
-
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                e.printStackTrace();
             }
             return saleOfStockRatio;
         }).collect(Collectors.toList());
-        int saleAllToThreeAll = dailyReportVoList.stream().mapToInt(v->v.getSaleAllToThree()).sum();
+        int saleAllToThreeAll = dailyReportVoList.stream().mapToInt(v -> v.getSaleAllToThree()).sum();
-        int stock_totalAll = dailyReportVoList.stream().mapToInt(v->v.getStock_total()).sum();
+        int stock_totalAll = dailyReportVoList.stream().mapToInt(v -> v.getStock_total()).sum();
         String saleOfStockRatioString = "";
-        if(saleAllToThreeAll == 0){
+        if (saleAllToThreeAll == 0) {
-            saleOfStockRatioString = stock_totalAll+":1";
+            saleOfStockRatioString = stock_totalAll + ":1";
-        }else{
+        } else {
-            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3),4,BigDecimal.ROUND_HALF_UP)),2,BigDecimal.ROUND_HALF_UP).toString()+":1";
+            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
         }
         row4.add(saleOfStockRatioString);
         dailyReportAppVo.setRow4(row4);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankFeign.java

@@ -32,9 +32,9 @@ public interface LoanOverdueBankFeign {
     @PostMapping("/saveOrUpdate")
     ResultBean<String> saveOrUpdate(@RequestBody LoanOverdueBankDto dto);
 
-    @ApiOperation("详情初始化")
+   /* @ApiOperation("详情初始化")
     @PostMapping("/details2")
-    ResultBean<LoanOverdueBankDetailVo> details(@RequestParam("sid") String sid);
+    ResultBean<LoanOverdueBankDetailVo> details(@RequestParam("sid") String sid);*/
 
     @ApiOperation("详情初始化")
     @PostMapping("/details")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankVo.java

@@ -30,4 +30,8 @@ public class LoanOverdueBankVo implements Vo {
     private String stopDate;
     @ApiModelProperty("备注")
     private String remarks;
+
+    @ApiModelProperty("是否允许点击办理，true允许，false不允许")
+    private boolean allowModify;
+    private String createBySid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinFeign.java

@@ -37,10 +37,10 @@ public interface LoanOverdueFinFeign {
     @PostMapping("/saveOrUpdate")
     ResultBean<String> saveOrUpdate(@RequestBody LoanOverdueFinDto dto);
 
-    @ApiOperation("详情初始化2")
+   /* @ApiOperation("详情初始化2")
     @PostMapping("/details2")
     ResultBean<LoanOverdueFinDetailVo> details(@RequestParam("sid") String sid);
-
+*/
     @ApiOperation("详情初始化")
     @PostMapping("/details")
     ResultBean<LoanOverdueFinDetailVo> details2(LoanOverdueFinDetailsQuery query);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinVo.java

@@ -30,4 +30,8 @@ public class LoanOverdueFinVo implements Vo {
     private String stopDate;
     @ApiModelProperty("备注")
     private String remarks;
+
+    @ApiModelProperty("是否允许点击办理，true允许，false不允许")
+    private boolean allowModify;
+    private String createBySid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -49,7 +49,8 @@
                DATE_FORMAT(lob.createTime, '%Y-%m-%d') as createTime,
                lob.closeDate,
                lob.stopDate,
-               lob.remarks
+               lob.remarks,
+               lob.createBySid
         from loan_overdue_bank lob
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankRest.java

@@ -47,10 +47,10 @@ public class LoanOverdueBankRest implements LoanOverdueBankFeign {
         return loanOverdueBankService.saveOrUpdateBank(dto);
     }
 
-    @Override
+//    @Override
-    public ResultBean<LoanOverdueBankDetailVo> details(String sid) {
+//    public ResultBean<LoanOverdueBankDetailVo> details(String sid) {
-        return loanOverdueBankService.details(sid);
+//        return loanOverdueBankService.details(sid);
-    }
+//    }
 
     @Override
     public ResultBean<LoanOverdueBankDetailVo> details2(LoanOverdueBankDetailsQuery query) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java

@@ -26,6 +26,7 @@ import com.yxt.anrui.riskcenter.api.loanoverduebank.flowable.OverdueBankApplyNod
 import com.yxt.anrui.riskcenter.api.loanoverduebank.flowable.OverdueBankApplyTaskQuery;
 import com.yxt.anrui.riskcenter.api.loanoverduebank.flowable.SubmitApplyBankDto;
 import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto;
+import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
 import com.yxt.anrui.riskcenter.biz.loanoverduebankdetails.LoanOverdueBankDetailsService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -523,6 +524,17 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         qw.orderByDesc("lof.createTime");
         IPage<LoanOverdueBank> page = PagerUtil.queryToPage(pq);
         IPage<LoanOverdueBankVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<LoanOverdueBankVo> paggingRecords = pagging.getRecords();
+        paggingRecords.removeAll(Collections.singleton(null));
+        if (!paggingRecords.isEmpty()) {
+            for (LoanOverdueBankVo record : pagging.getRecords()) {
+                if (query.getUserSid().equals(record.getCreateBySid())) {
+                    record.setAllowModify(true);
+                } else {
+                    record.setAllowModify(false);
+                }
+            }
+        }
         PagerVo<LoanOverdueBankVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -10,7 +10,8 @@
                DATE_FORMAT(lof.createTime, '%Y-%m-%d') as createTime,
                lof.closeDate,
                lof.stopDate,
-               lof.remarks
+               lof.remarks,
+               lof.createBySid
         from loan_overdue_fin lof
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinRest.java

@@ -52,10 +52,10 @@ public class LoanOverdueFinRest implements LoanOverdueFinFeign {
         return loanOverdueFinService.saveOrUpdateOver(dto);
     }
 
-    @Override
+//    @Override
-    public ResultBean<LoanOverdueFinDetailVo> details(String sid) {
+//    public ResultBean<LoanOverdueFinDetailVo> details(String sid) {
-        return loanOverdueFinService.details(sid);
+//        return loanOverdueFinService.details(sid);
-    }
+//    }
 
     @Override
     public ResultBean<LoanOverdueFinDetailVo> details2(LoanOverdueFinDetailsQuery query) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
@@ -139,6 +141,17 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
         qw.orderByDesc("lof.createTime");
         IPage<LoanOverdueFin> page = PagerUtil.queryToPage(pq);
         IPage<LoanOverdueFinVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<LoanOverdueFinVo> paggingRecords = pagging.getRecords();
+        paggingRecords.removeAll(Collections.singleton(null));
+        if (!paggingRecords.isEmpty()) {
+            for (LoanOverdueFinVo record : pagging.getRecords()) {
+                if (query.getUserSid().equals(record.getCreateBySid())) {
+                    record.setAllowModify(true);
+                } else {
+                    record.setAllowModify(false);
+                }
+            }
+        }
         PagerVo<LoanOverdueFinVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

doc/databases/报表中心.sql

@@ -251,7 +251,7 @@ SET saleOrder_subtotal_month=saleOrder_loan_month + saleOrder_full_month
 WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 -- 销售订单-待交车累计
-UPDATE daily_report r
+/*UPDATE daily_report r
     INNER JOIN (select count(bs.id) as scount, bo.useOrgSid, bm.modelSid, bm.modelConfigSid
                 from anrui_base.base_vehicle_state bs
                          left join anrui_buscenter.bus_sales_order bo on bo.sid = bs.saleOrderSid
@@ -263,6 +263,18 @@ UPDATE daily_report r
         AND r.vehModelSid = s.modelSid
         AND r.vehMConfigSid = s.modelConfigSid
 SET r.`saleOrder_waitVeh_total` = s.scount
+WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();*/
+
+UPDATE daily_report r
+    INNER JOIN (select count(bv.id) as scount,bv.useOrgSid,bv.modelSid,bv.modelConfigSid,bo.contractNo from anrui_base.base_vehicle bv
+                                                                                                                left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bv.sid
+                                                                                                                left join anrui_buscenter.bus_sales_order bo on bo.sid = bov.salesOrderSid
+                where bo.nodeState = '已办结'  and bv.vehicleState <> '0002'
+                group by bo.useOrgSid, bv.modelSid, bv.modelConfigSid
+    ) AS s ON r.useOrgSid = s.useOrgSid
+        AND r.vehModelSid = s.modelSid
+        AND r.vehMConfigSid = s.modelConfigSid
+SET r.`saleOrder_waitVeh_total` = s.scount
 WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 -- 销售