Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
commit
6f7e12bf33
  1. 12
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  2. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java
  4. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java
  5. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  6. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  7. 1
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java
  8. 45
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java
  9. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
  10. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  11. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  12. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
  13. 59
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherCastToKingDeeBillFields.java
  14. 98
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
  15. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data.json
  16. 24
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
  17. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_data1.json
  18. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_model.json
  19. 81
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/remarks.txt
  20. 20
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/ParameterVo.java
  21. 7
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameter.java
  22. 17
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterColumn.java
  23. 34
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterFeign.java
  24. 12
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterFeignFallback.java
  25. 22
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterList.java
  26. 24
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterQuery.java
  27. 10
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainFeign.java
  28. 21
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitVo.java
  29. 27
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitsVo.java
  30. 7
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainQuery.java
  31. 10
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainVo.java
  32. 33
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java
  33. 21
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.java
  34. 16
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.xml
  35. 36
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterRest.java
  36. 59
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterService.java
  37. 31
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java
  38. 47
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml
  39. 17
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainRest.java
  40. 100
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java
  41. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java
  42. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
  43. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java
  44. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java
  45. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java
  46. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java
  47. 27
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoFeign.java
  48. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoQuery.java
  49. 18
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoVo.java
  50. 7
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
  51. 27
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/baseinfo/AppAutoRiskBaseInfoRest.java
  52. 52
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/baseinfo/AppAutoRiskBaseInfoService.java

