diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java
index 3829ea7242..ad59681cfc 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java
@@ -26,60 +26,53 @@
package com.yxt.anrui.base.api.baseaccadjapply;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-base(调账管理)
- * File: BaseAccadjApply.java
- * Class: com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApply
- * Description: 调账申请表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-07 16:57:24
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+import java.util.Date;
+
@Data
@ApiModel(value = "调账申请表", description = "调账申请表")
@TableName("base_accadj_apply")
public class BaseAccadjApply extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("申请日期")
+ @ApiModelProperty("申请日期")
private String applyDate; // 申请日期
- @ApiModelProperty("调账类型key")
+ @ApiModelProperty("调账类型key")
private String accadjTypeKey; // 调账类型key
- @ApiModelProperty("调账类型value")
+ @ApiModelProperty("调账类型value")
private String accadjTypeValue; // 调账类型value
- @ApiModelProperty("调出分公司sid")
+ @ApiModelProperty("调出分公司sid")
private String callOutOrgSid; // 调出分公司sid
- @ApiModelProperty("调出分公司名称")
+ @ApiModelProperty("调出分公司名称")
private String callOutOrgName; // 调出分公司名称
- @ApiModelProperty("调入分公司sid")
+ @ApiModelProperty("调入分公司sid")
private String callInOrgSid; // 调入分公司sid
- @ApiModelProperty("调入分公司名称")
+ @ApiModelProperty("调入分公司名称")
private String callInOrgName; // 调入分公司名称
- @ApiModelProperty("使用组织sid")
+ @ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
- @ApiModelProperty("创建组织sid")
+ @ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
- @ApiModelProperty("流程定义的id")
+ @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
- @ApiModelProperty("环节定义的sid")
+ @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
- @ApiModelProperty("流程实例的sid")
+ @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
- @ApiModelProperty("流程状态")
+ @ApiModelProperty("流程状态")
private String nodeState; // 流程状态
- @ApiModelProperty("taskId")
+ @ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("申请编号")
private String applyNo; // 申请编号
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("办结时间")
+ private Date finishTime;
}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java
index e3a2bd3e16..d72d86741c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java
@@ -25,30 +25,13 @@
*********************************************************/
package com.yxt.anrui.base.api.baseaccadjapply;
-
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
-import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
import java.util.List;
-/**
- * Project: anrui-base(调账管理)
- * File: BaseAccadjApplyVo.java
- * Class: com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo
- * Description: 调账申请表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-07 16:57:24
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "调账申请表 视图数据详情", description = "调账申请表 视图数据详情")
public class BaseAccadjApplyDetailsVo implements Vo {
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java
index 8542825731..6f6e2f30bf 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java
@@ -72,6 +72,11 @@ public interface BaseAccadjApplyFeign {
@ResponseBody
public ResultBean> fetchVeh(@RequestBody PagerQuery pq);
+ @ApiOperation("生成调账申请pdf")
+ @PostMapping("/createPdf")
+ @ResponseBody
+ ResultBean createPdf(@RequestParam("sid") String sid, @RequestParam("userName") String userName);
+
/*************************************************PC调账审批流程***************************************************/
@ApiOperation("提交调账申请审批流程")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java
new file mode 100644
index 0000000000..26d88e93fe
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java
@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseaccadjapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseAccadjPdfVo implements Vo {
+
+ private Integer id;
+ @ApiModelProperty("车型")
+ private String model;
+ @ApiModelProperty("常用配置")
+ private String config;
+ @ApiModelProperty("车架号")
+ private String vinNo;
+ @ApiModelProperty("库存地点")
+ private String address;
+ @ApiModelProperty("内销价格")
+ private String price;
+ @ApiModelProperty("运费")
+ private String yf;
+ @ApiModelProperty("运费承担方")
+ private String cdf;
+ @ApiModelProperty("备注")
+ private String remarks;
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java
index 3be48213ac..d4404090a5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java
@@ -30,22 +30,8 @@ import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
import java.math.BigDecimal;
-/**
- * Project: anrui-base(内申请管理)
- * File: BaseInternalPurchaseVehicle.java
- * Class: com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle
- * Description: 内购车辆表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-16 13:46:25
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "内购车辆表", description = "内购车辆表")
@TableName("base_internal_purchase_vehicle")
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
index 0e6989da13..8d27c6bf8e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
@@ -84,6 +84,13 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
return baseAccadjApplyService.fetchVeh(pq);
}
+ @Override
+ public ResultBean createPdf(String sid, String userName) {
+ ResultBean rb = ResultBean.fireFail();
+ String pdf = baseAccadjApplyService.createPdf(sid, userName);
+ return rb.success().setData(pdf);
+ }
+
@Override
public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) {
return baseAccadjApplyService.submitAccAdjApply(dto);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
index 4d99e4f7f0..984228c244 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@@ -55,6 +55,7 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
@@ -71,6 +72,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
+import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -79,11 +81,21 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
+import com.yxt.anrui.riskcenter.api.loandiff.LoanDiff;
+import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffInitDetails;
+import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffPdfVo;
+import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
+import com.yxt.common.base.utils.ConstantUtils;
+import com.yxt.common.base.utils.WordUtils;
+import com.yxt.messagecenter.api.message.Message;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.messagelist.MessageList;
+import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -97,6 +109,8 @@ import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
+import static java.util.Comparator.comparing;
+
@Service
public class BaseAccadjApplyService extends MybatisBaseService {
@@ -134,6 +148,12 @@ public class BaseAccadjApplyService extends MybatisBaseService listPageVo(PagerQuery pq) {
BaseAccadjApplyQuery query = pq.getParams();
@@ -1135,4 +1155,121 @@ public class BaseAccadjApplyService extends MybatisBaseService dataMap = new HashMap();
+ //分公司
+ SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
+ dataMap.put("orgName", sysOrganizationVo.getName());
+ //创建部门
+ String deptName = "";
+ List split = Arrays.asList(data.getOrgSidPath().split("/"));
+ if (split.size() > 1) {
+ //获取本级sid获取本级部门信息
+ SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
+ SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+ deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
+ deptName = sysOrganization1.getName();
+ } else {
+ SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+ deptName = sysOrganization.getName();
+ deptName = sysOrganization.getName();
+ }
+ dataMap.put("deptName", deptName);
+ //创建人
+ SysUserVo sysUserVo = sysUserFeign.fetchBySid(baseAccadjApply.getCreateBySid()).getData();
+ dataMap.put("createName", sysUserVo.getName());
+ //创建日期
+ dataMap.put("createTime", DateUtil.formatDate(baseAccadjApply.getCreateTime()));
+ //办结日期
+ dataMap.put("finishTime", DateUtil.formatDate(baseAccadjApply.getFinishTime()));
+ //审批编号
+ dataMap.put("billNo", baseAccadjApply.getApplyNo());
+ List baseAccadjPdfVos = new ArrayList<>();
+ //循环获取车辆信息
+ Integer i = 1;
+ for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : data.getBaseInternalPurchaseVehicles()) {
+ BaseAccadjPdfVo baseAccadjPdfVo = new BaseAccadjPdfVo();
+ baseAccadjPdfVo.setId(i);
+ i = i + 1;
+ baseAccadjPdfVo.setModel(baseInternalPurchaseVehicle.getVehicleAlias());
+ baseAccadjPdfVo.setConfig(baseInternalPurchaseVehicle.getConfigName());
+ baseAccadjPdfVo.setVinNo(baseInternalPurchaseVehicle.getVinNo());
+ baseAccadjPdfVo.setAddress(baseInternalPurchaseVehicle.getInventoryLocationName());
+ baseAccadjPdfVo.setPrice(baseInternalPurchaseVehicle.getWitPinMoney());
+ baseAccadjPdfVo.setYf(baseInternalPurchaseVehicle.getFreight());
+ baseAccadjPdfVo.setCdf(baseInternalPurchaseVehicle.getFreightUndertakerName());
+ baseAccadjPdfVo.setRemarks(baseInternalPurchaseVehicle.getRemarks());
+ baseAccadjPdfVos.add(baseAccadjPdfVo);
+ }
+ dataMap.put("wlList", baseAccadjPdfVos);
+ dataMap.put("type", baseAccadjApply.getAccadjTypeValue());
+ dataMap.put("dc", baseAccadjApply.getCallOutOrgName());
+ dataMap.put("dr", baseAccadjApply.getCallInOrgName());
+ //获取审批记录
+ List flowRecordVo = flowableFeignSp.flowRecordAndComment(baseAccadjApply.getProcInstId(), "1").getData();
+ List finPaymentrecordSourceLCVos = new ArrayList<>();
+ for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
+ if (flowTask.getFlowableRecordVo() != null) {
+ Map flowableRecordVo = flowTask.getFlowableRecordVo();
+ FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
+ List