Browse Source

优化工作

master
God 2 years ago
parent
commit
b56500a1a0
  1. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java
  3. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
  4. 49
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  5. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  6. 71
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDto.java
  7. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java
  8. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java
  9. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java
  10. 2667
      工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl
  11. 1477
      工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl
  12. 10
      工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc
  13. 6
      工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc
  14. 9
      工作内容需要的文档/单据模板/款项结转打印模板/款项结转(调账申请).doc

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java

@ -92,6 +92,8 @@ public class FinFundsCarriedForwardApplyDto implements Dto {
private String jzjehj; // 结转金额合计
@ApiModelProperty("pdf路径")
private String pdfPath;
@ApiModelProperty("下载类型")
private String pdfType;
@ApiModelProperty("是否为相同销售订单")
private Boolean isOneSale = false;
@ApiModelProperty("款项确认书附件")

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java

@ -50,6 +50,8 @@ import lombok.Data;
public class FinFundsCarriedForwardApplyVo implements Vo {
private String sid;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("申请部门名称")

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml

@ -6,6 +6,7 @@
<select id="selectPageVo"
resultType="com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo">
SELECT fa.sid,
fa.billNo,
fa.nodeState,
fa.procDefId,
fa.procInstSid,

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

@ -380,11 +380,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo);
}
SysUserVo sysUserVo1 = null;
if (finCollectionConfirmation != null){
if (finCollectionConfirmation != null) {
finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finCollectionConfirmation.getStaffDeptSid());
finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finCollectionConfirmation.getStaffDeptName());
sysUserVo1 = sysUserFeign.fetchBySid(finCollectionConfirmation.getStaffUserSid()).getData();
}else {
} else {
finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finFundsCarriedForwardApply.getSaleDeptSid());
finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finFundsCarriedForwardApply.getSaleDeptName());
sysUserVo1 = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
@ -598,8 +598,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
if (isOneSale) {
dto.setIsOneSale(true);
String sid = saveOrUpdateAll(dto).getData();
finFundsCarriedForwardApply = fetchBySid(sid);
//String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
String pdfPath = createPdf(sid, dto.getPdfType()).getData();
//baseMapper.updatePathBySid(pdfPath, sid);
tsqtysd(sid);
return rb.success();
@ -638,7 +637,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else {
} else {
bv.setNextNodeUserSids(sysOrganization.getManagerSid());
}
} else {
@ -862,7 +861,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
private List<TzDto> manyHB(List<TzDto> list) {
//转出为多条,转入为一条
List<TzDto> manyRemoveList = new ArrayList<>();
if (list.get(0).getTzType().equals("转出")){
if (list.get(0).getTzType().equals("转出")) {
list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
transfer.stream().reduce((a, b) -> new TzDto(
a.getTzType(),
@ -875,7 +874,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
a.getDcje() + b.getDcje(),
a.getDrje())).ifPresent(manyRemoveList::add);
});
}else {
} else {
list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
transfer.stream().reduce((a, b) -> new TzDto(
a.getTzType(),
@ -1027,11 +1026,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
if ("发起申请".equals(ufVo.getNodeState())){
if ("发起申请".equals(ufVo.getNodeState())) {
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
}
}
//极光推送
@ -1079,11 +1078,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
UpdateFlowFieldVo ufv = resultBean.getData();
if ("发起申请".equals(ufv.getNodeState())){
if ("发起申请".equals(ufv.getNodeState())) {
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
}
}
return rb.success().setData(resultBean.getData());
@ -1118,7 +1117,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
}
return rb.success().setData(resultBean.getData());
} else {
@ -1134,7 +1133,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
}
}
}
@ -1162,7 +1161,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
bv.setFormVariables(variables);
bv.setOrgSidPath(finFundsCarriedForwardApply.getOrgSidPath());
if ("Activity_1kve61q".equals(bv.getTaskDefKey())){
if ("Activity_1kve61q".equals(bv.getTaskDefKey())) {
List<String> orgPathList = Arrays.asList(finFundsCarriedForwardApply.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
if (sysOrganization == null) {
@ -1170,7 +1169,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else {
} else {
bv.setNextNodeUserSids(sysOrganization.getManagerSid());
}
}
@ -1320,7 +1319,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
return rb.success().setData(data);
}
public ResultBean<String> createPdf(String sid, String userName) {
public ResultBean<String> createPdf(String sid, String pdfType) {
ResultBean rb = ResultBean.fireFail();
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(sid).getData();
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
@ -1337,7 +1336,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
String finishTime = (String) flowableRecordVo.get("finishTime");
finishTime = finishTime.substring(0, 10);
if ("Activity_1nfy3ql".equals(taskDefKey)) {
if ("Activity_17mi28e".equals(taskDefKey)) {
dataMap.put("spName", assigneeName + finishTime);
}
}
@ -1364,6 +1363,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
tzList.add(tzDto);
}
dataMap.put("saleDate", DateUtil.formatDate(new Date()));
dataMap.put("billNo", data.getBillNo());
dataMap.put("tzList", tzList);
dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate());
//获取模板
@ -1375,12 +1375,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
String typeName = dateStr + seconds + ".doc";
// 生成文件路径
String targetPath = sourcePath + dateStr;
WordUtils.creatWord(dataMap, "kxjz", sourcePath, targetPath, typeName);
if (pdfType.equals("针孔式打印机")) {
WordUtils.creatWord(dataMap, "jzsqzks", sourcePath, targetPath, typeName);
} else if (pdfType.equals("激光打印机")) {
WordUtils.creatWord(dataMap, "jzsqjg", sourcePath, targetPath, typeName);
}
//新生成的word路径
String wordPath = targetPath + "\\" + typeName;
//生成出门证文件名
String pdfName = "款项结转_" + dateStr + seconds + ".pdf";
WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
return rb.success().setData("template/" + dateStr + "/" + pdfName);
}
@ -1415,19 +1419,18 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
return customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix;
}
public void jzComplete(String sid){
public void jzComplete(String sid) {
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(sid);
//查询结转的款项
List<FinFundsCarriedForwardVeh> finFundsCarriedForwardVehList = finFundsCarriedForwardVehService.selectByCollSid(sid);
finFundsCarriedForwardVehList.removeAll(Collections.singleton(null));
if(!finFundsCarriedForwardVehList.isEmpty()){
for(FinFundsCarriedForwardVeh v : finFundsCarriedForwardVehList){
if (!finFundsCarriedForwardVehList.isEmpty()) {
for (FinFundsCarriedForwardVeh v : finFundsCarriedForwardVehList) {
String busSid = v.getBusSid();
//结转金额
//查询该车的所有认款,是否都已认完
}
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@ -1015,14 +1015,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护,不可确认");
}
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
ScmApplyInbound scmApplyInbound = null;
if (StringUtils.isBlank(busSid)) {
ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
if (!resultBean.getSuccess()) {
return ResultBean.fireFail().setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
scmApplyInbound = fetchBySid(businessSid);
ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();
for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
@ -1059,10 +1058,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
}
return resultBean;
}
return confirmRZUpdate(dto, busSid, scmApplyInbound);
return confirmRZUpdate(dto, busSid);
}
private synchronized ResultBean confirmRZUpdate(SubmitScmApplyInboundDto dto, String businessSid, ScmApplyInbound scmApplyInbound) {
private synchronized ResultBean confirmRZUpdate(SubmitScmApplyInboundDto dto, String businessSid) {
ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos2 = new ArrayList<>();
ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();

71
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDto.java

@ -0,0 +1,71 @@
package com.yxt.anrui.terminal.api.risk.creditreview;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class CreditReviewDto implements Dto {
private String sid;
@ApiModelProperty("申请人+部门")
private String publishInfo;
@ApiModelProperty("申请日期")
private String createTime;
@ApiModelProperty("客户类型key 1个人2企业")
private String customerTypeKey;
@ApiModelProperty("客户类型value")
private String customerType;
@ApiModelProperty("车型名称")
private String model;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("法人/贷款人姓名")
private String legalPersonName;
@ApiModelProperty("贷款人sid")
private String legalPersonSid;
@ApiModelProperty("法人/贷款人手机号")
private String legalPersonMobile;
@ApiModelProperty("法人/贷款人身份证")
private String legalPersonIdNumber;
@ApiModelProperty("身份证正反面附件")
private List<String> legalPersonIdCardImages;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("企业名称")
private String companyName;
@ApiModelProperty("企业sid")
private String companySid;
@ApiModelProperty("公司要求材料")
private List<String> materialImages;
@ApiModelProperty("资方名称")
private String managementName;
@ApiModelProperty("资方sid")
private String managementSid;
@ApiModelProperty("模板下载地址")
private String downUrl;
@ApiModelProperty("查询结果截图(公司)")
private List<String> searchResultImages;
@ApiModelProperty("审核结果(公司)")
private String examineResult;
@ApiModelProperty("审核日期(公司)")
private String examineDate;
@ApiModelProperty("审核备注(公司)")
private String examineRemarks;
@ApiModelProperty("查询结果截图(资方)")
private List<String> searchResultImages2;
@ApiModelProperty("审核结果(资方)")
private String examineResult2;
@ApiModelProperty("审核日期(资方)")
private String examineDate2;
@ApiModelProperty("审核备注(资方)")
private String examineRemarks2;
@ApiModelProperty("风控要求的其他人员")
private List<ShareholderDetailsVo> shareholderList = new ArrayList<>();
private List<IdentityDetailsVo> identity = new ArrayList<>();
}

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java

@ -29,7 +29,7 @@ import java.util.List;
fallback = CreditReviewFeignFallback.class)
public interface CreditReviewFeign {
@ApiOperation("获取信用审核列表")
@ApiOperation("获取贷前信用审核列表")
@PostMapping("/getCreditReviewList")
@ResponseBody
public ResultBean<PagerVo<CreditReviewVo>> getCreditReviewList(@RequestBody PagerQuery<CreditReviewQuery> pagerQuery);
@ -48,4 +48,9 @@ public interface CreditReviewFeign {
@GetMapping("/getTRCList")
@ResponseBody
public ResultBean<List<IdentityDetailsVo>> getTRCList(@SpringQueryMap CreditReviewDetailsQuery query);
@ApiOperation("保存贷前信用审核申请")
@PostMapping("/saveCreditReviewInfo")
@ResponseBody
public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto);
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java

@ -39,4 +39,9 @@ public class CreditReviewFeignFallback implements CreditReviewFeign {
public ResultBean<List<IdentityDetailsVo>> getTRCList(CreditReviewDetailsQuery query) {
return null;
}
@Override
public ResultBean saveCreditReviewInfo(CreditReviewDto dto) {
return null;
}
}

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java

@ -48,4 +48,9 @@ public class CreditReviewRest implements CreditReviewFeign {
public ResultBean<List<IdentityDetailsVo>> getTRCList(CreditReviewDetailsQuery query) {
return creditReviewService.getTRCList(query);
}
@Override
public ResultBean saveCreditReviewInfo(CreditReviewDto dto) {
return null;
}
}

2667
工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl

File diff suppressed because it is too large

1477
工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl → 工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl

File diff suppressed because it is too large

10
工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc

@ -0,0 +1,10 @@
|调账申请 |
|单据日期: |${saleDate!} |单据编号: |${billNo!} |
|调账类型 |合同编号 |客户名称 |物料编码 |调出金额 |调入金额 |
|${tz.tzType!} |${tz.conNo!} |${tz.name!} |${tz.vinNo!} |${tz.dcje!} |${tz.drje!} |
-----------------------
第 1 页 共 1 页

6
工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc

@ -0,0 +1,6 @@
|调账申请 |
|单据日期: |${saleDate!} |单据编号: |${billNo!} |
|调账类型 |合同编号 |客户名称 |物料编码 |调出金额 |调入金额 |
|${tz.tzType!} |${tz.conNo!} |${tz.name!} |${tz.vinNo!} |${tz.dcje!} |${tz.drje!} |

9
工作内容需要的文档/单据模板/款项结转打印模板/款项结转(调账申请).doc

@ -1,9 +0,0 @@
|调账申请 |
|${saleDate!} |
|调账类型 |合同编号 |客户名称 |物料编码 |调出金额 |调入金额 |
|${tz.tzTyp|${tz.conNo|${tz.name!|${tz.vinNo|${tz.dcje!|${tz.drje!|
|e!} |!} |} |!} |} |} |
|申请人|${makeName!} |审核 |${spName!} |
|: | |人: | |
Loading…
Cancel
Save