yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 4 days ago
parent
555a61f562 c5f149653c
commit
4ca0bd30b1
12 changed files with 542 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java
  2. 30
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java
  3. 18
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java
  4. 11
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java
  5. 332
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml
  6. 15
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java
  7. 114
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java
  8. 3
      anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue
  9. 8
      anrui-riskcenter-ui/src/views/settle/settleAdd.vue
  10. 3
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue
  11. 8
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
  12. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

13
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java
View File

@ -3,10 +3,7 @@ package com.yxt.anrui.reportcenter.api.factoryDailyReport;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@ -33,6 +30,14 @@ public interface FactoryDaliyReportFeign {
@ResponseBody
ResultBean<SybVo> getSybList();
@GetMapping("/sybBrands")
@ResponseBody
ResultBean<SybVo> sybBrands(@RequestParam("divisionSid") String divisionSid);
@GetMapping("/list3")
@ResponseBody
ResultBean<FgsVo> list3(@RequestParam("divisionSid") String divisionSid);
}

30
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java
View File

@ -0,0 +1,30 @@
package com.yxt.anrui.reportcenter.api.factoryDailyReport;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/5/29
**/
@Data
public class FgsVo {
private String title;
private List<YearAllVo> row1;
private List<FgsYearVo> row2;
private List<String> row3;
private List<String> row4;
private List<String> row5;
private List<String> row6;
private List<String> row7;
private List<String> row8;
private List<String> row9;
private List<String> row10;
private List<String> row11;
}

18
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java
View File

@ -0,0 +1,18 @@
package com.yxt.anrui.reportcenter.api.factoryDailyReport;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2025/5/29
**/
@Data
public class FgsYearVo {
private String name;
private String title;
private String linkSid;
}

11
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java
View File

@ -3,6 +3,7 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FgsYearVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -24,4 +25,14 @@ public interface FactoryDaliyReportMapper {
List<YearAllVo> getSybNameList();
List<FactoryDaliyReportVo> getSybList();
List<YearAllVo> getBrandsNameList(String divisionSid);
List<FactoryDaliyReportVo> getSybList2(String divisionSid);
List<YearAllVo> getUseOrgNameList(String divisionSid);
List<FgsYearVo> getRow2(String divisionSid);
List<FactoryDaliyReportVo> getFgsList(String divisionSid);
}

332
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml
View File

