Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java

@@ -33,7 +33,7 @@ public class BusSalesVehicleQuery implements Query {
     private String saleDateStart;
     @ApiModelProperty("销售日期结束")
     private String saleDateEnd;
-    @ApiModelProperty("交付状态")
+    @ApiModelProperty("交付状态:1已交付，0未交付")
     private String handoverState;
 
     @ApiModelProperty("交付日期开始")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1624,6 +1624,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
+                    //将应收未收中的订金设置为作废
+                    //-------修改应收未收款项表中的款项状态为02作废------------
+                    List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid());
+                    StateQuery stateQuery = new StateQuery();
+                    List<String> busVinSidListState = new ArrayList<>();
+                    if (!vehicleList.isEmpty()) {
+                        vehicleList.stream().forEach(v -> {
+                            busVinSidListState.add(v.getSid());
+                        });
+                        stateQuery.setKxState("02");
+                        stateQuery.setBusVinSid(busVinSidListState);
+                        ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
+                    }
                     //再加回来
                     BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid());
                     if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) {
@@ -1681,6 +1694,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         }
                         Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                         updateFlowFiled(map);
+                        //将应收未收中的订金设置为作废
+                        //-------修改应收未收款项表中的款项状态为02作废------------
+                        List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid());
+                        StateQuery stateQuery = new StateQuery();
+                        List<String> busVinSidListState = new ArrayList<>();
+                        if (!vehicleList.isEmpty()) {
+                            vehicleList.stream().forEach(v -> {
+                                busVinSidListState.add(v.getSid());
+                            });
+                            stateQuery.setKxState("02");
+                            stateQuery.setBusVinSid(busVinSidListState);
+                            ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
+                        }
                         //再加回来
                         BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid());
                         if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) {
@@ -1732,19 +1758,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
 
             }
-            //将应收未收中的订金设置为作废
-            //-------修改应收未收款项表中的款项状态为02作废------------
-            List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid());
-            StateQuery stateQuery = new StateQuery();
-            List<String> busVinSidListState = new ArrayList<>();
-            if (!vehicleList.isEmpty()) {
-                vehicleList.stream().forEach(v -> {
-                    busVinSidListState.add(v.getSid());
-                });
-                stateQuery.setKxState("02");
-                stateQuery.setBusVinSid(busVinSidListState);
-                ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
-            }
+
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

@@ -32,11 +32,11 @@
                 >
                   0
             <if test="state != null and state != ''">
-                <if test="state == '已交付'">
+                <if test='state == "1"'>
                     and length(bh.closingDate)
                       >0
                 </if>
-                <if test="state == '未交付'">
+                <if test='state == "0"'>
                     and (bh.closingDate is null
                      or bh.closingDate = '')
                 </if>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java

