Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1639,8 +1639,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             //保存车辆出库单子表
             baseMapper.insert(baseVehicleOut);
             //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
-            String remarks = baseVehicleZSOutApplyDto.getContractNo() + baseVehicleZSOutApplyDto.getSaleTypeValue();
-            baseVehicle1.setRemarks(remarks);
+            //String remarks = baseVehicleZSOutApplyDto.getContractNo() + baseVehicleZSOutApplyDto.getSaleTypeValue();
+            //baseVehicle1.setRemarks(remarks);
             baseVehicle1.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
             baseVehicle1.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
             baseVehicle1.setSalesDate(new Date());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -325,6 +325,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 baseManufUpdateDto.setState("1");
                 ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto);
             }
+            if(finPaymentrecordOne != null){
+                baseMapper.insert(finPaymentrecordOne);
+            }
             //给外采或排产申请人系统消息提醒
             /*AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
             ArrayList<String> recipientSidList = new ArrayList<>();
@@ -411,9 +414,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 log.error("推送数据失败=========================" + e.getMessage());
                 return rb.setMsg("推送数据失败");
             }
-            if(finPaymentrecordOne != null){
-                baseMapper.insert(finPaymentrecordOne);
-            }
+
         }
         return rb.success();
     }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.reportcenter.api.dailyreport;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -113,10 +114,10 @@ public class DailyReportAppVo {
     private List<String> row48 = new ArrayList<>();
     @ApiModelProperty("金融未放款金额")
     private List<String> row49 = new ArrayList<>();
-
+    @JsonIgnore
     private List<ParameterVo> dynamicRows = new ArrayList<>();
 
-
+    @JsonIgnore
     private List<DailyReportVo> dailyReportVoList = new ArrayList<>();
 
  /*   @ApiModelProperty("移动端需要的固定参数")
@@ -134,6 +135,8 @@ public class DailyReportAppVo {
     private ParameterVo row105;
     private ParameterVo row106;
     private ParameterVo row107;
+    @ApiModelProperty("数值3+动态的个数")
+    private int totalRowspan;
 
 
 }

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

@@ -1338,6 +1338,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             dynamicRows.add(parameterVo);
         }
         dailyReportAppVo.setDynamicRows(dynamicRows);
+        int totalRowspan = 3;
         if (!dynamicRows.isEmpty()) {
             for (int i = 0; i < dynamicRows.size(); i++) {
                 if (i > 6) {
@@ -1348,36 +1349,43 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                         case 0:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow101(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 1:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow102(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 2:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow103(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 3:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow104(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 4:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow105(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 5:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow106(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 6:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow107(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         default:
@@ -1386,6 +1394,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 }
             }
         }
+        dailyReportAppVo.setTotalRowspan(totalRowspan);
         return rb.success().setData(dailyReportAppVo);
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -501,6 +501,8 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         //流程定义id
         bv.setModelId(ProcDefEnum.BECOLLECTIONAPPLY.getProDefId());
         bv.setFormVariables(variables);
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanBeCollectionApply.getOrgPath()).getData();
+        bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java

@@ -65,7 +65,6 @@ public class AppValcustFilingService {
         List<AppValcustFilingVo> appValcustFilingVos = new ArrayList<>();
         PagerVo<AppValcustFilingVo> v = new PagerVo<>();
         List<BusValcustFilingVo> records = resultBean.getData().getRecords();
-        Collections.reverse(records);
         for (BusValcustFilingVo record : records) {
             AppValcustFilingVo appValcustFilingVo = new AppValcustFilingVo();
             BeanUtil.copyProperties(record,appValcustFilingVo);