@ -279,4 +279,336 @@
ORDER BY a.division_name desc, a.year DESC;
</select>
<select id="getBrandsNameList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo">
SELECT
date_info.brandName as name,
date_info.brandSid AS linkSid,
COUNT(DISTINCT LEFT(date_info.date_str, 4)) AS colspan
FROM (
-- 单车返利表
SELECT
brandSid,brandName,
palceGenDate AS date_str
FROM anrui_scm.scm_veh_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
AND palceGenDate IS NOT NULL
AND LEFT(palceGenDate, 4) != '' and LEFT(palceGenDate, 4) is not null
UNION ALL
-- 专项返利表
SELECT
brandSid,brandName,
palceGenDate AS date_str
FROM anrui_scm.scm_special_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
AND palceGenDate IS NOT NULL
AND LEFT(palceGenDate, 4) != '' and LEFT(palceGenDate, 4) is not null
UNION ALL
-- 回款返利表
SELECT
brandSid,brandName,
collectionDate AS date_str
FROM anrui_scm.scm_collection_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
AND collectionDate IS NOT NULL
AND LEFT(collectionDate, 4) != '' and LEFT(collectionDate, 4) is not null
) AS date_info
GROUP BY
date_info.brandSid
ORDER BY
date_info.brandSid desc;
</select>
<select id="getSybList2" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo">
SELECT
a.year,
a.division_name,
a.brandSid,
ROUND(SUM(a.estimateRebate), 2) AS estimate,
ROUND(SUM(a.uploadMoney), 2) AS upload,
ROUND(SUM(a.adjustmentMoney), 2) AS adjust,
ROUND(SUM(a.notUploadMoney), 2) AS notUploadMoney,
ROUND(SUM(a.fee), 2) AS fee,
ROUND(SUM(a.expense_payment), 2) AS expense_payment,
ROUND(SUM(a.pending_payment), 2) AS pending_payment,
ROUND(SUM(a.offset_payment), 2) AS offset_payment,
ROUND(SUM(a.remaining_payment), 2) AS remaining_payment,
ROUND(SUM(a.unuploaded_rebate), 2) AS unuploaded_rebate
FROM (
SELECT
brandSid,
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
SUM(estimateRebate) estimateRebate,
SUM(uploadMoney) uploadMoney,
SUM(adjustmentMoney) adjustmentMoney,
SUM(
estimateRebate +
IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
- IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
) AS notUploadMoney,
SUM(
estimateRebate +
IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
- (uploadMoney + secondaryUploadMoney)
) AS unuploaded_rebate,
SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
SUM(expectTreatCost) AS pending_payment,
SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
SUM(
estimateRebate - (uploadMoney + secondaryUploadMoney)
- (onceTreatCost + secondTreatCost + tempTreatCost)
- expectTreatCost
- (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
) AS remaining_payment
FROM anrui_scm.scm_veh_rebate
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(palceGenDate, 4),brandSid
UNION ALL
SELECT
brandSid,
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
SUM(estimateRebate) estimateRebate,
SUM(uploadMoney) uploadMoney,
SUM(adjustmentMoney) adjustmentMoney,
SUM(
estimateRebate +
IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
- IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
) AS notUploadMoney,
SUM(
estimateRebate +
IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
- (uploadMoney + secondaryUploadMoney)
) AS unuploaded_rebate,
SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
SUM(expectTreatCost) AS pending_payment,
SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
SUM(
estimateRebate - (uploadMoney + secondaryUploadMoney)
- (onceTreatCost + secondTreatCost + tempTreatCost)
- expectTreatCost
- (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
) AS remaining_payment
FROM anrui_scm.scm_special_rebate
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(palceGenDate, 4), brandSid
UNION ALL
SELECT
brandSid,
LEFT(collectionDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
SUM(estimateRebate) estimateRebate,
SUM(uploadMoney) uploadMoney,
SUM(adjustmentMoney) adjustmentMoney,
SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - IFNULL(uploadMoney, 0)) AS notUploadMoney,
SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - uploadMoney) AS unuploaded_rebate,
0 AS fee,
0 AS expense_payment,
0 AS pending_payment,
0 AS offset_payment,
SUM(estimateRebate - uploadMoney) AS remaining_payment
FROM anrui_scm.scm_collection_rebate
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(collectionDate, 4), brandSid
) a
WHERE a.year IS NOT NULL AND a.year != ''
GROUP BY a.year, a.brandSid
ORDER BY a.brandSid desc, a.year DESC;
</select>
<select id="getUseOrgNameList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo">
SELECT
so.name as name,
so.sid AS linkSid,
COUNT(DISTINCT LEFT(date_info.date_str, 4)) AS colspan
FROM (
-- 单车返利表
SELECT
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS second_level_org,
palceGenDate AS date_str
FROM anrui_scm.scm_veh_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
AND palceGenDate IS NOT NULL
AND LEFT(palceGenDate, 4) != '' and LEFT(palceGenDate, 4) is not null
UNION ALL
-- 专项返利表
SELECT
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS second_level_org,
palceGenDate AS date_str
FROM anrui_scm.scm_special_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
AND palceGenDate IS NOT NULL
AND LEFT(palceGenDate, 4) != '' and LEFT(palceGenDate, 4) is not null
UNION ALL
-- 回款返利表
SELECT
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS second_level_org,
collectionDate AS date_str
FROM anrui_scm.scm_collection_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
AND collectionDate IS NOT NULL
AND LEFT(collectionDate, 4) != '' and LEFT(collectionDate, 4) is not null
) AS date_info
LEFT JOIN anrui_portal.sys_organization so
ON so.sid = date_info.second_level_org
GROUP BY date_info.second_level_org, so.name, so.sid
ORDER BY date_info.second_level_org DESC;
</select>
<select id="getRow2" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.FgsYearVo">
SELECT
a.year name,
concat(so.name,'(',a.year,')') as title,
so.sid as linkSid
FROM (
SELECT
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name
FROM anrui_scm.scm_veh_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
UNION ALL
SELECT
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name
FROM anrui_scm.scm_special_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
UNION ALL
SELECT
LEFT(collectionDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name
FROM anrui_scm.scm_collection_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
GROUP BY LEFT(collectionDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
) a
LEFT JOIN anrui_portal.sys_organization so
ON so.sid = a.division_name
WHERE a.year IS NOT NULL AND a.year != ''
GROUP BY a.year, a.division_name
ORDER BY a.division_name desc, a.year DESC;
</select>
<select id="getFgsList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo">
SELECT
a.year,
a.division_name,
ROUND(SUM(a.estimateRebate), 2) AS estimate,
ROUND(SUM(a.uploadMoney), 2) AS upload,
ROUND(SUM(a.adjustmentMoney), 2) AS adjust,
ROUND(SUM(a.notUploadMoney), 2) AS notUploadMoney,
ROUND(SUM(a.fee), 2) AS fee,
ROUND(SUM(a.expense_payment), 2) AS expense_payment,
ROUND(SUM(a.pending_payment), 2) AS pending_payment,
ROUND(SUM(a.offset_payment), 2) AS offset_payment,
ROUND(SUM(a.remaining_payment), 2) AS remaining_payment,
ROUND(SUM(a.unuploaded_rebate), 2) AS unuploaded_rebate
FROM (
SELECT
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name,
SUM(estimateRebate) estimateRebate,
SUM(uploadMoney) uploadMoney,
SUM(adjustmentMoney) adjustmentMoney,
SUM(
estimateRebate +
IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
- IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
) AS notUploadMoney,
SUM(
estimateRebate +
IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
- (uploadMoney + secondaryUploadMoney)
) AS unuploaded_rebate,
SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
SUM(expectTreatCost) AS pending_payment,
SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
SUM(
estimateRebate - (uploadMoney + secondaryUploadMoney)
- (onceTreatCost + secondTreatCost + tempTreatCost)
- expectTreatCost
- (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
) AS remaining_payment
FROM anrui_scm.scm_veh_rebate
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(palceGenDate, 4),SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
UNION ALL
SELECT
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name,
SUM(estimateRebate) estimateRebate,
SUM(uploadMoney) uploadMoney,
SUM(adjustmentMoney) adjustmentMoney,
SUM(
estimateRebate +
IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
- IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
) AS notUploadMoney,
SUM(
estimateRebate +
IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
- (uploadMoney + secondaryUploadMoney)
) AS unuploaded_rebate,
SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
SUM(expectTreatCost) AS pending_payment,
SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
SUM(
estimateRebate - (uploadMoney + secondaryUploadMoney)
- (onceTreatCost + secondTreatCost + tempTreatCost)
- expectTreatCost
- (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
) AS remaining_payment
FROM anrui_scm.scm_special_rebate
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
UNION ALL
SELECT
LEFT(collectionDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name,
SUM(estimateRebate) estimateRebate,
SUM(uploadMoney) uploadMoney,
SUM(adjustmentMoney) adjustmentMoney,
SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - IFNULL(uploadMoney, 0)) AS notUploadMoney,
SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - uploadMoney) AS unuploaded_rebate,
0 AS fee,
0 AS expense_payment,
0 AS pending_payment,
0 AS offset_payment,
SUM(estimateRebate - uploadMoney) AS remaining_payment
FROM anrui_scm.scm_collection_rebate
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(collectionDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
) a
WHERE a.year IS NOT NULL AND a.year != ''
GROUP BY a.year,a.division_name
ORDER BY a.division_name desc, a.year DESC;
</select>
</mapper>

15
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java
View File

@ -1,9 +1,6 @@
package com.yxt.anrui.reportcenter.biz.factoryDailyReport;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportFeign;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportQuery;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.SybVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -45,5 +42,15 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign {
return factoryDaliyReportService.getSybList();
}
@Override
public ResultBean<SybVo> sybBrands(String divisionSid) {
return factoryDaliyReportService.getSybBrands(divisionSid);
}
@Override
public ResultBean<FgsVo> list3(String divisionSid) {
return factoryDaliyReportService.list3(divisionSid);
}
}

114
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java
View File

@ -214,4 +214,118 @@ public class FactoryDaliyReportService {
}
return rb.success().setData(sysVo);
}
public ResultBean<SybVo> getSybBrands(String divisionSid) {
ResultBean<SybVo> rb = ResultBean.fireFail();
SybVo sysVo = new SybVo();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(divisionSid).getData();
if(sysOrganizationVo != null){
sysVo.setTitle(sysOrganizationVo.getName());
}
//先查询有哪些事业部以及事业部下的年份
List<YearAllVo> brandNameList = factoryDaliyReportMapper.getBrandsNameList(divisionSid);
List<FactoryDaliyReportVo> factoryDaliyReportVoList = factoryDaliyReportMapper.getSybList2(divisionSid);
factoryDaliyReportVoList.removeAll(Collections.singleton(null));
if(!factoryDaliyReportVoList.isEmpty()){
for (int i = 0; i < factoryDaliyReportVoList.size(); i++) {
FactoryDaliyReportVo factoryDaliyReportVo = factoryDaliyReportVoList.get(i);
factoryDaliyReportVo.setEstimate(DecimalUtil.format(factoryDaliyReportVo.getEstimate()));
factoryDaliyReportVo.setUpload(DecimalUtil.format(factoryDaliyReportVo.getUpload()));
factoryDaliyReportVo.setAdjust(DecimalUtil.format(factoryDaliyReportVo.getAdjust()));
factoryDaliyReportVo.setNotUploadMoney(DecimalUtil.format(factoryDaliyReportVo.getNotUploadMoney()));
factoryDaliyReportVo.setUnuploaded_rebate(DecimalUtil.format(factoryDaliyReportVo.getUnuploaded_rebate()));
factoryDaliyReportVo.setFee(DecimalUtil.format(factoryDaliyReportVo.getFee()));
factoryDaliyReportVo.setExpense_payment(DecimalUtil.format(factoryDaliyReportVo.getExpense_payment()));
factoryDaliyReportVo.setPending_payment(DecimalUtil.format(factoryDaliyReportVo.getPending_payment()));
factoryDaliyReportVo.setOffset_payment(DecimalUtil.format(factoryDaliyReportVo.getOffset_payment()));
}
//年份
List<String> row2 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getYear).collect(Collectors.toList());
//预提
List<String> row3 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getEstimate).collect(Collectors.toList());
//上传
List<String> row4 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUpload).collect(Collectors.toList());
//调整
List<String> row5 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getAdjust).collect(Collectors.toList());
//未上传
List<String> row6 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getNotUploadMoney).collect(Collectors.toList());
//其中返利
List<String> row7 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUnuploaded_rebate).collect(Collectors.toList());
//其中费用
List<String> row8 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getFee).collect(Collectors.toList());
//支出
List<String> row9 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getExpense_payment).collect(Collectors.toList());
//待支付
List<String> row10 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getPending_payment).collect(Collectors.toList());
//抵顶
List<String> row11 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getOffset_payment).collect(Collectors.toList());
sysVo.setRow1(brandNameList);
sysVo.setRow2(row2);
sysVo.setRow3(row3);
sysVo.setRow4(row4);
sysVo.setRow5(row5);
sysVo.setRow6(row6);
sysVo.setRow7(row7);
sysVo.setRow8(row8);
sysVo.setRow9(row9);
sysVo.setRow10(row10);
sysVo.setRow11(row11);
}
return rb.success().setData(sysVo);
}
public ResultBean<FgsVo> list3(String divisionSid) {
ResultBean<FgsVo> rb = ResultBean.fireFail();
FgsVo fgsVo = new FgsVo();
fgsVo.setTitle("分公司报表");
//先查询有哪些分公司以及分公司下的年份
List<YearAllVo> useOrgNameList = factoryDaliyReportMapper.getUseOrgNameList(divisionSid);
List<FgsYearVo> row2 = factoryDaliyReportMapper.getRow2(divisionSid);
List<FactoryDaliyReportVo> factoryDaliyReportVoList = factoryDaliyReportMapper.getFgsList(divisionSid);
factoryDaliyReportVoList.removeAll(Collections.singleton(null));
if(!factoryDaliyReportVoList.isEmpty()){
for (int i = 0; i < factoryDaliyReportVoList.size(); i++) {
FactoryDaliyReportVo factoryDaliyReportVo = factoryDaliyReportVoList.get(i);
factoryDaliyReportVo.setEstimate(DecimalUtil.format(factoryDaliyReportVo.getEstimate()));
factoryDaliyReportVo.setUpload(DecimalUtil.format(factoryDaliyReportVo.getUpload()));
factoryDaliyReportVo.setAdjust(DecimalUtil.format(factoryDaliyReportVo.getAdjust()));
factoryDaliyReportVo.setNotUploadMoney(DecimalUtil.format(factoryDaliyReportVo.getNotUploadMoney()));
factoryDaliyReportVo.setUnuploaded_rebate(DecimalUtil.format(factoryDaliyReportVo.getUnuploaded_rebate()));
factoryDaliyReportVo.setFee(DecimalUtil.format(factoryDaliyReportVo.getFee()));
factoryDaliyReportVo.setExpense_payment(DecimalUtil.format(factoryDaliyReportVo.getExpense_payment()));
factoryDaliyReportVo.setPending_payment(DecimalUtil.format(factoryDaliyReportVo.getPending_payment()));
factoryDaliyReportVo.setOffset_payment(DecimalUtil.format(factoryDaliyReportVo.getOffset_payment()));
}
//预提
List<String> row3 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getEstimate).collect(Collectors.toList());
//上传
List<String> row4 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUpload).collect(Collectors.toList());
//调整
List<String> row5 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getAdjust).collect(Collectors.toList());
//未上传
List<String> row6 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getNotUploadMoney).collect(Collectors.toList());
//其中返利
List<String> row7 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUnuploaded_rebate).collect(Collectors.toList());
//其中费用
List<String> row8 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getFee).collect(Collectors.toList());
//支出
List<String> row9 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getExpense_payment).collect(Collectors.toList());
//待支付
List<String> row10 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getPending_payment).collect(Collectors.toList());
//抵顶
List<String> row11 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getOffset_payment).collect(Collectors.toList());
fgsVo.setRow1(useOrgNameList);
fgsVo.setRow2(row2);
fgsVo.setRow3(row3);
fgsVo.setRow4(row4);
fgsVo.setRow5(row5);
fgsVo.setRow6(row6);
fgsVo.setRow7(row7);
fgsVo.setRow8(row8);
fgsVo.setRow9(row9);
fgsVo.setRow10(row10);
fgsVo.setRow11(row11);
}
return rb.success().setData(fgsVo);
}
}