12
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@ -379,8 +379,9 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
if (busSalesOrderVehicle.getLinkNo().length() > 8) {
linkNo = busSalesOrderVehicle.getLinkNo().substring(linkNo.length() - 8);
String vinNo = busSalesOrderVehicle.getLinkNo();
if (vinNo.length() > 8) {
linkNo = vinNo.substring(vinNo.length() - 8);
} else {
linkNo = busSalesOrderVehicle.getLinkNo();
}
@ -396,13 +397,6 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
} else {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
if (StringUtils.isNotBlank(loanContractSid)) {
BusSalesOrderLoancontract loancontract = fetchBySid(loanContractSid);
if (null != loancontract) {
creditResult.setBillNo(loancontract.getLoanContractNo() + linkNo);
}
}
creditResult.setCommUnit(customerNumber);
SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(salesOrder.getUseOrgSid()).getData();
creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java

@ -1,5 +1,6 @@
package com.yxt.anrui.fin.api.finbillapplication;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -32,6 +33,9 @@ public class VinListVos {
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateState; // 合格证状态value
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
@ApiModelProperty("主车合格证照片")
private List<String> zcHgzImages = new ArrayList<>();
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java

@ -26,6 +26,7 @@
package com.yxt.anrui.fin.api.finbillvehicle;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -80,5 +81,6 @@ public class FinBillVehicle extends BaseEntity {
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java

@ -87,6 +87,10 @@ public class FinBillVehicleDto implements Dto {
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
@ApiModelProperty("主车合格证照片")
private List<String> zcHgzImages = new ArrayList<>();
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@ -22,6 +22,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -67,6 +68,12 @@ public interface FinKingDeeFeign {
@ResponseBody
ResultBean<String> draftOtherReceivableBill(@RequestBody @Valid OtherReceivable otherReceivable);
@ApiOperation("保存凭证的接口")
@PostMapping("/saveVoucher")
@ResponseBody
ResultBean<String> saveVoucher(@RequestBody @Valid Voucher voucher);
@ApiOperation("暂存其他应收单的接口(资方信审终审通过后推送)")
@PostMapping("/pushOtherReceivableBill")
@ResponseBody

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java

@ -22,6 +22,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.common.core.result.ResultBean;
import java.util.List;
@ -43,6 +44,11 @@ implements FinKingDeeFeign{
return null;
}
@Override
public ResultBean<String> saveVoucher(Voucher voucher) {
return null;
}
@Override
public ResultBean<String> pushOtherReceivableBill(CapitalCreditResult creditResult) {
return null;

1
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java

@ -4,6 +4,7 @@ public enum KingDeeBillId {
AP_PAYABLE("AP_Payable", "应付单"),
AR_RECEIVABLE("AR_receivable", "应收单"),
AR_OTHERRECEIVABLE("AR_OtherRecAble", "其他应收单"),
GL_VOUCHER("GL_VOUCHER", "凭证"),
AP_PAYBILL("AP_PAYBILL", "付款单"),
SAL_RETURNSTOCK("SAL_RETURNSTOCK","销售退货单"),
AR_RECEIVEBILL("AR_RECEIVEBILL", "收款单"),

45
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java

@ -0,0 +1,45 @@
package com.yxt.anrui.fin.api.kingdee.voucher;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.awt.print.Book;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/12 18:13
*/
@Data
public class Voucher {
@ApiModelProperty("账簿")
public String accountBook;
@ApiModelProperty("业务日期")
public String bussDate;
@ApiModelProperty("凭证字")
public String voucherWord;
@ApiModelProperty("凭证号")
public String voucherNo;
@ApiModelProperty("收款明细")
public List<Voucher.VoucherResultDetailDto> resultDetails;
@Data
public static class VoucherResultDetailDto implements Dto {
@ApiModelProperty("摘要")
public String remark;
@ApiModelProperty("科目编码")
public String subjectNo;
@ApiModelProperty("核算维度部门")
public String dimensionDept;
@ApiModelProperty("核算维度客户")
public String dimensionCustom;
@ApiModelProperty("借方金额")
public String debit;
@ApiModelProperty("贷方金额")
public String credit;
}
}

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@ -113,8 +113,7 @@
bo.`purchaseSystemSid`,
bm.`modelName`,
bm.`modelSid`,
bo.`oneBillMoney` AS kpMoney,
lr.`capCarefulResult` AS xSState
bo.`oneBillMoney` AS kpMoney
FROM
anrui_buscenter.`bus_sales_order_vehicle` bv
JOIN anrui_buscenter.`bus_sales_order` bo
@ -125,8 +124,6 @@
ON bv.`linkSid` = bc.`vehicleSid`
JOIN anrui_buscenter.`bus_sales_order_model` bm
ON bv.`salesOrderSid` = bm.`salesOrderSid`
LEFT JOIN anrui_riskcenter.`loan_capital_credit_result` lr
ON bv.`loanContractSid` = lr.`loanContractSid`
<where>
${ew.sqlSegment}
</where>
@ -178,7 +175,8 @@
bv.`linkNo` AS vin,
bv.`linkSid` AS vinSid,
bc.`certificateState` AS certificateStateKey,
bc.`certificateStateValue` AS certificateState
bc.`certificateStateValue` AS certificateState,
lr.`capCarefulResult` AS xSState
FROM
anrui_buscenter.`bus_sales_order_vehicle` bv
JOIN anrui_buscenter.`bus_sales_order` bo
@ -189,6 +187,8 @@
ON bv.`linkSid` = bc.`vehicleSid`
JOIN anrui_buscenter.`bus_sales_order_model` bm
ON bv.`salesOrderSid` = bm.`salesOrderSid`
LEFT JOIN anrui_riskcenter.`loan_capital_credit_result` lr
ON bv.`loanContractSid` = lr.`loanContractSid`
where bo.contractNo = #{contractNo} and bv.linkSid = #{vinSid}
</select>
</mapper>

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

@ -4655,8 +4655,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
ResultBean<BillApplicationIInfoVoss> rb = ResultBean.fireFail();
BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss();
BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId);
ResultBean<BusSalesOrderDetailsVo> resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid());
BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData();
billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
if("1".equals(busSalesOrder.getPayTypeKey())){
billApplicationIInfoVoss.setIsCanEdit(true);

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -26,6 +26,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService;
import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
@ -48,6 +49,7 @@ import com.yxt.anrui.fin.biz.kingdee.salesreturn.SalesReturnOrdersService;
import com.yxt.anrui.fin.biz.kingdee.saloutstock.SalOutStockService;
import com.yxt.anrui.fin.biz.kingdee.stkinstock.STKInStockService;
import com.yxt.anrui.fin.biz.kingdee.stktransferdirect.StkTransferDirectService;
import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -182,6 +184,13 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Autowired
private SalesReturnOrdersService salesReturnOrdersService;
/**
* 销售退货单
*/
@Autowired
private VoucherService voucherService;
@ApiOperation("入账暂存应付单的接口")
@PostMapping("/draftEntryBill")
@ResponseBody
@ -206,6 +215,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
return otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
@Override
public ResultBean<String> saveVoucher(Voucher voucher) {
log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(voucher));
return voucherService.saveVoucher(voucher);
}
@Override
public ResultBean<String> pushOtherReceivableBill(CapitalCreditResult creditResult) {
log.info("FinKingDeeFeignRest-pushOtherReceivableBill:{}", JSONObject.toJSONString(creditResult));

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java

@ -67,7 +67,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
}
String kingDeeData = OtherReceivableBillCreditResultCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
try {
ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
if (!resultBean1.getSuccess()) {
log.info("其他应收单保存失败!");
return rb.setMsg("其他应收单保存失败!");

59
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherCastToKingDeeBillFields.java

@ -0,0 +1,59 @@
package com.yxt.anrui.fin.biz.kingdee.voucher;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 封装转换的类
*/
public class VoucherCastToKingDeeBillFields {
/**
* 构造金蝶需要的数据结构 并对字段赋值
*
* @param map_fEntityModel_
* @param vehicleList
* @return
*/
public static String getKingDeeData(Map<String,String> map_fEntityModel_,List<Map<String,String>> vehicleList){
/**
* 取模板
*/
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/voucher/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/voucher/data_data1.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/voucher/data_model.json");
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField);
fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);
List<JSONObject> list_fEntity_=new ArrayList<>();
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fEntity_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json");
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntity_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {
map_fEntity_.put(entry.getKey(),entry.getValue());
}
fEntity_ =KingDeeUtils.replaceTemplateParams(fEntity_, map_fEntity_);
list_fEntity_.add(JSONObject.parseObject(fEntity_,Feature.OrderedField));
}
jsonFEntityModel_.put("FEntity", JSONArray.parseArray(JSON.toJSONString(list_fEntity_)));
jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
jsonObj.put("data",jsonFEntityData_.toJSONString());
return jsonObj.toJSONString();
}
}

98
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java

@ -0,0 +1,98 @@
package com.yxt.anrui.fin.biz.kingdee.voucher;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class VoucherService extends FinKingDeeService {
/**
* 生成的凭证的数据推送到金蝶的平台中
*
* @param voucher
* @return
*/
public ResultBean saveVoucher(Voucher voucher) {
ResultBean rb = ResultBean.fireFail();
//业务表的主表数据集合
Map<String, String> map_fEntityModel_ = new HashMap<>();
//物料的数组集合
//账簿
if (StringUtils.isBlank(voucher.getAccountBook())) {
return rb.setMsg("账簿不能为空");
}
map_fEntityModel_.put("FAccountBookID", voucher.getAccountBook());
//业务日期
if (StringUtils.isBlank(voucher.getBussDate())) {
return rb.setMsg("业务日期不能为空");
}
map_fEntityModel_.put("FDate", voucher.getBussDate());
//凭证字
if (StringUtils.isBlank(voucher.getVoucherWord())) {
return rb.setMsg("凭证字不能为空");
}
map_fEntityModel_.put("FVOUCHERGROUPID", voucher.getVoucherWord());
//凭证号
if (StringUtils.isBlank(voucher.getVoucherNo())) {
return rb.setMsg("凭证号不能为空");
}
map_fEntityModel_.put("FVOUCHERGROUPNO", voucher.getVoucherNo());
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = voucher.getResultDetails() == null ? new ArrayList<>() : voucher.getResultDetails();
//准备 物料列表的数据
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(voucherResultDetailDtos);
if (!vehicleListMap.getSuccess()) {
return rb.setMsg(vehicleListMap.getMsg());
}
String kingDeeData = VoucherCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
try {
ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
if (!resultBean1.getSuccess()) {
log.info("凭证保存失败!");
return rb.setMsg("凭证保存失败!");
}
log.info("凭证保存成功!");
// String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID());
// ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
// if (!resultBean2.getSuccess()) {
// log.info("凭证提交失败!");
// return rb.setMsg("凭证提交失败!");
// }
// log.info("凭证提交成功!");
} catch (Exception e) {
e.printStackTrace();
}
return rb.success();
}
public ResultBean<List<Map<String, String>>> createVehicleListsForReceivableBill(List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos) {
ResultBean<List<Map<String, String>>> rb = ResultBean.fireFail();
List<Map<String, String>> voucherDetailMap = new ArrayList<>();
for (int i = 0; i < voucherResultDetailDtos.size(); i++) {
Voucher.VoucherResultDetailDto c = voucherResultDetailDtos.get(i);
Map<String, String> m = new HashMap<>();
if (StringUtils.isBlank(c.getSubjectNo())) {
return rb.setMsg("科目编码不能为空");
}
m.put("FEXPLANATION", c.getRemark());
m.put("FACCOUNTID", c.getSubjectNo());
m.put("FFLEX5", c.getDimensionDept());
m.put("FFLEX6", c.getDimensionCustom());
m.put("FDEBIT", c.getDebit());
m.put("FCREDIT", c.getCredit());
voucherDetailMap.add(m);
}
return rb.success().setData(voucherDetailMap);
}
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data.json

@ -0,0 +1,4 @@
{
"formId": "GL_VOUCHER",
"data": "@KD_data"
}

24
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json

@ -0,0 +1,24 @@
{
"FEXPLANATION": "@KD_FEXPLANATION",
"FACCOUNTID": {
"FNumber": "@KD_FACCOUNTID"
},
"FDetailID": {
"FDETAILID__FFLEX5": {
"FNumber": "@KD_FFLEX5"
},
"FDETAILID__FFLEX6": {
"FNumber": "@KD_FFLEX6"
}
},
"FCURRENCYID": {
"FNumber": "PRE001"
},
"FEXCHANGERATETYPE": {
"FNumber": "HLTX01_SYS"
},
"FEXCHANGERATE": 1,
"FAMOUNTFOR": "",
"FDEBIT": "@KD_FDEBIT",
"FCREDIT": "@KD_FCREDIT"
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_data1.json

@ -0,0 +1,13 @@
{
"Creator": "",
"NeedUpDateFields": [],
"NeedReturnFields": [],
"IsDeleteEntry": "True",
"SubSystemId": "",
"IsVerifyBaseDataField": "false",
"IsEntryBatchFill": "True",
"ValidateFlag": "True",
"NumberSearch": "True",
"InterationFlags": "",
"Model": {}
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_model.json

@ -0,0 +1,13 @@
{
"FVOUCHERID": 0,
"FAccountBookID": {
"FNumber": "@KD_FAccountBookID"
},
"FDate": "@KD_FDate",
"FVOUCHERGROUPID": {
"FNumber": "@KD_FVOUCHERGROUPID"
},
"FVOUCHERGROUPNO": "@KD_FVOUCHERGROUPNO",
"FEntity": []
}

81
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/remarks.txt

@ -0,0 +1,81 @@
请求参数说明:
1.formid:业务对象表单Id,字符串类型(必录)
2.data:Json格式数据(详情参考Json格式数据)(必录)
2.1.Creator:创建者内码(非必录)
2.2.NeedUpDateFields:需要更新的字段,数组类型,格式:[key1,key2,...](非必录),注(更新单据体字段得加上单据体key)
2.3.NeedReturnFields:需返回结果的字段集合,数组类型,格式:[key,entitykey.key,...](非必录),注(返回单据体字段格式:entitykey.key)
2.4.IsDeleteEntry:是否删除已存在的分录,布尔类型,默认true(非必录)
2.5.SubSystemId:表单所在的子系统内码,字符串类型(非必录)
2.6.IsVerifyBaseDataField:是否验证所有的基础资料有效性,布尔类,默认false(非必录)
2.7.IsEntryBatchFill:是否批量填充分录,默认true(非必录)
2.8.ValidateFlag:是否验证标志,布尔类型,默认true(非必录)
2.9.NumberSearch:是否用编码搜索基础资料,布尔类型,默认true(非必录)
2.10.InterationFlags:交互标志集合,字符串类型,分号分隔,格式:"flag1;flag2;..."(非必录),例如(允许负库存标识:STK_InvCheckResult)
2.11.Model:表单数据包,Json类型(必录)
字段说明:
核算维度:FDetailID
币别:FCURRENCYID (必填项)
摘要:FEXPLANATION
科目编码:FACCOUNTID (必填项)
原币金额:FAMOUNTFOR
借方金额:FDEBIT
汇率类型:FEXCHANGERATETYPE (必填项)
汇率:FEXCHANGERATE
调整期间:FADJPRD
引入版本号:FIMPORTVERSION
合计: :FAmountDisplay
打印次数:FPRINTTIMES
转存信息-转入:FDepositIn
转存信息-转出:FDepositOut
当前年度:FCurrentYear
当前期间:FCurrentPeriod
单价:FPrice
单位:FUnitId
科目全名:FAcctFullName
数量:FQty
上移下移之前的分录内码:FOldEntryId
现金流量#分录ID:FEXPORTENTRYID
科目单位数量:FAcctUnitQty
计量单位数量:FBaseUnitQty
结算方式:FSettleTypeID
本位币金额:FAmount
贷方金额:FCREDIT
借贷方向:FDC
是否已指定现金流量:FCASHFLOWITEM
是否参与多栏账汇总:FISMULTICOLLECT
结算号:FSETTLENO
科目名称:FACCOUNTNAME
修改日期:FModifyDate
作废状态:FInvalid
用户组:FCreaterGroup
借方总金额:FDEBITTOTAL
贷方总金额:FCREDITTOTAL
出纳:FCASHIERID
审核日期:FAuditDate
审核:FCHECKERID
过账:FPOSTERID
日期:FDate (必填项)
外币:FISFOREIGNCUR
凭证编号:FBillNo
账簿:FAccountBookID (必填项)
会计年度:FYEAR
期间:FPERIOD
凭证字:FVOUCHERGROUPID (必填项)
附件数:FATTACHMENTS
核算组织:FACCBOOKORGID
已指定现金流量项目:FISCASHFLOW
业务类型:FSourceBillKey
本位币(辅助):FBASECURRENCYID
数量金额核算:FIsQty
修改人:FModifierId
是否拆分:FIsSplit
凭证号:FVOUCHERGROUPNO (必填项)
创建日期:FCreateDate
操作类型:FOperateType
审核状态:FDocumentStatus (必填项)
制单:FCreatorId
取消复核操(作辅助):FCancleRecheck
来源系统:FSystemID
是否调整期凭证:FISADJUSTVOUCHER
出纳复核操作(辅助):FCashierRecheck

20
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/ParameterVo.java

@ -0,0 +1,20 @@
package com.yxt.anrui.portal.api.sysreportparameter;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Data
public class ParameterVo implements Vo {
private static final long serialVersionUID = -2632852485270066096L;
@ApiModelProperty("列名")
private String colName;
@ApiModelProperty("注释")
private String colText;
}

7
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameter.java

@ -11,4 +11,11 @@ import lombok.Data;
@Data
public class SysReportParameter extends BaseEntity {
private static final long serialVersionUID = 2003257890384098592L;
private String tableNameKey;
private String tableNameValue;
private String colName;
private String colText;
private String mainSid;
}

17
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterColumn.java

@ -0,0 +1,17 @@
package com.yxt.anrui.portal.api.sysreportparameter;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Data
public class SysReportParameterColumn {
@ApiModelProperty("列名:英文字段")
private String colName;
@ApiModelProperty("注释,中文")
private String colText;
}

34
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterFeign.java

@ -0,0 +1,34 @@
package com.yxt.anrui.portal.api.sysreportparameter;
import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainFeignFallback;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Api(tags = "统计参数")
@FeignClient(
contextId = "anrui-portal-SysReportParameter",
name = "anrui-portal",
path = "v1/SysReportParameter",
fallback = SysReportParameterFeignFallback.class)
public interface SysReportParameterFeign {
@ApiOperation("根据表名查询表里的列及注释")
@PostMapping("/selectList")
ResultBean<List<ParameterVo>> selectList(@RequestParam("tableKey") String tableKey);
@ApiOperation("保存")
@PostMapping("/saveOrUpdate")
ResultBean saveOrUpdate(@RequestBody SysReportParameterQuery query);
}

12
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterFeignFallback.java

@ -0,0 +1,12 @@
package com.yxt.anrui.portal.api.sysreportparameter;
import org.springframework.stereotype.Component;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Component
public class SysReportParameterFeignFallback {
}

22
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterList.java

@ -0,0 +1,22 @@
package com.yxt.anrui.portal.api.sysreportparameter;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Data
public class SysReportParameterList {
@ApiModelProperty("表名英文")
private String tableNameKey;
@ApiModelProperty("表名称中文")
private String tableNameValue;
private List<SysReportParameterColumn> list = new ArrayList<>();
}

24
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterQuery.java

@ -0,0 +1,24 @@
package com.yxt.anrui.portal.api.sysreportparameter;
import com.yxt.common.core.query.Query;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Data
public class SysReportParameterQuery implements Query {
private static final long serialVersionUID = -4341462338073397914L;
private String sid;
private List<SysReportParameterList> list = new ArrayList<>();
}

10
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainFeign.java

@ -6,8 +6,10 @@ import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.RequestParam;
/**
* @description:
@ -15,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @date: 2023/11/6
**/
@Api(tags = "统计参数设置")
@Api(tags = "统计参数主表")
@FeignClient(
contextId = "anrui-portal-SysReportParameterMain",
name = "anrui-portal",
@ -23,7 +25,11 @@ import org.springframework.web.bind.annotation.RequestBody;
fallback = SysReportParameterMainFeignFallback.class)
public interface SysReportParameterMainFeign {
@ApiOperation("根据条件分页查询数据的列表 ")
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
ResultBean<PagerVo<SysReportParameterMainVo>> listPage(@RequestBody PagerQuery<SysReportParameterMainQuery> pagerQuery);
@ApiOperation("初始化")
@GetMapping("/getInit")
ResultBean<SysReportParameterMainInitVo> getInit(@RequestParam("sid") String sid);
}

21
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitVo.java

@ -0,0 +1,21 @@
package com.yxt.anrui.portal.api.sysreportparametermain;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Data
public class SysReportParameterMainInitVo implements Vo {
private static final long serialVersionUID = -2829739921484847842L;
private String sid;
private String useOrgName;
private List<SysReportParameterMainInitsVo> list = new ArrayList<>();
}

27
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitsVo.java

@ -0,0 +1,27 @@
package com.yxt.anrui.portal.api.sysreportparametermain;
import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterColumn;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Data
public class SysReportParameterMainInitsVo implements Vo {
private static final long serialVersionUID = 6976785085297583938L;
@ApiModelProperty("表名:英文")
private String tableNameKey;
@ApiModelProperty("表名中文")
private String tableNameValue;
@ApiModelProperty("列名中文拼接")
private String colTextString;
@ApiModelProperty("列名数组")
private List<SysReportParameterColumn> list = new ArrayList<>();
}

7
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainQuery.java

@ -1,6 +1,7 @@
package com.yxt.anrui.portal.api.sysreportparametermain;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -11,4 +12,10 @@ import lombok.Data;
@Data
public class SysReportParameterMainQuery implements Query {
private static final long serialVersionUID = 8109733209988872255L;
@ApiModelProperty("登录人orgPath")
private String orgPath;
@ApiModelProperty("分公司名称")
private String useOrgName;
}

10
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainVo.java

@ -12,14 +12,8 @@ import lombok.Data;
public class SysReportParameterMainVo {
private String sid;
@ApiModelProperty("表名key")
private String tableNameKey;
@ApiModelProperty("表名value")
private String tableNameValue;
@ApiModelProperty("列名")
private String columnName;
@ApiModelProperty("注释")
private String columnComment;
@ApiModelProperty("参数")
private String parameterValue;
@ApiModelProperty("分公司名称")
private String useOrgName;
}

33
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@ -14,6 +14,9 @@ import com.yxt.anrui.portal.biz.sysuser.SysUserService;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoQuery;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoVo;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoserviceBaseInfoFeign;
import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoFeign;
import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoQuery;
import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoVo;
import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeign;
import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoQuery;
import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo;
@ -65,6 +68,8 @@ public class AppIndexRest implements AppIndexFeign {
private SysMobileMenuRoleService sysMobileMenuRoleService;
@Autowired
private AppAutoserviceBaseInfoFeign appAutoserviceBaseInfoFeign;
@Autowired
private AppAutoRiskBaseInfoFeign appAutoRiskBaseInfoFeign;
@Override
public ResultBean<AppIndexVo> index(String userSid) {
@ -203,10 +208,36 @@ public class AppIndexRest implements AppIndexFeign {
}
}
item.setCornerNum(String.valueOf(count));
}else if ("fec4e243-491a-11ec-94cd-fa163e0cb33c".equals(item.getAppSid())){
//风控
ResultBean<AppAutoRiskBaseInfoVo> indexCountVo = ResultBean.fireFail();
if (StringUtils.isNotBlank(orgPath)) {
//切换机构
AppAutoRiskBaseInfoQuery appAutoRiskBaseInfoQuery = new AppAutoRiskBaseInfoQuery();
appAutoRiskBaseInfoQuery.setOrgPath(orgPath);
appAutoRiskBaseInfoQuery.setUserSid(userSid);
indexCountVo = appAutoRiskBaseInfoFeign.getToDoNum(appAutoRiskBaseInfoQuery);
}
//查询该用户是否有权限
List<String> stringList = sysMobileMenuRoleService.selectMenuList(userSid, item.getAppSid());
int count = 0;
if (indexCountVo.getSuccess()) {
AppAutoRiskBaseInfoVo appAutoRiskBaseInfoVo = indexCountVo.getData();
if (stringList.contains(AppIndexEnum.AppMenu.JFKC.getRemarks())) {
if (StringUtils.isNotBlank(appAutoRiskBaseInfoVo.getJfkcNum())) {
count = count + Integer.valueOf(appAutoRiskBaseInfoVo.getJfkcNum()).intValue();
}
}
if (stringList.contains(AppIndexEnum.AppMenu.FKZLSC.getRemarks())) {
if (StringUtils.isNotBlank(appAutoRiskBaseInfoVo.getFkzlscNum())) {
count = count + Integer.valueOf(appAutoRiskBaseInfoVo.getFkzlscNum()).intValue();
}
}
}
item.setCornerNum(String.valueOf(count));
}else{
item.setCornerNum("");
}
});
return rb.success().setData(appIndexAppNumVos);
}

21
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.java

@ -0,0 +1,21 @@
package com.yxt.anrui.portal.biz.sysreportparameter;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.portal.api.sysreportparameter.ParameterVo;
import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameter;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Mapper
public interface SysReportParameterMapper extends BaseMapper<SysReportParameter> {
List<ParameterVo> selectListOne(@Param("table_schema") String table_schema, @Param("table_name") String table_name);
int deleteByMainSid(String sid);
}

16
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.xml

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.portal.biz.sysreportparameter.SysReportParameterMapper">
<select id="selectListOne" resultType="com.yxt.anrui.portal.api.sysreportparameter.ParameterVo">
SELECT COLUMN_NAME colName, column_comment colText
FROM INFORMATION_SCHEMA.COLUMNS
WHERE table_schema = #{table_schema}
and TABLE_NAME = #{table_name} and column_comment not like '%hiddencol_%';
</select>
<delete id="deleteByMainSid">
delete
from sys_report_parameter
where mainSid = #{sid}
</delete>
</mapper>

36
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterRest.java

@ -0,0 +1,36 @@
package com.yxt.anrui.portal.biz.sysreportparameter;
import com.yxt.anrui.portal.api.sysreportparameter.ParameterVo;
import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterFeign;
import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Api(tags = "统计参数")
@RestController
@RequestMapping("v1/SysReportParameter")
public class SysReportParameterRest implements SysReportParameterFeign {
@Autowired
private SysReportParameterService sysReportParameterService;
@Override
public ResultBean<List<ParameterVo>> selectList(String tableKey) {
return sysReportParameterService.selectList(tableKey);
}
@Override
public ResultBean saveOrUpdate(SysReportParameterQuery query) {
return sysReportParameterService.saveOrUpdates(query);
}
}

59
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterService.java

@ -0,0 +1,59 @@
package com.yxt.anrui.portal.biz.sysreportparameter;
import com.yxt.anrui.portal.api.sysreportparameter.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Service
public class SysReportParameterService extends MybatisBaseService<SysReportParameterMapper, SysReportParameter> {
public ResultBean<List<ParameterVo>> selectList(String tableKey) {
ResultBean<List<ParameterVo>> rb = ResultBean.fireFail();
if (StringUtils.isBlank(tableKey)) {
return rb.setMsg("请选择表");
}
List<String> sys = Arrays.asList(tableKey.split("\\."));
String table_schema = Arrays.asList(tableKey.split("\\.")).get(0);
String table_name = Arrays.asList(tableKey.split("\\.")).get(1);
List<ParameterVo> parameterVoList = baseMapper.selectListOne(table_schema, table_name);
return rb.success().setData(parameterVoList);
}
public ResultBean saveOrUpdates(SysReportParameterQuery query) {
ResultBean rb = ResultBean.fireFail();
String sid = query.getSid();
baseMapper.deleteByMainSid(sid);
List<SysReportParameterList> list = query.getList();
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
for (int i = 0; i < list.size(); i++) {
SysReportParameter sysReportParameter = new SysReportParameter();
SysReportParameterList sysReportParameterList = list.get(i);
sysReportParameter.setMainSid(sid);
sysReportParameter.setTableNameKey(sysReportParameterList.getTableNameKey());
sysReportParameter.setTableNameValue(sysReportParameterList.getTableNameValue());
List<SysReportParameterColumn> lists = sysReportParameterList.getList();
lists.removeAll(Collections.singleton(null));
if (!lists.isEmpty()) {
for (int j = 0; j < lists.size(); j++) {
SysReportParameterColumn sysReportParameterColumn = lists.get(j);
sysReportParameter.setColName(sysReportParameterColumn.getColName());
sysReportParameter.setColText(sysReportParameterColumn.getColText());
baseMapper.insert(sysReportParameter);
}
}
}
}
return rb.success();
}
}

31
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java

@ -0,0 +1,31 @@
package com.yxt.anrui.portal.biz.sysreportparametermain;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterColumn;
import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMain;
import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainInitsVo;
import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainVo;
import com.yxt.anrui.portal.api.sysuser.SysUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Mapper
public interface SysReportParameterMainMapper extends BaseMapper<SysReportParameterMain> {
IPage<SysReportParameterMainVo> selectPageVo(IPage<SysReportParameterMain> page, @Param(Constants.WRAPPER) QueryWrapper<SysReportParameterMain> qw);
SysReportParameterMain selectByUseOrgSid(String sid);
List<SysReportParameterMainInitsVo> selectGroup(String sid);
List<SysReportParameterColumn> selectGroups(String tableNameKey);
}

47
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.portal.biz.sysreportparametermain.SysReportParameterMainMapper">
<select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainVo">
select spm.sid,
spm.useOrgName,
b.parameterValue
from sys_report_parameter_main spm
LEFT JOIN (
SELECT a.parameterValue,
a.mainSid
FROM (
SELECT concat(
tableNameValue,
':',
group_concat(colText SEPARATOR ',')) AS parameterValue,
mainSid
FROM sys_report_parameter
GROUP BY tableNameKey,mainSid
ORDER BY id ASC
) a) b ON b.mainSid = spm.sid
<where>
${ew.sqlSegment}
</where>
order by spm.id asc
</select>
<select id="selectByUseOrgSid" resultType="com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMain">
select *
from sys_report_parameter_main
where useOrgSid = #{sid}
</select>
<select id="selectGroup" resultType="com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainInitsVo">
SELECT group_concat(colText SEPARATOR ',') AS colTextString, tableNameKey, tableNameValue
FROM sys_report_parameter
where mainSid = #{sid}
GROUP BY tableNameKey
ORDER BY id ASC
</select>
<select id="selectGroups" resultType="com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterColumn">
select colName, colText
from sys_report_parameter
where tableNameKey = #{tableNameKey}
</select>
</mapper>

17
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainRest.java

@ -1,12 +1,14 @@
package com.yxt.anrui.portal.biz.sysreportparametermain;
import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainFeign;
import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainInitVo;
import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainQuery;
import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -15,12 +17,23 @@ import org.springframework.web.bind.annotation.RestController;
* @author: dimengzhe
* @date: 2023/11/3
**/
@Api(tags = "统计参数设置")
@Api(tags = "统计参数主表")
@RestController
@RequestMapping("v1/SysReportParameterMain")
public class SysReportParameterMainRest implements SysReportParameterMainFeign {
@Autowired
private SysReportParameterMainService sysReportParameterMainService;
@Override
public ResultBean<PagerVo<SysReportParameterMainVo>> listPage(PagerQuery<SysReportParameterMainQuery> pagerQuery) {
return null;
ResultBean rb = ResultBean.fireFail();
PagerVo<SysReportParameterMainVo> pv = sysReportParameterMainService.listPageVo(pagerQuery);
return rb.success().setData(pv);
}
@Override
public ResultBean<SysReportParameterMainInitVo> getInit(String sid) {
return sysReportParameterMainService.getInit(sid);
}
}

100
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java

@ -0,0 +1,100 @@
package com.yxt.anrui.portal.biz.sysreportparametermain;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterColumn;
import com.yxt.anrui.portal.api.sysreportparametermain.*;
import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/6
**/
@Service
public class SysReportParameterMainService extends MybatisBaseService<SysReportParameterMainMapper, SysReportParameterMain> {
@Autowired
private SysOrganizationService sysOrganizationService;
@Autowired
private SysStaffOrgService sysStaffOrgService;
public PagerVo<SysReportParameterMainVo> listPageVo(PagerQuery<SysReportParameterMainQuery> pagerQuery) {
SysReportParameterMainQuery query = pagerQuery.getParams();
String orgPath = query.getOrgPath();
List<String> stringList = Arrays.asList(orgPath.split("/"));
String sybOrgSid = orgPath.substring(37, 73);
QueryWrapper<SysReportParameterMain> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getUseOrgName())) {//分公司
qw.like("spm.useOrgName", query.getUseOrgName());
}
}
if (stringList.size() <= 2) {
List<SysOrganizationVo> sysOrganizationVos = sysOrganizationService.selectOrgByPSid(sybOrgSid).getData();
if (!sysOrganizationVos.isEmpty()) {
for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) {
SysReportParameterMain sysReportParameterMain = baseMapper.selectByUseOrgSid(sysOrganizationVo.getSid());
if (sysReportParameterMain == null) {
sysReportParameterMain = new SysReportParameterMain();
sysReportParameterMain.setOrgSidPath(sysOrganizationVo.getOrgSidPath());
sysReportParameterMain.setCreateOrgSid(sybOrgSid);
sysReportParameterMain.setUseOrgName(sysOrganizationVo.getName());
sysReportParameterMain.setUseOrgSid(sysOrganizationVo.getSid());
baseMapper.insert(sysReportParameterMain);
}
}
}
qw.eq("spm.createOrgSid", sybOrgSid);
} else {
String useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
qw.eq("spm.useOrgSid", useOrgSid);
}
IPage<SysReportParameterMain> page = PagerUtil.queryToPage(pagerQuery);
IPage<SysReportParameterMainVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysReportParameterMainVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public static void main(String[] args) {
String orgPath = "fd6435f2-0005-11ec-a033-48452053aa33/78593187-75af-4ea1-94e6-62b7cc11bfcb/843db298-33ef-42fb-82dd-f6f3d455348c/1f6d2215-f591-40ea-b447-69cc9d7c1751";
List<String> stringList = Arrays.asList(orgPath.split("/"));
System.out.println(stringList);
String sybOrgSid = orgPath.substring(37, 73);
System.out.println(sybOrgSid);
}
public ResultBean<SysReportParameterMainInitVo> getInit(String sid) {
ResultBean<SysReportParameterMainInitVo> rb = ResultBean.fireFail();
SysReportParameterMainInitVo sysReportParameterMainInitVo = new SysReportParameterMainInitVo();
SysReportParameterMain sysReportParameterMain = fetchBySid(sid);
sysReportParameterMainInitVo.setUseOrgName(sysReportParameterMain.getUseOrgName());
List<SysReportParameterMainInitsVo> list = baseMapper.selectGroup(sid);
for (int i = 0; i < list.size(); i++) {
SysReportParameterMainInitsVo sysReportParameterMainInitsVo = list.get(i);
List<SysReportParameterColumn> lists = baseMapper.selectGroups(sysReportParameterMainInitsVo.getTableNameKey());
lists.removeAll(Collections.singleton(null));
if(!lists.isEmpty()){
sysReportParameterMainInitsVo.setList(lists);
}
}
sysReportParameterMainInitVo.setList(list);
sysReportParameterMainInitVo.setSid(sid);
return rb.success().setData(sysReportParameterMainInitVo);
}
}

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@ -242,9 +242,9 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndXdConSid(loanCapitalCreditResult.getSaleOrderSid(), loanCapitalCreditResult.getLoanContractSid()).getData();
String vinNo = "";
for (BusSalesOrderVehicle salesOrderVehicle : busSalesOrderVehicles) {
vinNo = vinNo + salesOrderVehicle.getLinkNo().substring(salesOrderVehicle.getLinkNo().length() - 8) + "";
vinNo = vinNo + salesOrderVehicle.getLinkNo().substring(salesOrderVehicle.getLinkNo().length() - 8) + "";
}
vinNo = vinNo.substring(vinNo.lastIndexOf(""));
vinNo = vinNo.substring(vinNo.lastIndexOf(""));
//发送通知给销售专员
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@ -257,10 +257,10 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(receIveUserSidList);
pushMessageQuery.setModuleName("风控");
pushMessageQuery.setMsgContent(busSalesOrderVehicles.get(0).getBorrowName() + "的" + finalVinNo + "已经资方信审终审通过了。");
pushMessageQuery.setMsgContent(busSalesOrderVehicles.get(0).getBorrowName() + "的" + finalVinNo + "车架号的车辆资方信审终审已通过。");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
pushMessageQuery.setMsgTitle("家访资料问题反馈");
pushMessageQuery.setMsgTitle("资方信审终审提醒");
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
});

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@ -91,4 +91,6 @@ public class BillApplicationIInfoVo implements Vo {
private Boolean showValueCustomer;
@ApiModelProperty("是否为单独新增")
private Boolean showBtn;
@ApiModelProperty("是否显示信审终审")
private Boolean showXsState = false;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java

@ -30,8 +30,6 @@ public class SelBillVinNoPageVo implements Vo {
private String modelSid;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("是否显示信审终审")
private Boolean showXsState = true;
@ApiModelProperty("主车信息")
private List<SelBillZcVo> cars;

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.invoiced;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -17,8 +18,6 @@ public class SelBillZcVo implements Vo {
private String certificateStateKey;
@ApiModelProperty("合格证状态value")
private String certificateState;
@ApiModelProperty("信审终审状态")
private String xSState;
@ApiModelProperty("主车合格证图片")
private List<String> zcHgzImages;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java

@ -28,5 +28,6 @@ public class VinListDto implements Dto {
@ApiModelProperty("合格证状态value")
private String certificateState; // 合格证状态value
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java

@ -32,6 +32,7 @@ public class VinListVo implements Vo {
@ApiModelProperty("合格证状态value")
private String certificateState; // 合格证状态value
@ApiModelProperty("信审终审状态")
@JsonProperty("xSState")
private String xSState;
@ApiModelProperty("主车合格证照片")
private List<String> zcHgzImages = new ArrayList<>();

27
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoFeign.java

@ -0,0 +1,27 @@
package com.yxt.anrui.terminal.api.risk.baseInfo;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* @Author dimengzhe
* @Date 2023/3/2 14:02
* @Description
*/
@FeignClient(
contextId = "anrui-terminal-AppAutoRiskBaseInfo",
name = "anrui-terminal",
path = "riskcenter/v1/baseInfo")
public interface AppAutoRiskBaseInfoFeign {
@ApiOperation("获取风控各子应用模块待办数量:切换机构")
@GetMapping("/getToDoNum")
@ResponseBody
public ResultBean<AppAutoRiskBaseInfoVo> getToDoNum(@SpringQueryMap AppAutoRiskBaseInfoQuery baseInfoQuery);
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoQuery.java

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.api.risk.baseInfo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/3 11:22
* @Description
*/
@Data
public class AppAutoRiskBaseInfoQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
}

18
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoVo.java

@ -0,0 +1,18 @@
package com.yxt.anrui.terminal.api.risk.baseInfo;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/3 11:30
* @Description
*/
@Data
public class AppAutoRiskBaseInfoVo implements Vo {
//家访考察代办
private String jfkcNum;
//放款资料上传代办
private String fkzlscNum;
}

7
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -204,6 +204,7 @@ public class InvoicedService {
vo.setInvoiceStateKey("001");
vo.setInvoiceState("正常开票");
vo.setDate(DateUtil.formatDate(new Date()));
vo.setShowXsState(true);
return rb.success().setData(vo);
}
ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid());
@ -252,7 +253,10 @@ public class InvoicedService {
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
vinListVo.setXSState(finBillVehicle.getXSState());
if (StringUtils.isNotBlank(finBillVehicle.getXSState())){
vinListVo.setXSState(finBillVehicle.getXSState());
vo.setShowXsState(true);
}
vinListVos.add(vinListVo);
}
vo.setVinList(vinListVos);
@ -541,6 +545,7 @@ public class InvoicedService {
finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
finBillVehicleDto.setXSState(vinListDto.getXSState());
finBillVehicleDtos.add(finBillVehicleDto);
}
finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos);

27
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/baseinfo/AppAutoRiskBaseInfoRest.java

@ -0,0 +1,27 @@
package com.yxt.anrui.terminal.biz.risk.baseinfo;
import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoFeign;
import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoQuery;
import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoVo;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* @Author dimengzhe
* @Date 2023/3/3 11:24
* @Description
*/
@Controller
@RequestMapping("riskcenter/v1/baseInfo")
public class AppAutoRiskBaseInfoRest implements AppAutoRiskBaseInfoFeign {
@Autowired
private AppAutoRiskBaseInfoService appAutoRiskBaseInfoService;
@Override
public ResultBean<AppAutoRiskBaseInfoVo> getToDoNum(AppAutoRiskBaseInfoQuery baseInfoQuery) {
return appAutoRiskBaseInfoService.getToDoNum(baseInfoQuery);
}
}

52
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/baseinfo/AppAutoRiskBaseInfoService.java

@ -0,0 +1,52 @@
package com.yxt.anrui.terminal.biz.risk.baseinfo;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonToDoNumQuery;
import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoQuery;
import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoVo;
import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoQuery;
import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoVo;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.LoanHomeVisitInvestigateFeign;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @Author dimengzhe
* @Date 2023/3/3 11:27
* @Description
*/
@Service
public class AppAutoRiskBaseInfoService {
@Autowired
private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
@Autowired
private LoanFileexamineFeign loanFileexamineFeign;
public ResultBean<AppAutoRiskBaseInfoVo> getToDoNum(AppAutoRiskBaseInfoQuery baseInfoQuery) {
String orgPath = baseInfoQuery.getOrgPath();
String userSid = baseInfoQuery.getUserSid();
ResultBean<AppAutoRiskBaseInfoVo> rb = ResultBean.fireFail();
AppAutoRiskBaseInfoVo appAutoRiskBaseInfoVo = new AppAutoRiskBaseInfoVo();
String jfkcNum = "";
String fkzlscNum = "";
if(StringUtils.isNotBlank(orgPath)){
//切换机构
RiskToDoNumQuery appToDoNumQuery = new RiskToDoNumQuery();
appToDoNumQuery.setUserSid(userSid);
appToDoNumQuery.setOrgPath(orgPath);
//家访考察待办数量
jfkcNum = loanHomevisitInvestigateFeign.getToDoNum(appToDoNumQuery).getData();
//放款资料上传代办数量
fkzlscNum = loanFileexamineFeign.getToDoNum(appToDoNumQuery).getData();
}
appAutoRiskBaseInfoVo.setJfkcNum(jfkcNum);
appAutoRiskBaseInfoVo.setFkzlscNum(fkzlscNum);
return rb.success().setData(appAutoRiskBaseInfoVo);
}
}
Loading…
Cancel
Save