@@ -58,7 +58,7 @@ public class BusSalesVehicleService {
                 qw.like("bvoa.contractNo", query.getContractNo());
             }
             if (StringUtils.isNotBlank(query.getSaleType())) {
-                qw.like("bvoa.saleTypeValue", query.getSaleType());
+                qw.eq("bvoa.saleTypeKey", query.getSaleType());
             }
             if (StringUtils.isNotBlank(query.getVinNo())) {
                 qw.like("bv.vinNo", query.getVinNo());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -3253,6 +3253,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 Map<String, Object> map = BeanUtil.beanToMap(ufVo);
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
+                if ("发起申请".equals(ufVo.getNodeState())) {
+                    //查询销售订单信息
+                    BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
+                    List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
+                    List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                    for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByOrderSidAndVehSid(busSalesOrder.getSid(), finBillVehicleVo.getVehSid()).getData();
+                        baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey());
+                        baseVehicleStateDtos.add(baseVehicleStateDto);
+                    }
+                    baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
+                }
                 //极光推送
                 finBillApplication = fetchBySid(businessSid);
                 try {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -1618,23 +1618,40 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         if (!finSelectedReceivablesDetailedVos.isEmpty()) {
             for (FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos) {
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
-                //查询该车的所有认款，是否都已认完
-                String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
-                    //已认款完成
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
-                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                    dtoList.add(baseVehicleStateDto);
-                } else {
-                    //认款未完成
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
-                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                    dtoList.add(baseVehicleStateDto);
+                if("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){
+                    String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                    if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    } else {
+                        //认款未完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    }
+                }else{
+                    //查询该车的所有认款，是否都已认完
+                    String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    } else {
+                        //认款未完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    }
                 }
-
             }
 
         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -317,13 +317,13 @@
     </select>
 
     <select id="selectByBusVinSid" resultType="java.lang.String">
-        select sum(reveivableMoney)
+        select ifnull(sum(reveivableMoney),0)
         from fin_uncollected_receivables_detailed
         where busVinSid = #{busVinSid}
     </select>
 
     <select id="selectByBusVinSid1" resultType="java.lang.String">
-        select sum(reveivableMoney)
+        select ifnull(sum(reveivableMoney),0)
         from fin_uncollected_receivables_detailed
         where busVinSid = #{busVinSid} and receivablesName = '首付款及费用'
     </select>

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

@@ -56,7 +56,7 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
 
     List<DailyReportVo> selectReport3(@Param("date") String date, @Param("busOrgSid") String busOrgSid);
 
-    List<BrandVo> selectByBrand2(@Param("useOrgSid") String useOrgSid, @Param("date") String date);
+    List<BrandVo> selectByBrand2(@Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 
-    List<DailyReportVo> selectReport4(@Param("join") List<String> brandList, @Param("useOrgSid") String useOrgSid, @Param("date") String date);
+    List<DailyReportVo> selectReport4(@Param("join") List<String> brandList, @Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 }

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

@@ -403,13 +403,6 @@
         SELECT dr.brandSid  linkSid,
                dr.brandName NAME,
                b.colspan
-        <!--(
-            SELECT count(ddr.vehModelSid)
-            FROM daily_report ddr
-            WHERE ddr.brandSid = dr.brandSid
-              AND DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{date}
-              and ddr.useOrgSid = #{useOrgSid}
-        ) as         colspan-->
         FROM daily_report dr
                  left join
              (
@@ -418,16 +411,14 @@
                  from (SELECT ddr.brandSid
                        FROM daily_report ddr
                                 left join
-                            anrui_base.base_model_config bmv
-                            on ddr.vehMConfigSid = bmv.sid
+                            anrui_base.base_model_config bmc
+                            on ddr.vehMConfigSid = bmc.sid
                                 left join
                             anrui_base.base_vehicle_model bm
                             on bm.sid = ddr.vehModelSid
-                       WHERE DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{date}
-                         and ddr.useOrgSid = #{useOrgSid}
-                       group by ddr.brandSid,
-                                bm.fuelTypeValue,
-                                bm.emissionStandardValue) a
+        <where>
+            ${ew.sqlSegment}
+        </where>) a
                  group by a.brandSid) b
              on b.brandSid = dr.brandSid
         WHERE dr.useOrgSid = #{useOrgSid}
@@ -582,13 +573,16 @@
         from daily_report dr
                  left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
                  left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
-        where dr.useOrgSid = #{useOrgSid}
+       <!-- where dr.useOrgSid = #{useOrgSid}
           AND DATE_FORMAT(dr.createTime, '%Y-%m-%d') = #{date}
           and dr.brandSid in
         <foreach collection="join" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
         group by dr.brandSid, bm.fuelTypeValue, bm.emissionStandardValue
-        order by dr.brandSid desc
+        order by dr.brandSid desc-->
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

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

@@ -1059,9 +1059,18 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
 
     public ResultBean<DailyReportAppVo> list4(String date, String useOrgSid) {
         ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
+        QueryWrapper<DailyReport> qw = new QueryWrapper<>();
         DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
         dailyReportAppVo.setTitle("分公司" + date + "日报");
-        List<BrandVo> rows1 = baseMapper.selectByBrand2(useOrgSid, date);
+        qw.like("ddr.createTime",date);
+        qw.eq("ddr.useOrgSid",useOrgSid);
+        qw.groupBy("ddr.brandSid");
+        qw.groupBy("bm.fuelTypeValue");
+        qw.groupBy("bm.emissionStandardValue");
+        List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid);
+        parameterVoList.removeAll(Collections.singleton(null));
+        qw = getCommon(parameterVoList,qw);
+        List<BrandVo> rows1 = baseMapper.selectByBrand2(useOrgSid, date,qw);
         rows1.removeAll(Collections.singleton(null));
         dailyReportAppVo.setRow1(rows1);
         List<String> brandList = rows1.stream().map(v -> v.getLinkSid()).collect(Collectors.toList());
@@ -1069,7 +1078,16 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         if (brandList.isEmpty()) {
             return rb.success();
         }
-        List<DailyReportVo> dailyReportVoList = baseMapper.selectReport4(brandList, useOrgSid, date);
+        qw = new QueryWrapper<>();
+        qw.eq("dr.useOrgSid",useOrgSid);
+        qw.like("dr.createTime",date);
+        qw.in("dr.brandSid",brandList);
+        qw.orderByDesc("dr.brandSid");
+        qw.groupBy("dr.brandSid");
+        qw.groupBy("bm.fuelTypeValue");
+        qw.groupBy("bm.emissionStandardValue");
+        qw = getCommon(parameterVoList,qw);
+        List<DailyReportVo> dailyReportVoList = baseMapper.selectReport4(brandList, useOrgSid, date,qw);
         //燃料
         List<String> row2 = dailyReportVoList.stream().map(v -> v.getFuelTypeValue()).collect(Collectors.toList());
         dailyReportAppVo.setRow2(row2);
@@ -1310,82 +1328,182 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         List<ParameterVo> dynamicRows = new ArrayList<>();
 
 
-        List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid);
-        parameterVoList.removeAll(Collections.singleton(null));
-        for (int i = 0; i < parameterVoList.size(); i++) {
-            DailyParameterVo dailyParameterVo = parameterVoList.get(i);
-            String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1);
-            ParameterVo parameterVo = new ParameterVo();
-            parameterVo.setName(dailyParameterVo.getColText());
+        /*List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid);
+        parameterVoList.removeAll(Collections.singleton(null));*/
+        int totalRowspan = 3;
+        if (!parameterVoList.isEmpty()) {
+            for (int i = 0; i < parameterVoList.size(); i++) {
+                DailyParameterVo dailyParameterVo = parameterVoList.get(i);
+                String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1);
+                ParameterVo parameterVo = new ParameterVo();
+                parameterVo.setName(dailyParameterVo.getColText());
 
-            List<String> columnNames = dailyReportVoList.stream().map(v -> {
-                String columnName = "";
-                try {
-                    Field field = v.getClass().getDeclaredField(dailyParameterVo.getColName());
-                    field.setAccessible(true);
-                    columnName = (String) field.get(v);
-                } catch (NoSuchFieldException | IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-                if (StringUtils.isBlank(columnName)) {
-                    return "-";
-                } else {
-                    return columnName;
-                }
-            }).collect(Collectors.toList());
+                List<String> columnNames = dailyReportVoList.stream().map(v -> {
+                    String columnName = "";
+                    try {
+                        Field field = v.getClass().getDeclaredField(dailyParameterVo.getColName());
+                        field.setAccessible(true);
+                        columnName = (String) field.get(v);
+                    } catch (NoSuchFieldException | IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                    if (StringUtils.isBlank(columnName)) {
+                        return "-";
+                    } else {
+                        return columnName;
+                    }
+                }).collect(Collectors.toList());
 //            columnNames.add("");
-            parameterVo.setRow(columnNames);
-            dynamicRows.add(parameterVo);
+                parameterVo.setRow(columnNames);
+                dynamicRows.add(parameterVo);
+            }
+            dailyReportAppVo.setDynamicRows(dynamicRows);
+            if (!dynamicRows.isEmpty()) {
+                for (int i = 0; i < dynamicRows.size(); i++) {
+                    if (i > 6) {
+                        break;
+                    } else {
+                        ParameterVo parameterVo = dynamicRows.get(i);
+                        switch (i) {
+                            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:
+                                break;
+                        }
+                    }
+                }
+            }
         }
-        dailyReportAppVo.setDynamicRows(dynamicRows);
-        int totalRowspan = 3;
-        if (!dynamicRows.isEmpty()) {
-            for (int i = 0; i < dynamicRows.size(); i++) {
+
+        dailyReportAppVo.setTotalRowspan(totalRowspan);
+        return rb.success().setData(dailyReportAppVo);
+    }
+
+
+    public QueryWrapper<DailyReport> getCommon(List<DailyParameterVo> parameterVoList,QueryWrapper<DailyReport> qw){
+        if(!parameterVoList.isEmpty()){
+            for (int i = 0; i < parameterVoList.size(); i++) {
+                DailyParameterVo dailyParameterVo = parameterVoList.get(i);
+                String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1);
                 if (i > 6) {
                     break;
                 } else {
-                    ParameterVo parameterVo = dynamicRows.get(i);
                     switch (i) {
                         case 0:
-                            if (parameterVo != null) {
-                                dailyReportAppVo.setRow101(parameterVo);
-                                totalRowspan = totalRowspan+1;
+                            if ("base_model_config".equals(tableName)) {
+//                                qw.groupBy("bmc." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bmc." + dailyParameterVo.getColName());
+                            } else if ("base_vehicle_model".equals(tableName)) {
+//                                qw.groupBy("bm." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bm." + dailyParameterVo.getColName());
                             }
                             break;
                         case 1:
-                            if (parameterVo != null) {
-                                dailyReportAppVo.setRow102(parameterVo);
-                                totalRowspan = totalRowspan+1;
+                            if ("base_model_config".equals(tableName)) {
+//                                qw.groupBy("bmc." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bmc." + dailyParameterVo.getColName());
+                            } else if ("base_vehicle_model".equals(tableName)) {
+//                                qw.groupBy("bm." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bm." + dailyParameterVo.getColName());
                             }
                             break;
                         case 2:
-                            if (parameterVo != null) {
-                                dailyReportAppVo.setRow103(parameterVo);
-                                totalRowspan = totalRowspan+1;
+                            if ("base_model_config".equals(tableName)) {
+//                                qw.groupBy("bmc." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bmc." + dailyParameterVo.getColName());
+                            } else if ("base_vehicle_model".equals(tableName)) {
+//                                qw.groupBy("bm." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bm." + dailyParameterVo.getColName());
                             }
                             break;
                         case 3:
-                            if (parameterVo != null) {
-                                dailyReportAppVo.setRow104(parameterVo);
-                                totalRowspan = totalRowspan+1;
+                            if ("base_model_config".equals(tableName)) {
+//                                qw.groupBy("bmc." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bmc." + dailyParameterVo.getColName());
+                            } else if ("base_vehicle_model".equals(tableName)) {
+//                                qw.groupBy("bm." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bm." + dailyParameterVo.getColName());
                             }
                             break;
                         case 4:
-                            if (parameterVo != null) {
-                                dailyReportAppVo.setRow105(parameterVo);
-                                totalRowspan = totalRowspan+1;
+                            if ("base_model_config".equals(tableName)) {
+//                                qw.groupBy("bmc." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bmc." + dailyParameterVo.getColName());
+                            } else if ("base_vehicle_model".equals(tableName)) {
+//                                qw.groupBy("bm." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bm." + dailyParameterVo.getColName());
                             }
                             break;
                         case 5:
-                            if (parameterVo != null) {
-                                dailyReportAppVo.setRow106(parameterVo);
-                                totalRowspan = totalRowspan+1;
+                            if ("base_model_config".equals(tableName)) {
+//                                qw.groupBy("bmc." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bmc." + dailyParameterVo.getColName());
+                            } else if ("base_vehicle_model".equals(tableName)) {
+//                                qw.groupBy("bm." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bm." + dailyParameterVo.getColName());
                             }
                             break;
                         case 6:
-                            if (parameterVo != null) {
-                                dailyReportAppVo.setRow107(parameterVo);
-                                totalRowspan = totalRowspan+1;
+                            if ("base_model_config".equals(tableName)) {
+//                                qw.groupBy("bmc." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bmc." + dailyParameterVo.getColName());
+                            } else if ("base_vehicle_model".equals(tableName)) {
+//                                qw.groupBy("bm." + dailyParameterVo.getColName());
+                                qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')");
+                                qw.orderByDesc("bm." + dailyParameterVo.getColName());
                             }
                             break;
                         default:
@@ -1394,7 +1512,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 }
             }
         }
-        dailyReportAppVo.setTotalRowspan(totalRowspan);
-        return rb.success().setData(dailyReportAppVo);
+
+        return qw;
     }
 }

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

@@ -378,7 +378,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
             FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
             LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
             loanBeCollectionVehFile2.setName("开票信息");
-            //loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
+            loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
             loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
             //月还明细sid
             LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();
@@ -440,7 +440,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
             FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
             LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
             loanBeCollectionVehFile2.setName("开票信息");
-            //loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
+            loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
             loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
             //月还明细sid
             LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -83,7 +83,8 @@
         a1.mobile AS custPhone,
         a1.`loanContractNo`,
         a1.`bankName`,
-        a1.createTime AS firstBeDate,
+        a1.vehMark AS carNum,
+        a1.dueDate AS firstBeDate,
         COUNT(a1.sid) AS beOverduePeriod,
         SUM(a1.yq_total) AS beOverdueMoney,
         SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
@@ -96,6 +97,8 @@
         lrpd.`loanContractNo`,
         lrpd.`vinNo`,
         lrpd.`bankName`,
+        lrpd.dueDate,
+        lrpd.vehMark,
         (
         lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
         ) AS yq_total,