3
anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue
View File

@ -300,7 +300,8 @@ export default {
// 公司结清费用模块--公司正常结清合计计算
calculateSettleAll() {
let money = 0
money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100
// 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 公司未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金
money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100
return money
},
// 结清利润计算

8
anrui-riskcenter-ui/src/views/settle/settleAdd.vue
View File

@ -103,9 +103,13 @@
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>贷款保证金:<el-input style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
<div>贷款保证金:
<span v-if="formobj.showHg" style="margin-right: 10px">{{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
<el-input v-else style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
</div>
<div>是否抵顶:
<el-radio-group v-model="formobj.loanSettleBankCostVo.topping">
<span v-if="formobj.showHg">{{ formobj.loanSettleBankCostVo.topping ? '是' : '否' }}</span>
<el-radio-group v-else v-model="formobj.loanSettleBankCostVo.topping">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>

3
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue
View File

@ -299,7 +299,8 @@ export default {
// 公司结清费用模块--公司正常结清合计计算
calculateSettleAll() {
let money = 0
money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100
// 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 公司未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金
money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100
return money
},
// 结清利润计算

8
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
View File

@ -102,9 +102,13 @@
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>贷款保证金:<el-input style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
<div>贷款保证金:
<span v-if="formobj.showHg" style="margin-right: 10px">{{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
<el-input v-else style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
</div>
<div>是否抵顶:
<el-radio-group v-model="formobj.loanSettleBankCostVo.topping">
<span v-if="formobj.showHg">{{ formobj.loanSettleBankCostVo.topping ? '是' : '否' }}</span>
<el-radio-group v-else v-model="formobj.loanSettleBankCostVo.topping">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
View File

@ -1329,6 +1329,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
loanSettleApplyDetailsVo.setUseOrgName(organizationVoData.getName());
}
}
loanSettleApplyDetailsVo.setBankSid(loanRepurchaseApply.getBankSid());
loanSettleApplyDetailsVo.setCreateDept(deptName);
loanSettleApplyDetailsVo.setCreateDeptSid(deptSid);
loanSettleApplyDetailsVo.setCreateByName(userVoResultBean.getData().getName());

Write Preview
Loading…
Cancel
Save