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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
2dd0fc8890 2975538933
commit
dba5c7280e
33 changed files with 1154 additions and 370 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. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
  3. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
  4. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
  5. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
  6. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  7. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  8. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  9. 43
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java
  10. 45
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java
  11. 61
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  12. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  13. 64
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillCastToKingDeeBillFields.java
  14. 77
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java
  15. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json
  16. 31
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityDetail.json
  17. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityPlan.json
  18. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_data.json
  19. 60
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json
  20. 221
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/remarks.txt
  21. BIN
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/其他应收单的参数必填备注.xlsx
  22. 16
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApply.java
  23. 27
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDetailsVo.java
  24. 20
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDto.java
  25. 10
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java
  26. 10
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java
  27. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyQuery.java
  28. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java
  29. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeo.java
  30. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java
  31. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml
  32. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java
  33. 705
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
View File

@ -112,6 +112,14 @@ public interface BaseVehmodelConfigFeign {
@PostMapping("selVehModelByUseOrgSidAndModelSidAndConfigSid")
ResultBean<PagerVo<BaseVehmodelConfigVos>> selVehModelByUseOrgSidAndModelSidAndConfigSid(@RequestBody PagerQuery<BaseVehmodelConfigQuerys> pq);
/**
* 根据分公司查询车型配置关联表中的车型信息
* @return
*/
@ApiOperation("根据分公司查询车型配置关联表中的车型信息")
@PostMapping("/selModelByUseOrgSid")
ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
/**
* 根据分公司sid查询车型和常用配置关联表
* 排除已选择的车型与常用配置关联sid并查询其他

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
View File

@ -93,6 +93,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
return null;
}
@Override
public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid) {
return null;
}
@Override
public ResultBean<PagerVo<BaseVehmodelConfigVehicleVos>> selVehModelByUseOrgSidAll(PagerQuery<BaseVehmodelConfigVehicleQuery> pq) {
return null;

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
View File

@ -140,4 +140,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
@Select("SELECT configurationItemsSid FROM base_vehmodel_config WHERE modelSid = #{modelSid}")
List<String> selectModelConfigSidByModelSid(@Param("modelSid") String modelSid);
List<BaseVehmodelConfigVos> selModelByUseOrgSid(String useOrgSid);
}

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
View File

@ -219,7 +219,14 @@
</select>
<select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
select bvc.sid as modelConfigSid,bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid, bmc.configName,bvc.manufactorSettlementPrice,bvc.modifyTime
select bvc.sid as modelConfigSid,
bvc.guidedPrice,
bm.modelName,
bmc.otherConfig,
bm.carBrand as brandSid,
bmc.configName,
bvc.manufactorSettlementPrice,
bvc.modifyTime
from base_vehmodel_config bvc
left join base_vehicle_model bm on bvc.modelSid = bm.sid
left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
@ -229,7 +236,7 @@
</select>
<select id="selectCarConfigSummary"
resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
SELECT bmc.sid as configSid,
SELECT bmc.sid as configSid,
bvm.sid AS modelSid,
bvm.vehicleAlias AS model,
bvm.carBrand AS brandSid,
@ -359,4 +366,13 @@
${ew.sqlSegment}
</where>
</select>
<select id="selModelByUseOrgSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVos">
SELECT DISTINCT bvm.`sid` AS modelSid,
bvm.vehicleAlias
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm
ON bvc.`modelSid` = bvm.`sid`
WHERE useOrgSid = #{useOrgSid}
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
View File

@ -130,6 +130,11 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid) {
return baseVehmodelConfigService.selModelByUseOrgSid(useOrgSid);
}
@Override
public ResultBean<PagerVo<BaseVehmodelConfigVehicleVos>> selVehModelByUseOrgSidAll(PagerQuery<BaseVehmodelConfigVehicleQuery> pq) {
ResultBean rb = ResultBean.fireFail();

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
View File

@ -941,4 +941,10 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
public List<String> selectModelConfigSidByModelSid(String modelSid) {
return baseMapper.selectModelConfigSidByModelSid(modelSid);
}
public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid) {
ResultBean rb = ResultBean.fireFail();
List<BaseVehmodelConfigVos> baseVehmodelConfigVos = baseMapper.selModelByUseOrgSid(useOrgSid);
return rb.success().setData(baseVehmodelConfigVos);
}
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
View File

@ -14,6 +14,7 @@ import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt;
import com.yxt.anrui.fin.api.kingdee.cnrecpaypurpose.CNRecpaypurpose;
import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
@ -56,6 +57,11 @@ public interface FinKingDeeFeign {
@ResponseBody
ResultBean<String> draftReceivableBill(@RequestBody @Valid ARReceivable aRReceivable);
@ApiOperation("暂存其他应收单的接口")
@PostMapping("/draftOtherReceivableBill")
@ResponseBody
ResultBean<String> draftOtherReceivableBill(@RequestBody @Valid OtherReceivable otherReceivable);
@ApiOperation("暂存付款单的接口")
@PostMapping("/draftArReceivebill")
@ResponseBody

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

@ -14,6 +14,7 @@ import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt;
import com.yxt.anrui.fin.api.kingdee.cnrecpaypurpose.CNRecpaypurpose;
import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
@ -35,6 +36,11 @@ implements FinKingDeeFeign{
return null;
}
@Override
public ResultBean<String> draftOtherReceivableBill(OtherReceivable otherReceivable) {
return null;
}
@Override
public ResultBean<String> draftArReceivebill(ARReceivebill arReceivebill) {
return null;

43
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java
View File

@ -1,27 +1,28 @@
package com.yxt.anrui.fin.api.kingdee;
public enum KingDeeBillId {
AP_PAYABLE("AP_Payable","应付单"),
AR_RECEIVABLE("AR_receivable","应收单"),
AP_PAYBILL("AP_PAYBILL","付款单"),
AR_RECEIVEBILL("AR_RECEIVEBILL","收款单"),
STK_INSTOCK("STK_InStock","采购入库单"),
PUR_MRB("PUR_MRB","采购退料单"),
SAL_OUTSTOCK("SAL_OUTSTOCK","销售出库单"),
STK_TRANSFERDIRECT("STK_TransferDirect","直接调拨单"),
ORG_ORGANIZATIONS("ORG_Organizations","组织机构"),
BD_Department("BD_Department","部门"),
BD_CUSTOMER("BD_Customer","客户"),
BD_Empinfo("BD_Empinfo","员工"),
BD_SUPPLIER("BD_Supplier","供应商"),
BD_MATERIAL("BD_MATERIAL","物料"),
BD_BANK("BD_BANK","银行"),
CN_BANKACNT("CN_BANKACNT","银行账号"),
PAEZ_CLLX("PAEZ_CLLX","车辆类型"),
BD_MATERIALCATEGORY("BD_MATERIALCATEGORY","存货类别"),
BD_SETTLETYPE("BD_SETTLETYPE","结算方式"),
CN_RECPAYPURPOSE("CN_RECPAYPURPOSE","收付款用途"),
BD_STOCK("BD_STOCK","仓库");
AP_PAYABLE("AP_Payable", "应付单"),
AR_RECEIVABLE("AR_receivable", "应收单"),
OTHER_RECEIVABLE("OTHER_RECEIVABLE", "其他应收单"),
AP_PAYBILL("AP_PAYBILL", "付款单"),
AR_RECEIVEBILL("AR_RECEIVEBILL", "收款单"),
STK_INSTOCK("STK_InStock", "采购入库单"),
PUR_MRB("PUR_MRB", "采购退料单"),
SAL_OUTSTOCK("SAL_OUTSTOCK", "销售出库单"),
STK_TRANSFERDIRECT("STK_TransferDirect", "直接调拨单"),
ORG_ORGANIZATIONS("ORG_Organizations", "组织机构"),
BD_Department("BD_Department", "部门"),
BD_CUSTOMER("BD_Customer", "客户"),
BD_Empinfo("BD_Empinfo", "员工"),
BD_SUPPLIER("BD_Supplier", "供应商"),
BD_MATERIAL("BD_MATERIAL", "物料"),
BD_BANK("BD_BANK", "银行"),
CN_BANKACNT("CN_BANKACNT", "银行账号"),
PAEZ_CLLX("PAEZ_CLLX", "车辆类型"),
BD_MATERIALCATEGORY("BD_MATERIALCATEGORY", "存货类别"),
BD_SETTLETYPE("BD_SETTLETYPE", "结算方式"),
CN_RECPAYPURPOSE("CN_RECPAYPURPOSE", "收付款用途"),
BD_STOCK("BD_STOCK", "仓库");
private String ID;
private String NAME;

45
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java
View File

@ -0,0 +1,45 @@
package com.yxt.anrui.fin.api.kingdee.otherarreceivable;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.math.BigDecimal;
import java.util.List;
/**
* 应收单
*/
@Data
public class OtherReceivable {
@ApiModelProperty("单据类型")
public String billType = "其他应收单";
@ApiModelProperty("往来单位类型")
public String commUnitType = "客户";
@ApiModelProperty("往来单位")
public String commUnit;
@ApiModelProperty("收款组织")
public String collectionOrg;
@ApiModelProperty("币别")
public String currency = "人民币";
@ApiModelProperty("业务日期")
public String bussDate;
@ApiModelProperty("收款明细")
public List<CollectionDetailDto> collectionDetails;
@Data
public static class CollectionDetailDto implements Dto {
@ApiModelProperty("承担部门")
public String dearDept;
@ApiModelProperty("发票类型")
public String invoiceType = "普通发票";
@ApiModelProperty("不含税金额")
public String exTaxMoney;
@ApiModelProperty("用途")
public String useTo = "调账申请";
}
}

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

@ -428,6 +428,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setCreateBySid(dto.getCreateBySid());
finSelectedReceivablesDetailed.setCreateByName(dto.getCreateByName());
finSelectedReceivablesDetailed.setContractSid(yxysFinFundsCarriedForwardYXYSKXVo.getContractSid());
finSelectedReceivablesDetailed.setContractNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
finSelectedReceivablesDetailed.setCustomerName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
@ -436,14 +438,19 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
finSelectedReceivablesDetailed.setCustomerPhone(yxysFinFundsCarriedForwardYXYSKXVo.getMobile());
finSelectedReceivablesDetailed.setCurrentReceivableMoney(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getReceivable()));
finSelectedReceivablesDetailed.setSubscriptionMoney(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finSelectedReceivablesDetailed.setBalance(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney());
finSelectedReceivablesDetailed.setVIN(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
finSelectedReceivablesDetailed.setSubscriptionDate(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmDate());
finSelectedReceivablesDetailed.setReceivablesSid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
finSelectedReceivablesDetailed.setPayType(yxysFinFundsCarriedForwardYXYSKXVo.getPayType());
finSelectedReceivablesDetailed.setPayTypeKey(yxysFinFundsCarriedForwardYXYSKXVo.getPayTypeKey());
finSelectedReceivablesDetailed.setUseOrgSid(yxysFinFundsCarriedForwardYXYSKXVo.getUseOrgSid());
finSelectedReceivablesDetailed.setUseOrgSid(dto.getUseOrgSid());
finSelectedReceivablesDetailed.setSubscribedOf(yxysFinFundsCarriedForwardYXYSKXVo.getSubscribedOf());
finSelectedReceivablesDetailed.setCollSid(finFundsCarriedForwardApply.getSid());
if ("已办结".equals(finFundsCarriedForwardApply.getNodeState())){
finSelectedReceivablesDetailed.setAuditState(3);
}
finSelectedReceivablesDetailed.setAuditDate(DateUtil.formatDate(new Date()));
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
}
return rb.success().setData(finFundsCarriedForwardApply.getSid());
@ -511,14 +518,25 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
//用户的组织全路径
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(dto.getSid());
List<FinFundsCarriedForwardVehDto> finFundsCarriedForwardVehDetailsVos = dto.getFinFundsCarriedForwardVehDetailsVos();
List<AppFinFundsCarriedForwardYXYSKXDto> yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos();
if (finFundsCarriedForwardVehDetailsVos.size() > 1 && yxysFinFundsCarriedForwardYXYSKXVos.size() > 1){
return rb.setMsg("不符合一对多或者多对一的关系，请重新选择");
}
BigDecimal jzjehj = new BigDecimal("0");
BigDecimal rkje = new BigDecimal("0");
for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDto : finFundsCarriedForwardVehDetailsVos) {
String thisUseMoney = finFundsCarriedForwardVehDto.getThisUseMoney();
jzjehj = jzjehj.add(new BigDecimal(thisUseMoney));
}
List<AppFinFundsCarriedForwardYXYSKXDto> yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos();
BigDecimal rkje = new BigDecimal("0");
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
if (yxysFinFundsCarriedForwardYXYSKXVo.getProjectName().equals("订金")){
BigDecimal receivable = new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getReceivable());
BigDecimal confirmMoney = new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney());
int i = confirmMoney.compareTo(receivable);
if (i == 1){
return rb.setMsg("订金的认款金额不能大于应收金额");
}
}
String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
rkje = rkje.add(new BigDecimal(confirmMoney));
}
@ -607,6 +625,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
updateYeBySid(businessSid);
for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(1,finFundsCarriedForwardVehDetailsVo.getBusSid());
}
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null){
@ -928,6 +949,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), finFundsCarriedForwardApply.getCreateByName()).getData();
baseMapper.updatePathBySid(pdfPath,businessSid);
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = finFundsCarriedForwardVehService.fetchByMainSid(businessSid);
for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(3,finFundsCarriedForwardVehDetailsVo.getBusSid());
}
} else {
//极光推送
finFundsCarriedForwardApply = fetchBySid(businessSid);
@ -1025,8 +1050,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
//余额
BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
BigDecimal balance = subscriptionMoney.subtract(new BigDecimal(djjzMoney));
finSelectedReceivablesDetailedService.updateYeBySid(balance.toString(), finFundsCarriedForwardVehDetailsVo.getSid());
finFundsCarriedForwardVehService.updateYeByMainSid(balance.toString(), businessSid);
finSelectedReceivablesDetailedService.updateYeBySid(balance.toString(), finFundsCarriedForwardVehDetailsVo.getBusSid());
finFundsCarriedForwardVehService.updateYeByMainSid(balance.toString(), finFundsCarriedForwardVehDetailsVo.getSid());
}
}
return rb.success();
@ -1065,18 +1090,20 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
Map<String, Object> dataMap = new HashMap();
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInsId(), "1").getData();
if (flowRecordVo != null) {
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
if (flowTask.getFlowableRecordVo() != null) {
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
String taskDefKey = (String) flowableRecordVo.get("taskDefKey");
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
String finishTime = (String) flowableRecordVo.get("finishTime");
finishTime = finishTime.substring(0, 10);
if ("Activity_1nfy3ql".equals(taskDefKey)) {
dataMap.put("spName", assigneeName + finishTime);
if (StringUtils.isNotBlank(data.getProcInsId())){
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInsId(), "1").getData();
if (flowRecordVo != null) {
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
if (flowTask.getFlowableRecordVo() != null) {
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
String taskDefKey = (String) flowableRecordVo.get("taskDefKey");
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
String finishTime = (String) flowableRecordVo.get("finishTime");
finishTime = finishTime.substring(0, 10);
if ("Activity_1nfy3ql".equals(taskDefKey)) {
dataMap.put("spName", assigneeName + finishTime);
}
}
}
}

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -18,6 +18,7 @@ import com.yxt.anrui.fin.api.kingdee.cnrecpaypurpose.CNRecpaypurpose;
import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeOrgAndDeptCode;
import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeUtils;
import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
@ -36,6 +37,7 @@ import com.yxt.anrui.fin.biz.kingdee.bdsupplier.BdSupplierService;
import com.yxt.anrui.fin.biz.kingdee.cnbankcnt.CNBankcntService;
import com.yxt.anrui.fin.biz.kingdee.cnrecpaypurpose.CNRecpaypurposeService;
import com.yxt.anrui.fin.biz.kingdee.orgorganizations.OrgOrganizationsService;
import com.yxt.anrui.fin.biz.kingdee.otherreceivablebill.OtherReceivableBillService;
import com.yxt.anrui.fin.biz.kingdee.purmrb.PurMrbService;
import com.yxt.anrui.fin.biz.kingdee.push.PushService;
import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
@ -157,6 +159,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
*/
@Autowired
private ArReceivebillService arReceivebillService;
/**
* 其他应收单
*/
@Autowired
private OtherReceivableBillService otherReceivableBillService;
@ApiOperation("入账暂存应付单的接口")
@PostMapping("/draftEntryBill")
@ResponseBody
@ -173,6 +180,13 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
log.info("FinKingDeeFeignRest-draftReceivableBill:{}", JSONObject.toJSONString(aRReceivable));
return receivableBillService.draftReceivableBill(aRReceivable);
}
@Override
public ResultBean<String> draftOtherReceivableBill(OtherReceivable otherReceivable) {
log.info("FinKingDeeFeignRest-draftOtherReceivableBill:{}", JSONObject.toJSONString(otherReceivable));
return otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
@ApiOperation("暂存收款单的接口")
@PostMapping("/draftArReceivebill")
@ResponseBody

64
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillCastToKingDeeBillFields.java
View File

@ -0,0 +1,64 @@
package com.yxt.anrui.fin.biz.kingdee.otherreceivablebill;
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 OtherReceivableBillCastToKingDeeBillFields {
/**
* 构造金蝶需要的数据结构 并对字段赋值
*
* @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/otherreceivablebill/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json");
String fEntityPlan_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityPlan.json");
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField);
JSONObject jsonFEntityPlan_= JSONObject.parseObject(fEntityPlan_,Feature.OrderedField);
fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);
List<JSONObject> list_fEntityDetail_=new ArrayList<>();
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityDetail.json");
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {
map_fEntityDetail_.put(entry.getKey(),entry.getValue());
}
fEntityDetail_ =KingDeeUtils.replaceTemplateParams(fEntityDetail_, map_fEntityDetail_);
list_fEntityDetail_.add(JSONObject.parseObject(fEntityDetail_,Feature.OrderedField));
}
jsonFEntityModel_.put("FEntityDetail", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));
List<JSONObject> list_fEntityPlan_=new ArrayList<>();
list_fEntityPlan_.add( jsonFEntityPlan_);
jsonFEntityModel_.put("FEntityPlan", JSONArray.parseArray(JSON.toJSONString(list_fEntityPlan_)));
jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
jsonObj.put("data",jsonFEntityData_.toJSONString());
return jsonObj.toJSONString();
}
}

77
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java
View File

@ -0,0 +1,77 @@
package com.yxt.anrui.fin.biz.kingdee.otherreceivablebill;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
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 OtherReceivableBillService extends FinKingDeeService {
/**
* 生成的其他应收单的数据，推送到金蝶的平台中
* @param otherReceivable
* @return
*/
public ResultBean otherReceivableBillService(OtherReceivable otherReceivable) {
ResultBean rb=ResultBean.fireFail();
//业务表的主表数据集合
/*Map<String,String> map_fEntityModel_=new HashMap<>();
//物料的数组集合
if(aRReceivable.getApplicationDate()==null){
return rb.setMsg("业务日期 不能为空");
}
//业务日期
map_fEntityModel_.put("FDATE",aRReceivable.getApplicationDate());
map_fEntityModel_.put("FCUSTOMERID",aRReceivable.getFcustomerid());
//供应商:FSUPPLIERID (必填项)
if(aRReceivable.getApplicationDate()==null){
return rb.setMsg("供应商 不能为空");
}
// map_fEntityModel_.put("FSUPPLIERID","010001");
List<ARReceivable.ScmApplyInboundVehicleDto> vehicleList = aRReceivable.getVehicleList()==null?new ArrayList<>(): aRReceivable.getVehicleList();
//准备 物料列表的数据
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(vehicleList);
if(!vehicleListMap.getSuccess()){
return rb.setMsg(vehicleListMap.getMsg());
}
String kingDeeData = OtherReceivableBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap.getData());
try {
return accessKingDeeInterface(KingDeeBillId.AP_PAYABLE.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
} catch (Exception e) {
e.printStackTrace();
}*/
return rb;
}
/**
* 准备 物料列表的数据 ForReceivableBill
*/
public ResultBean<List<Map<String, String>>> createVehicleListsForReceivableBill(List<ARReceivable.ScmApplyInboundVehicleDto> vehicleList) {
ResultBean<List<Map<String, String>>> rb=ResultBean.fireFail();
List<Map<String,String>> vehicleListMap=new ArrayList<>();
for(int i = 0; i< vehicleList.size(); i++){
ARReceivable.ScmApplyInboundVehicleDto f= vehicleList.get(i);
Map<String,String> m=new HashMap<>();
if(StringUtils.isBlank(f.getVinNo())){
return rb.setMsg("物料编码 不能为空");
}
if(StringUtils.isBlank(f.getRemarks())){
return rb.setMsg("物料名称 不能为空");
}
m.put("FMATERIALID",f.getVinNo());
m.put("FMaterialDesc",f.getRemarks());
m.put("FPRICEUNITID","liang");
vehicleListMap.add(m);
}
return rb.success().setData(vehicleListMap);
}
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json
View File

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

31
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityDetail.json
View File

@ -0,0 +1,31 @@
{
"FMATERIALID": {
"FNumber": "@KD_FMATERIALID"
},
"FMaterialDesc": "@KD_FMaterialDesc",
"FPRICEUNITID": {
"FNumber": "@KD_FPRICEUNITID"
},
"FPriceQty": 1.0,
"FTaxPrice": 12222.0,
"FPrice": 12100.99,
"FEntryTaxRate": 1.0,
"FNoTaxAmountFor_D": 12100.99,
"FTAXAMOUNTFOR_D": 121.01,
"FALLAMOUNTFOR_D": 12222.0,
"FDeliveryControl": false,
"FStockUnitId": {
"FNumber": "@KD_FPRICEUNITID"
},
"FStockQty": 1.0,
"FIsFree": false,
"FStockBaseQty": 1.0,
"FSalUnitId": {
"FNumber": "@KD_FPRICEUNITID"
},
"FSalQty": 1.0,
"FSalBaseQty": 1.0,
"FPriceBaseDen": 1.0,
"FSalBaseNum": 1.0,
"FStockBaseNum": 1.0
}

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntityPlan.json
View File

@ -0,0 +1,5 @@
{
"FENDDATE": "2022-08-02 00:00:00",
"FPAYRATE": 100.0,
"FPAYAMOUNTFOR": 12222.0
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_data.json
View File

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

60
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json
View File

@ -0,0 +1,60 @@
{
"FID": 0,
"FBillTypeID": {
"FNUMBER": "YSD01_SYS"
},
"FDATE": "@KD_FDATE",
"FISINIT": false,
"FENDDATE_H": "@KD_FDATE",
"FCUSTOMERID": {
"FNumber": "@KD_FCUSTOMERID"
},
"FCURRENCYID": {
"FNumber": "PRE001"
},
"FISPRICEEXCLUDETAX": true,
"FSETTLEORGID": {
"FNumber": "101"
},
"FPAYORGID": {
"FNumber": "101"
},
"FSALEORGID": {
"FNumber": "101"
},
"FAR_Remark": "@KD_FAR_Remark",
"FISTAX": true,
"FCancelStatus": "A",
"FBUSINESSTYPE": "BZ",
"FSetAccountType": "1",
"FISHookMatch": false,
"FISINVOICEARLIER": false,
"F_PMZC_Assistant2": {
"FNumber": "01"
},
"FsubHeadSuppiler": {
"FORDERID": {
"FNumber": "@KD_FCUSTOMERID"
},
"FTRANSFERID": {
"FNumber": "@KD_FCUSTOMERID"
},
"FChargeId": {
"FNumber": "@KD_FCUSTOMERID"
}
},
"FsubHeadFinc": {
"FACCNTTIMEJUDGETIME": "@KD_FDATE",
"FMAINBOOKSTDCURRID": {
"FNumber": "PRE001"
},
"FEXCHANGETYPE": {
"FNumber": "HLTX01_SYS"
},
"FExchangeRate": 1.0,
"FTaxAmountFor": 121.01,
"FNoTaxAmountFor": 12100.99
},
"FEntityDetail": [],
"FEntityPlan": []
}

221
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/remarks.txt
View File

@ -0,0 +1,221 @@
一、请求参数说明:
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类型（必录）
五、字段说明:
销售单位:FSalUnitId
库存基本数量:FStockBaseQty
库存数量:FStockQty
销售基本数量:FSalBaseQty
库存基本分子:FStockBaseNum
销售基本分子:FSalBaseNum
计价基本分母:FPriceBaseDen
库存单位:FStockUnitId
工序号:FOPERNUMBER
序列号:FSEQNUMBER
工序计划号:FOPNO
作业:FPROCESSID
是否赠品:FIsFree
源单行内码:FSRCROWID
生产车间:FFPRODEPARTMENTID
销售基本数量(财务):FSALFINBASEQTY
已下推负数财务应收数量:FPushRedQty
销售发票价税合计期初:FIVINIALLAMOUNTFOR
客户物料编码:FCustMatID
车辆类型:F_PAEZ_BaseProperty
优惠额:F_PAEZ_Decimal
客户物料名称:FCustMatName
销售发票数量（基本单位）期初:FBUYIVINIBASICQTY
销售订单行内码:FORDERENTRYID
成本金额:FCOSTAMTSUM
销售数量:FSalQty
源单单据类型:FSOURCEBILLTYPEID
销售发票数量期初:FBUYIVINIQTY
已收款金额:FRECEIVEAMOUNT
销售订单行号:FORDERENTRYSEQ
业务单据内码:FBizID
业务单据分录内码:FBizEntryId
特殊核销金额:FSpecialAmountFor
业务单据类型:FBizBillTypeId
物料说明:FMaterialDesc
业务单据名称:FBizFormId
业务单据编号:FBizBillNo
特殊核销数量:FSpecialQTY
已开票核销数量:FOPENQTY_D
销售发票数量:FBUYIVQTY
销售发票数量（基本单位）:FBUYIVBASICQTY
卖家代扣增值税税率:FTEMPTAXRATE
结算清单调拨类型:FSettleTran
已开票金额（下推审核反写、核销反写）:FHadMatchAmountFor
已核销不含税金额:FMatchNotTaxAmtFor
卡片编码:FASSETID
费用项目名称:FCOSTNAME
费用项目编码:FCOSTID
资产名称:FAssetName
生产订单行号:FMOENTRYSEQ
生产订单编号:FMONUMBER
费用承担部门:FCOSTDEPARTMENTID
库存组织:FSTOCKORGID
关联出库数量（基本单位）:FBaseStockOutJoinQty
发货上限（基本单位）:FBaseDeliveryMaxQty
销售订单内码（删除）:FSaleOrderID
控制发货数量:FDeliveryControl
业务流程:FBFLowId
批号:FLot
辅助属性:FAUXPROPID
物料分组:F_PAEZ_BaseProperty1
增值税:FVAT
计入成本金额:FCostAmount
计入成本比例:FCostPercent
卖方代扣代缴:FSellerWithholding
物料名称:FMETRIALNAME
物料编码:FMETRIALID
买方代扣代缴:FBuyerWithholding
税额:FTaxAmount_T
物料名称:FMATERIALNAME_S
物料编码:FMATERIALID_S
订单收款计划明细内码:FRECEIVABLEENTRYID
订单行号:FMATERIALSEQ
税率(%):FTaxRate
税率名称:FTaxRateId
收（退）款单关联金额本位币:FWRITTENOFFAMOUNT
成本金额:FCOSTAMT
成本价:FCOSTPrice
会计政策:FACCTPOLICY
基本单位数量:FBaseQty
基本单位:FBASICUNIT
明细内码:FDEntryID
源单行号:FSEQSRC
核算体系:FACCTSYS
计价单位:FPriceUnit
货物类别:FMETRIALTYPE
规格型号:FMetrialModel
计价数量:FPriceUnitQty
源单内码:FROWNOSRC
源单单号:FBILLNOSRC
源出库单类型:FOUTSTOCKTYPE
本位币:FMAINBOOKSTDCURRID (必填项)
结算方式:FSettleTypeID
订货方:FORDERID
税额:FTaxAmountFor
不含税金额本位币:FNoTaxAmount
税额本位币:FTaxAmount
不含税金额:FNoTaxAmountFor
付款方:FChargeId
赠送套餐:F_PAEZ_Decimal3
销售折让:F_PAEZ_Decimal2
返利金额:F_PAEZ_Decimal1
物流车辆:F_PMZC_Base
收货方:FTRANSFERID
物流客户:F_PMZC_Assistant1
运输编号:F_PMZC_Assistant
应收比例(%):FPAYRATE
表头计划 - 收（退）款单关联金额:FRELATEHADPAYAMOUNT_P
表头计划 - 未核销金额（作废）:FNOTWRITTENOFFAMOUNTFOR_P
已核销金额:FWRITTENOFFAMOUNTFOR_P
销售订单内码:FSALEORDERID_S
销售订单号:FORDERBILLNO
付款申请关联金额:FAPPLYAMOUNT
表头计划 - 核销状态:FWRITTENOFFSTATUS_P
汇率:FExchangeRate
汇率类型:FEXCHANGETYPE (必填项)
价税合计本位币:FALLAMOUNT
到期日计算日期:FACCNTTIMEJUDGETIME
应收金额本位币:FPAYAMOUNT
应收金额:FPAYAMOUNTFOR
表头计划 - 到期日:FENDDATE
作废日期:FCancelDate
作废人:FCancellerId
按含税单价录入:FISTAX
作废状态:FCancelStatus (必填项)
销售组织:FSALEORGID
客户:FCUSTOMERID (必填项)
收款条件:FPayConditon
会计核算体系:FACCOUNTSYSTEM
价税合计:FALLAMOUNTFOR
创建人:FCreatorId
货主:FOWNERID
货主类型:FOWNERTYPE
到期日:FENDDATE_H
销售员:FSALEERID
销售组:FSALEGROUPID
销售部门:FSALEDEPTID
创建日期:FCreateDate
审核日期:FAPPROVEDATE
修改人:FModifierId
修改日期:FModifyDate
表头基本 - 收款核销状态:FWRITTENOFFSTATUS
审核人:FAPPROVERID
单据类型:FBillTypeID (必填项)
表头基本 - 收（退）款单的关联金额:FRelateHadPayAmount
单据状态:FDocumentStatus
单据编号:FBillNo
业务日期:FDATE (必填项)
币别:FCURRENCYID (必填项)
表头基本 -未收款核销金额（作废）:FNOTWRITTENOFFAMOUNTFOR
结算组织:FSETTLEORGID (必填项)
表头基本 - 开票核销状态:FOPENSTATUS
税率(%):FEntryTaxRate
不含税金额:FNoTaxAmountFor_D
折扣率(%):FEntryDiscountRate
税额:FTAXAMOUNTFOR_D
销售发票价税合计:FIVALLAMOUNTFOR
备注:FComment
价税合计:FALLAMOUNTFOR_D
折扣额:FDISCOUNTAMOUNTFOR
物料类别:FMaterialType
规格型号:FModel
物料名称:FMaterialName
单价:FPrice
计价数量:FPriceQty
价格系数:FPriceCoefficient
含税单价:FTaxPrice
含税净价:FPriceWithTax
计价基本数量:FBASICUNITQTY
基本单位:FBASICUNITID
基本单位关联数量:FBaseJoinQty
税组合:FTaxCombination
源单编号:FSourceBillNo
源单类型:FSOURCETYPE
计价单位:FPRICEUNITID
价税合计本位币:FALLAMOUNT_D
税额本位币:FTAXAMOUNT_D
折扣额本位币:FDISCOUNTAMOUNT
不含税金额本位币:FNOTAXAMOUNT_D
销售订单号:FORDERNUMBER
表体明细 - 已开票核销金额:FOPENAMOUNTFOR_D
表体明细 - 开票核销状态:FOPENSTATUS_D
业务类型:FBUSINESSTYPE
核销方式:FMatchMethodID
零售:FISRETAIL
现销 :FCASHSALE
信用检查结果:FCreditCheckResult
收款组织:FPAYORGID (必填项)
销售业务类型:FSALESBUSTYPE
是否期初单据:FISINIT
转出客户:FOUTCUSTOMERID
扫描点:FScanPoint
生成方式:FByVerify
项目类别:F_PAEZ_Assistant1
物料编码:FMATERIALID
是否开票:F_PMZC_Assistant2
中介单位:F_PAEZ_Base
红蓝字:FRedBlue
备注:FAR_Remark
价外税:FISPRICEEXCLUDETAX
B2C业务:FISB2C
立账类型:FSetAccountType
先到票后出库:FISINVOICEARLIER
转销:FIsWriteOff
参与暂估应收核销:FISHookMatch

BIN
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/其他应收单的参数必填备注.xlsx
View File

Binary file not shown.

16
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApply.java
View File

@ -55,6 +55,8 @@ public class LoanPreloanCreditApply extends BaseEntity {
private String qySid; // 企业sid
@ApiModelProperty("企业名称")
private String qyName; // 企业名称
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("身份证号码")
private String idCard; // 身份证号码
@ApiModelProperty("客户sid")
@ -73,24 +75,14 @@ public class LoanPreloanCreditApply extends BaseEntity {
private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("申请编号")
private String billNo; // 申请编号
@ApiModelProperty("公司风控结果")
private String gsfkjg;
@ApiModelProperty("公司审核日期")
private String gsshDate;
@ApiModelProperty("公司审核备注")
private String gsshRemarks;
@ApiModelProperty("资方余额")
private String capitalBalance;
@ApiModelProperty("资方风控结果")
private String zffkjg;
@ApiModelProperty("资方审核日期")

27
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDetailsVo.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Data
@ -41,6 +43,11 @@ public class LoanPreloanCreditApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("申请部门sid")
@ -59,6 +66,8 @@ public class LoanPreloanCreditApplyDetailsVo implements Vo {
private String qySid; // 企业sid
@ApiModelProperty("企业名称")
private String qyName; // 企业名称
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("身份证号码")
private String idCard; // 身份证号码
@ApiModelProperty("客户sid")
@ -77,24 +86,14 @@ public class LoanPreloanCreditApplyDetailsVo implements Vo {
private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("申请编号")
private String billNo; // 申请编号
@ApiModelProperty("公司风控结果")
private String gsfkjg;
@ApiModelProperty("公司审核日期")
private String gsshDate;
@ApiModelProperty("公司审核备注")
private String gsshRemarks;
@ApiModelProperty("资方余额")
private String capitalBalance;
@ApiModelProperty("资方风控结果")
private String zffkjg;
@ApiModelProperty("资方审核日期")
@ -109,4 +108,8 @@ public class LoanPreloanCreditApplyDetailsVo implements Vo {
private List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeos;
@ApiModelProperty("公司风控要求的文件")
private List<String> comFkFiles = new ArrayList<>();
@ApiModelProperty("公司查询结果截图")
private List<String> gsQueryResults = new ArrayList<>();
@ApiModelProperty("资方查询结果截图")
private List<String> zfQueryResults = new ArrayList<>();
}

20
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDto.java
View File

@ -41,6 +41,8 @@ public class LoanPreloanCreditApplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("申请部门sid")
@ -59,6 +61,8 @@ public class LoanPreloanCreditApplyDto implements Dto {
private String qySid; // 企业sid
@ApiModelProperty("企业名称")
private String qyName; // 企业名称
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("身份证号码")
private String idCard; // 身份证号码
@ApiModelProperty("客户sid")
@ -77,12 +81,20 @@ public class LoanPreloanCreditApplyDto implements Dto {
private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
@ApiModelProperty("申请编号")
private String billNo; // 申请编号
@ApiModelProperty("公司风控结果")
private String gsfkjg;
@ApiModelProperty("公司审核日期")
private String gsshDate;
@ApiModelProperty("公司审核备注")
private String gsshRemarks;
@ApiModelProperty("资方余额")
private String capitalBalance;
@ApiModelProperty("资方风控结果")
private String zffkjg;
@ApiModelProperty("资方审核日期")
private String zfshDate;
@ApiModelProperty("资方审核备注")
private String zfshRemarks;
@ApiModelProperty("申诉结果")
private String ssjg;
@ApiModelProperty("身份证正反面附件")
@ -91,4 +103,8 @@ public class LoanPreloanCreditApplyDto implements Dto {
private List<LoanPreloanCreditPeoDto> loanPreloanCreditPeos;
@ApiModelProperty("公司风控要求的文件")
private List<String> comFkFiles = new ArrayList<>();
@ApiModelProperty("公司查询结果截图")
private List<String> gsQueryResults = new ArrayList<>();
@ApiModelProperty("资方查询结果截图")
private List<String> zfQueryResults = new ArrayList<>();
}

10
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java
View File

@ -46,11 +46,21 @@ public interface LoanPreloanCreditApplyFeign {
@ResponseBody
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> listPage(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq);
@ApiOperation("金融内勤审核列表")
@PostMapping("/finStaffProcess")
@ResponseBody
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> finStaffProcess(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody LoanPreloanCreditApplyDto dto);
@ApiOperation("提交保存")
@PostMapping("/submitSave")
@ResponseBody
public ResultBean submitSave(@RequestBody LoanPreloanCreditApplyDto dto);
@ApiOperation("公司风控提交")
@PostMapping("/submitCompanyRisk")
@ResponseBody

10
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java
View File

@ -39,11 +39,21 @@ public class LoanPreloanCreditApplyFeignFallback implements LoanPreloanCreditApp
return rb.setMsg("接口anrui-riskcenter/loanpreloancreditapply/listPage无法访问");
}
@Override
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> finStaffProcess(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
return null;
}
@Override
public ResultBean save(LoanPreloanCreditApplyDto dto){
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanpreloancreditapply/save无法访问");
}
@Override
public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
return null;
}
@Override
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
return null;

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyQuery.java
View File

@ -67,4 +67,6 @@ public class LoanPreloanCreditApplyQuery implements Query {
private String menuSid;
@ApiModelProperty("移动端查询条件")
private String name;
@ApiModelProperty("审核状态（1提交，0审核）")
private String state;
}

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java
View File

@ -40,8 +40,8 @@ public class LoanPreloanCreditApplyVo implements Vo {
private String sid;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("审核状态")
private String state;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("申请部门名称")
@ -67,8 +67,4 @@ public class LoanPreloanCreditApplyVo implements Vo {
private String zffkjg;
@ApiModelProperty("申诉结果")
private String ssjg;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeo.java
View File

@ -33,7 +33,7 @@ import lombok.Data;
@Data
@ApiModel(value = "贷前信用审核人员表", description = "贷前信用审核人员表")
@TableName("fin_preloan_credit_peo")
@TableName("loan_preloan_credit_peo")
public class LoanPreloanCreditPeo extends BaseEntity {
private static final long serialVersionUID = 1L;

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java
View File

@ -48,11 +48,12 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
@Select("select * from loan_preloan_credit_apply")
List<LoanPreloanCreditApplyVo> selectListVo();
int selectBySid(String join);
@Update("update loan_preloan_credit_apply set gsfkjg = #{gsshjg},gsshDate = #{gsshDate},gsshRemarks = #{gsshRemarks} where sid=#{dtoSid}")
void submitCompanyRisk(@Param("dtoSid") String dtoSid, @Param("gsshjg") String gsshjg, @Param("gsshDate") String gsshDate, @Param("gsshRemarks") String gsshRemarks);
@Update("update loan_preloan_credit_apply set capitalBalance = #{capitalBalance},zffkjg = #{zfshjg},zfshDate = #{zfshDate},zfshRemarks = #{zfshRemarks} where sid=#{dtoSid}")
void submitCapitalRisk(@Param("dtoSid") String dtoSid, @Param("zfshjg") String zfshjg, @Param("zfshDate") String zfshDate, @Param("zfshRemarks") String zfshRemarks, @Param("capitalBalance") String capitalBalance);
@Update("update loan_preloan_credit_apply set state = 0 where sid = #{sid}")
void updateStateBySid(String sid);
}

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml
View File

@ -20,11 +20,4 @@
${ew.sqlSegment}
</where>
</select>
<select id="selectBySid" resultType="int">
select count(*)
from loan_preloan_credit_apply
where nodeState != '待提交'
and loand_in_set(sid, #{list})
</select>
</mapper>

16
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java
View File

@ -51,6 +51,15 @@ public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
return rb.success().setData(pv);
}
@Override
@ApiOperation("金融内勤审核列表")
@PostMapping("/finStaffProcess")
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> finStaffProcess(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanPreloanCreditApplyVo> pv = loanPreloanCreditApplyService.finStaffProcess(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
@ -58,6 +67,11 @@ public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
return loanPreloanCreditApplyService.saveOrUpdateDto(dto);
}
@Override
public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
return loanPreloanCreditApplyService.submitSave(dto);
}
@Override
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
return loanPreloanCreditApplyService.submitCompanyRisk(dto);
@ -70,7 +84,7 @@ public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return loanPreloanCreditApplyService.delAll(sids);
}

705
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
View File

@ -54,297 +54,428 @@ import java.util.List;
@Service
public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloanCreditApplyMapper, LoanPreloanCreditApply> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private CommonAppendixFeign commonAppendixFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private LoanPreloanCreditPeoService loanPreloanCreditPeoService;
public PagerVo<LoanPreloanCreditApplyVo> listPageVo(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
LoanPreloanCreditApplyQuery query = pq.getParams();
QueryWrapper<LoanPreloanCreditApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgSidPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgSidPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<LoanPreloanCreditApplyVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<LoanPreloanCreditApplyVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getApplyDeptName())) {
qw.like("applyDeptName", query.getApplyDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("modelName", query.getModelName());
}
if (StringUtils.isNotBlank(query.getCustTypeValue())) {
qw.like("custTypeValue", query.getCustTypeValue());
}
if (StringUtils.isNotBlank(query.getKhqyName())) {
qw.and(wrapper -> wrapper.like("custName", query.getKhqyName()).or().like("qyName", query.getKhqyName()));
}
if (StringUtils.isNotBlank(query.getIdCard())) {
qw.like("idCard", query.getIdCard());
}
if (StringUtils.isNotBlank(query.getPhone())) {
qw.like("phone", query.getPhone());
}
if (StringUtils.isNotBlank(query.getGsfkjg())) {
qw.like("gsfkjg", query.getGsfkjg());
}
if (StringUtils.isNotBlank(query.getZffkjg())) {
qw.like("zffkjg", query.getZffkjg());
}
if (StringUtils.isNotBlank(query.getName())) {
//TODO
}
IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<String> saveOrUpdateDto(LoanPreloanCreditApplyDto dto){
ResultBean rb = ResultBean.fireFail();
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private CommonAppendixFeign commonAppendixFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private LoanPreloanCreditPeoService loanPreloanCreditPeoService;
public PagerVo<LoanPreloanCreditApplyVo> listPageVo(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
LoanPreloanCreditApplyQuery query = pq.getParams();
QueryWrapper<LoanPreloanCreditApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgSidPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgSidPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<LoanPreloanCreditApplyVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<LoanPreloanCreditApplyVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getApplyDeptName())) {
qw.like("applyDeptName", query.getApplyDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("modelName", query.getModelName());
}
if (StringUtils.isNotBlank(query.getCustTypeValue())) {
qw.like("custTypeValue", query.getCustTypeValue());
}
if (StringUtils.isNotBlank(query.getKhqyName())) {
qw.and(wrapper -> wrapper.like("custName", query.getKhqyName()).or().like("qyName", query.getKhqyName()));
}
if (StringUtils.isNotBlank(query.getIdCard())) {
qw.like("idCard", query.getIdCard());
}
if (StringUtils.isNotBlank(query.getPhone())) {
qw.like("phone", query.getPhone());
}
if (StringUtils.isNotBlank(query.getGsfkjg())) {
qw.like("gsfkjg", query.getGsfkjg());
}
if (StringUtils.isNotBlank(query.getZffkjg())) {
qw.like("zffkjg", query.getZffkjg());
}
if (StringUtils.isNotBlank(query.getName())) {
//TODO
}
IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<LoanPreloanCreditApplyVo> finStaffProcess(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
LoanPreloanCreditApplyQuery query = pq.getParams();
QueryWrapper<LoanPreloanCreditApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgSidPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgSidPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<LoanPreloanCreditApplyVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<LoanPreloanCreditApplyVo> p = new PagerVo<>();
return p;
}
}
qw.eq("state", 0);
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getApplyDeptName())) {
qw.like("applyDeptName", query.getApplyDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("modelName", query.getModelName());
}
if (StringUtils.isNotBlank(query.getCustTypeValue())) {
qw.like("custTypeValue", query.getCustTypeValue());
}
if (StringUtils.isNotBlank(query.getKhqyName())) {
qw.and(wrapper -> wrapper.like("custName", query.getKhqyName()).or().like("qyName", query.getKhqyName()));
}
if (StringUtils.isNotBlank(query.getIdCard())) {
qw.like("idCard", query.getIdCard());
}
if (StringUtils.isNotBlank(query.getPhone())) {
qw.like("phone", query.getPhone());
}
if (StringUtils.isNotBlank(query.getGsfkjg())) {
qw.like("gsfkjg", query.getGsfkjg());
}
if (StringUtils.isNotBlank(query.getZffkjg())) {
qw.like("zffkjg", query.getZffkjg());
}
if (StringUtils.isNotBlank(query.getName())) {
//TODO
}
IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<String> saveOrUpdateDto(LoanPreloanCreditApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<String> idCardImages = dto.getIdCardImages();
List<String> comFkFiles = dto.getComFkFiles();
List<String> gsQueryResults = dto.getGsQueryResults();
List<String> zfQueryResults = dto.getZfQueryResults();
List<LoanPreloanCreditPeoDto> loanPreloanCreditPeos = dto.getLoanPreloanCreditPeos();
if (StringUtils.isBlank(dtoSid)) {//新增
String sid = this.insertByDto(dto).getData();
for (String idCardImage : idCardImages) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (idCardImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(idCardImage);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String comFkFile : comFkFiles) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (comFkFile.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
comFkFile = comFkFile.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(comFkFile);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String gsQueryResult : gsQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (gsQueryResult.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
gsQueryResult = gsQueryResult.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(gsQueryResult);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String zfQueryResul : zfQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (zfQueryResul.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
zfQueryResul = zfQueryResul.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(zfQueryResul);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
for (String s : idCardImages1) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(s);
commonAppendixDto.setLinkSid(peoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
}
return rb.success().setData(sid);
}
this.updateByDto(dto);
commonAppendixFeign.deleteFiles(dtoSid);
for (String idCardImage : idCardImages) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (idCardImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(idCardImage);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String comFkFile : comFkFiles) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (comFkFile.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
comFkFile = comFkFile.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(comFkFile);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String gsQueryResult : gsQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (gsQueryResult.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
gsQueryResult = gsQueryResult.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(gsQueryResult);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String zfQueryResul : zfQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (zfQueryResul.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
zfQueryResul = zfQueryResul.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(zfQueryResul);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
loanPreloanCreditPeoService.delByMainSid(dtoSid);
for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
for (String s : idCardImages1) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(s);
commonAppendixDto.setLinkSid(peoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
}
return rb.success().setData(dtoSid);
}
public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
if (!stringResultBean.getSuccess()) {
return rb.setMsg("保存失败");
}
String sid = stringResultBean.getData();
baseMapper.updateStateBySid(sid);
return rb.success();
}
public ResultBean<String> insertByDto(LoanPreloanCreditApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
LoanPreloanCreditApply entity = new LoanPreloanCreditApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(LoanPreloanCreditApplyDto dto) {
String dtoSid = dto.getSid();
List<String> idCardImages = dto.getIdCardImages();
List<String> comFkFiles = dto.getComFkFiles();
List<LoanPreloanCreditPeoDto> loanPreloanCreditPeos = dto.getLoanPreloanCreditPeos();
if (StringUtils.isBlank(dtoSid)) {//新增
String sid = this.insertByDto(dto).getData();
for (String idCardImage : idCardImages) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (idCardImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(idCardImage);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String comFkFile : comFkFiles) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (comFkFile.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
comFkFile = comFkFile.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(comFkFile);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
for (String s : idCardImages1) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(s);
commonAppendixDto.setLinkSid(peoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
}
return rb.success().setData(sid);
}
this.updateByDto(dto);
commonAppendixFeign.deleteFiles(dtoSid);
for (String idCardImage : idCardImages) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (idCardImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(idCardImage);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String comFkFile : comFkFiles) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (comFkFile.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
comFkFile = comFkFile.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(comFkFile);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
loanPreloanCreditPeoService.delByMainSid(dtoSid);
for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
for (String s : idCardImages1) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(s);
commonAppendixDto.setLinkSid(peoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
}
return rb.success().setData(dtoSid);
}
public ResultBean<String> insertByDto(LoanPreloanCreditApplyDto dto){
ResultBean rb = ResultBean.fireFail();
LoanPreloanCreditApply entity = new LoanPreloanCreditApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(LoanPreloanCreditApplyDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
LoanPreloanCreditApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public LoanPreloanCreditApplyDetailsVo fetchDetailsVoBySid(String sid){
LoanPreloanCreditApply entity = fetchBySid(sid);
LoanPreloanCreditApplyDetailsVo vo = new LoanPreloanCreditApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
CommonAppendixSelectQuery commonAppendixSelectQuery1 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery1.setLinkSid(sid);
commonAppendixSelectQuery1.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery1).getData();
CommonAppendixSelectQuery commonAppendixSelectQuery2 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery2.setLinkSid(sid);
commonAppendixSelectQuery2.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
List<CommonAppendixVo> data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery2).getData();
List<String> idCardImages = new ArrayList<>();
List<String> comFkFiles = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : data1) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardImages.add(filePath);
}
for (CommonAppendixVo commonAppendixVo : data2) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
comFkFiles.add(filePath);
}
List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
List<String> idCardPeoImages = new ArrayList<>();
for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeoDetailsVo : loanPreloanCreditPeoDetailsVos) {
CommonAppendixSelectQuery commonAppendixSelectQuery3 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery3.setLinkSid(loanPreloanCreditPeoDetailsVo.getSid());
commonAppendixSelectQuery3.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data3 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery3).getData();
for (CommonAppendixVo commonAppendixVo : data3) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardPeoImages.add(filePath);
}
loanPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages);
}
vo.setIdCardImages(idCardImages);
vo.setComFkFiles(comFkFiles);
vo.setLoanPreloanCreditPeos(loanPreloanCreditPeoDetailsVos);
return vo;
}
}
LoanPreloanCreditApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public LoanPreloanCreditApplyDetailsVo fetchDetailsVoBySid(String sid) {
LoanPreloanCreditApply entity = fetchBySid(sid);
LoanPreloanCreditApplyDetailsVo vo = new LoanPreloanCreditApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
CommonAppendixSelectQuery commonAppendixSelectQuery1 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery1.setLinkSid(sid);
commonAppendixSelectQuery1.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery1).getData();
CommonAppendixSelectQuery commonAppendixSelectQuery2 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery2.setLinkSid(sid);
commonAppendixSelectQuery2.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
List<CommonAppendixVo> data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery2).getData();
List<String> idCardImages = new ArrayList<>();
List<String> comFkFiles = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : data1) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardImages.add(filePath);
}
for (CommonAppendixVo commonAppendixVo : data2) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
comFkFiles.add(filePath);
}
List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
List<String> idCardPeoImages = new ArrayList<>();
for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeoDetailsVo : loanPreloanCreditPeoDetailsVos) {
CommonAppendixSelectQuery commonAppendixSelectQuery3 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery3.setLinkSid(loanPreloanCreditPeoDetailsVo.getSid());
commonAppendixSelectQuery3.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data3 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery3).getData();
for (CommonAppendixVo commonAppendixVo : data3) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardPeoImages.add(filePath);
}
loanPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages);
}
vo.setIdCardImages(idCardImages);
vo.setComFkFiles(comFkFiles);
vo.setLoanPreloanCreditPeos(loanPreloanCreditPeoDetailsVos);
return vo;
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
}
delBySids(sids);
for (String sid : sids) {
commonAppendixFeign.deleteFiles(sid);
loanPreloanCreditPeoService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
delBySids(sids);
for (String sid : sids) {
commonAppendixFeign.deleteFiles(sid);
loanPreloanCreditPeoService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
commonAppendixFeign.delFilesByLinkSidAndAttachType(dtoSid,LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
List<String> gsQueryResults = dto.getGsQueryResults();
for (String gsQueryResult : gsQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (gsQueryResult.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
gsQueryResult = gsQueryResult.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(gsQueryResult);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
baseMapper.submitCompanyRisk(dtoSid,dto.getGsshjg(),dto.getGsshDate(),dto.getGsshRemarks());
return rb.success();
}
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
commonAppendixFeign.delFilesByLinkSidAndAttachType(dtoSid, LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
List<String> gsQueryResults = dto.getGsQueryResults();
for (String gsQueryResult : gsQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (gsQueryResult.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
gsQueryResult = gsQueryResult.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(gsQueryResult);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
baseMapper.submitCompanyRisk(dtoSid, dto.getGsshjg(), dto.getGsshDate(), dto.getGsshRemarks());
return rb.success();
}
public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
commonAppendixFeign.delFilesByLinkSidAndAttachType(dtoSid, LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
List<String> zfQueryResults = dto.getZfQueryResults();
for (String zfQueryResult : zfQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (zfQueryResult.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
zfQueryResult = zfQueryResult.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(zfQueryResult);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
baseMapper.submitCapitalRisk(dtoSid, dto.getZfshjg(), dto.getZfshDate(), dto.getZfshRemarks(), dto.getCapitalBalance());
return rb.success();
}
public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
commonAppendixFeign.delFilesByLinkSidAndAttachType(dtoSid,LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
List<String> zfQueryResults = dto.getZfQueryResults();
for (String zfQueryResult : zfQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (zfQueryResult.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
zfQueryResult = zfQueryResult.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(zfQueryResult);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
baseMapper.submitCapitalRisk(dtoSid,dto.getZfshjg(),dto.getZfshDate(),dto.getZfshRemarks(),dto.getCapitalBalance());
return rb.success();
}
}
Write Preview
Loading…
Cancel
Save