From 3b2abd15ce7da7ed192864735064c278c711199e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 5 Mar 2025 08:57:40 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E5=88=B6=E5=BA=A6?= =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java index 153d324e94..6e3929112a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java @@ -89,7 +89,7 @@ public class OaFormService extends MybatisBaseService { // 创建OA表单对象 OaForm oaForm = new OaForm(); // 将DTO中部分属性复制到oaForm中，忽略不需要的字段（如billNo, orgSidPath） - BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath"); + BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath","title"); try { String orgSidPath = dto.getOrgSidPath(); // 获取组织信息，根据orgSidPath字段调用外部服务 From 00f5273490ab6f02e0651700991050df41a0f5d3 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 5 Mar 2025 09:13:05 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E5=88=B6=E5=BA=A6?= =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/oa/biz/oaform/OaFormUrlEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormUrlEnum.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormUrlEnum.java index ef7737589c..4d484ac89b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormUrlEnum.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormUrlEnum.java @@ -34,11 +34,11 @@ public enum OaFormUrlEnum { /** * 集团制度会签详情 */ - GROUPSYSTEM_DETAIL(InnerEnum.rejectUrl.printValue(), "approval/#/pages/oa/DetailGroupSystemApplyActivity"), + GROUPSYSTEM_DETAIL(InnerEnum.detailUrl.printValue(), "approval/#/pages/oa/DetailGroupSystemApplyActivity"), /** * 集团制度会签修改 */ - GROUPSYSTEM_EDIT(InnerEnum.rejectUrl.printValue(), "approval/#/pages/oa/EditGroupSystemApplyActivity"), + GROUPSYSTEM_EDIT(InnerEnum.editUrl.printValue(), "approval/#/pages/oa/EditGroupSystemApplyActivity"), /** * 获取操作标题接口地址 From 330b8341459dfc071b941c3161ac49424a8486fb Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 5 Mar 2025 09:18:26 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E5=88=B6=E5=BA=A6?= =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java index 5474d10a25..b30bab588a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java @@ -294,8 +294,8 @@ public class AdGroupSystemApplyService extends MybatisBaseService Date: Wed, 5 Mar 2025 09:44:08 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java index b30bab588a..9cb9bd7ff1 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java @@ -209,7 +209,7 @@ public class AdGroupSystemApplyService extends MybatisBaseService stringResultBean = saveOrUpdateDto(dto); if (!stringResultBean.getSuccess()) { - return rb.setMsg(stringResultBean.getData()); + return rb.setMsg(stringResultBean.getMsg()); } String businessSid = stringResultBean.getData(); SubmitDto submitDto = new SubmitDto(); From a0e6554c21723d35af604247c070c770624ff548 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 5 Mar 2025 09:47:24 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java index 9cb9bd7ff1..fd766489c9 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java @@ -132,6 +132,7 @@ public class AdGroupSystemApplyService extends MybatisBaseService Date: Wed, 5 Mar 2025 09:49:58 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java index fd766489c9..e495afaade 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java @@ -120,8 +120,10 @@ public class AdGroupSystemApplyService extends MybatisBaseService files = oaAppendixService.selectByLinkSid(sid); + List files = oaAppendixService.selectByLinkSid(AdGroupSystemApplyVo.getSid(), "图片"); + List appes = oaAppendixService.selectByLinkSid(AdGroupSystemApplyVo.getSid(), "文件"); AdGroupSystemApplyVo.setFiles(files); + AdGroupSystemApplyVo.setAppes(appes); AdGroupSystemApplyVo.setSid(sid); String approverSid = AdGroupSystemApply.getApproversSid(); String approverName = AdGroupSystemApply.getApproversName(); From eaff14979324fcabd726fb89e62c3786d860a2f9 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 5 Mar 2025 10:09:30 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java index 617b69feee..aa32904331 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java @@ -213,7 +213,7 @@ public class OaFormService extends MybatisBaseService { if (!businessVariablesResultBean.getSuccess()) { return rb.setMsg(businessVariablesResultBean.getMsg()); } - BeanUtil.copyProperties(businessVariablesResultBean.getData(), bv, "taskDefKey", "taskId"); + BeanUtil.copyProperties(businessVariablesResultBean.getData(), bv, "taskDefKey", "taskId","comment"); bv.setInstanceId(oaForm.getProcInstId()); if (oaForm.getTaskId().contains(bv.getTaskId())) { ResultBean resultBean = flow3Feign.handleProsess(bv); From 9c870c9673eb6d5b9cc777fcf176d2b7667a824c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 5 Mar 2025 14:49:35 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java index aa32904331..e8e0b3c161 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java @@ -89,7 +89,7 @@ public class OaFormService extends MybatisBaseService { // 创建OA表单对象 OaForm oaForm = new OaForm(); // 将DTO中部分属性复制到oaForm中，忽略不需要的字段（如billNo, orgSidPath） - BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath","title","remarks"); + BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath", "title", "remarks"); try { String orgSidPath = dto.getOrgSidPath(); // 获取组织信息，根据orgSidPath字段调用外部服务 @@ -213,7 +213,7 @@ public class OaFormService extends MybatisBaseService { if (!businessVariablesResultBean.getSuccess()) { return rb.setMsg(businessVariablesResultBean.getMsg()); } - BeanUtil.copyProperties(businessVariablesResultBean.getData(), bv, "taskDefKey", "taskId","comment"); + BeanUtil.copyProperties(businessVariablesResultBean.getData(), bv, "taskDefKey", "taskId", "comment"); bv.setInstanceId(oaForm.getProcInstId()); if (oaForm.getTaskId().contains(bv.getTaskId())) { ResultBean resultBean = flow3Feign.handleProsess(bv); From 5cd817ce609ae9fa0b70ca21679aba10e02a8c7d Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 5 Mar 2025 18:01:25 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsMonthFittingsInventoryReport.java | 152 ++++++++++++++++++ .../AsMonthFittingsInventoryReportFeign.java | 74 +++++++++ ...hFittingsInventoryReportFeignFallback.java | 64 ++++++++ .../AsMonthFittingsInventoryReportVo.java | 136 ++++++++++++++++ .../MonthFittingsReportListQuery.java | 14 ++ .../MonthFittingsReportListVo.java | 12 ++ .../AsMonthFittingsInventoryReportMapper.java | 71 ++++++++ .../AsMonthFittingsInventoryReportMapper.xml | 28 ++++ .../AsMonthFittingsInventoryReportRest.java | 77 +++++++++ ...AsMonthFittingsInventoryReportService.java | 85 ++++++++++ 10 files changed, 713 insertions(+) create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReport.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeign.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeignFallback.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListQuery.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.java create mode 100644 anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.xml create mode 100644 anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportRest.java create mode 100644 anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportService.java diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReport.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReport.java new file mode 100644 index 0000000000..15ac320da1 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReport.java @@ -0,0 +1,152 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport; + +import com.baomidou.mybatisplus.annotation.TableName; +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: baobiao(baobiao)
+ * File: AsMonthFittingsInventoryReport.java
+ * Class: com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReport
+ * Description: 月度配件库存管理指标完成情况报表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-03-05 14:43:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "月度配件库存管理指标完成情况报表", description = "月度配件库存管理指标完成情况报表") +@TableName("as_month_fittings_inventory_report") +public class AsMonthFittingsInventoryReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("生成年月（yyyy-MM）") + private String createDate; // 生成年月（yyyy-MM） + @ApiModelProperty("事业部sid") + private String busOrgSid; // 事业部sid + @ApiModelProperty("事业部名称") + private String busOrgName; // 事业部名称 + @ApiModelProperty("分公司sid") + private String createOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String createOrgName; // 分公司名称 + @ApiModelProperty("部门（服务站）sid") + private String useOrgSid; // 部门（服务站）sid + @ApiModelProperty("部门（服务站）") + private String useOrgName; // 部门（服务站） + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名") + private String brandName; // 品牌名 + @ApiModelProperty("品名（区域）") + private String zoneName; // 品名（区域） + @ApiModelProperty("项目（仓库）") + private String houseName; // 项目（仓库） + @ApiModelProperty("在修车辆") + private BigDecimal repairVehAmount; // 在修车辆 + @ApiModelProperty("品种（个）-库存总计") + private BigDecimal fittingsVarietyTotal; // 品种（个）-库存总计 + @ApiModelProperty("金额（元）-库存总计") + private BigDecimal fittingsAmountTotal; // 金额（元）-库存总计 + @ApiModelProperty("品种（个）-库龄1-60天") + private BigDecimal fittingsVarietyOne; // 品种（个）-库龄1-60天 + @ApiModelProperty("金额（元）-库龄1-60天") + private BigDecimal fittingsAmountOne; // 金额（元）-库龄1-60天 + @ApiModelProperty("占比-库龄1-60天") + private BigDecimal fittingsPercentOne; // 占比-库龄1-60天 + @ApiModelProperty("品种（个）-库龄61-90天") + private BigDecimal fittingsVarietyTwo; // 品种（个）-库龄61-90天 + @ApiModelProperty("金额（元）-库龄61-90天") + private BigDecimal fittingsAmountTwo; // 金额（元）-库龄61-90天 + @ApiModelProperty("占比-库龄61-90天") + private BigDecimal fittingsPercentTwo; // 占比-库龄61-90天 + @ApiModelProperty("品种（个）-库龄91-180天") + private BigDecimal fittingsVarietyThree; // 品种（个）-库龄91-180天 + @ApiModelProperty("金额（元）-库龄91-180天") + private BigDecimal fittingsAmountThree; // 金额（元）-库龄91-180天 + @ApiModelProperty("占比-库龄91-180天") + private BigDecimal fittingsPercentThree; // 占比-库龄91-180天 + @ApiModelProperty("品种（个）-库龄150-180天") + private BigDecimal fittingsVarietyFour; // 品种（个）-库龄150-180天 + @ApiModelProperty("金额（元）-库龄150-180天") + private BigDecimal fittingsAmountFour; // 金额（元）-库龄150-180天 + @ApiModelProperty("占比-库龄150-180天") + private BigDecimal fittingsPercentFour; // 占比-库龄150-180天 + @ApiModelProperty("品种（个）-库龄181-270天") + private BigDecimal fittingsVarietyFive; // 品种（个）-库龄181-270天 + @ApiModelProperty("金额（元）-库龄181-270天") + private BigDecimal fittingsAmountFive; // 金额（元）-库龄181-270天 + @ApiModelProperty("占比-库龄181-270天") + private BigDecimal fittingsPercentFive; // 占比-库龄181-270天 + @ApiModelProperty("品种（个）-库龄240-270天") + private BigDecimal fittingsVarietySix; // 品种（个）-库龄240-270天 + @ApiModelProperty("金额（元）-库龄240-270天") + private BigDecimal fittingsAmountSix; // 金额（元）-库龄240-270天 + @ApiModelProperty("占比-库龄240-270天") + private BigDecimal fittingsPercentSix; // 占比-库龄240-270天 + @ApiModelProperty("品种（个）-库龄271-360天") + private BigDecimal fittingsVarietySeven; // 品种（个）-库龄271-360天 + @ApiModelProperty("金额（元）-库龄271-360天") + private BigDecimal fittingsAmountSeven; // 金额（元）-库龄271-360天 + @ApiModelProperty("占比-库龄271-360天") + private BigDecimal fittingsPercentSeven; // 占比-库龄271-360天 + @ApiModelProperty("品种（个）-库龄330-360天") + private BigDecimal fittingsVarietyEight; // 品种（个）-库龄330-360天 + @ApiModelProperty("金额（元）-库龄330-360天") + private BigDecimal fittingsAmountEight; // 金额（元）-库龄330-360天 + @ApiModelProperty("占比-库龄330-360天") + private BigDecimal fittingsPercentEight; // 占比-库龄330-360天 + @ApiModelProperty("品种（个）-库龄361-720天") + private BigDecimal fittingsVarietyNine; // 品种（个）-库龄361-720天 + @ApiModelProperty("金额（元）-库龄361-720天") + private BigDecimal fittingsAmountNine; // 金额（元）-库龄361-720天 + @ApiModelProperty("占比-库龄361-720天") + private BigDecimal fittingsPercentNine; // 占比-库龄361-720天 + @ApiModelProperty("品种（个）-库龄720天以上") + private BigDecimal fittingsVarietyTen; // 品种（个）-库龄720天以上 + @ApiModelProperty("金额（元）-库龄720天以上") + private BigDecimal fittingsAmountTen; // 金额（元）-库龄720天以上 + @ApiModelProperty("占比-库龄720天以上") + private BigDecimal fittingsPercentTen; // 占比-库龄720天以上 + @ApiModelProperty("当月出库配件成本-金额") + private BigDecimal fittingsOutAmount; // 当月出库配件成本-金额 + @ApiModelProperty("当月出库配件成本-占比") + private BigDecimal fittingsOutPercent; // 当月出库配件成本-占比 + @ApiModelProperty("当月入库配件成本-金额") + private BigDecimal fittingsInAmount; // 当月入库配件成本-金额 + @ApiModelProperty("当月入库配件成本-占比") + private BigDecimal fittingsInPercent; // 当月入库配件成本-占比 + +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeign.java new file mode 100644 index 0000000000..2d4bd8a0ff --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeign.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: baobiao(baobiao)
+ * File: AsMonthFittingsInventoryReportFeign.java
+ * Class: com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportFeign
+ * Description: 月度配件库存管理指标完成情况报表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-03-05 14:43:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "月度配件库存管理指标完成情况报表") +@FeignClient( + contextId = "baobiao-AsMonthFittingsInventoryReport", + name = "baobiao", + path = "v1/MonthFittingsReport", + fallback = AsMonthFittingsInventoryReportFeignFallback.class) +public interface AsMonthFittingsInventoryReportFeign { + + + @ApiOperation("月度配件库存管理指标完成情况列表") + @PostMapping("/monthFittingsList") + @ResponseBody + public ResultBean> monthFittingsList(@RequestBody PagerQuery pq); + + @ApiOperation("月度配件库存管理指标完成情况列表明细") + @PostMapping("/monthFittingsListDetails") + @ResponseBody + public ResultBean> monthFittingsListDetails(@RequestParam("createDate") String createDate, + @RequestParam("useOrgSid") String useOrgSid + ); + + + +} \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeignFallback.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeignFallback.java new file mode 100644 index 0000000000..a5eb390951 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportFeignFallback.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: baobiao(baobiao)
+ * File: AsMonthFittingsInventoryReportFeignFallback.java
+ * Class: com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportFeignFallback
+ * Description: 月度配件库存管理指标完成情况报表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-03-05 14:43:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class AsMonthFittingsInventoryReportFeignFallback implements AsMonthFittingsInventoryReportFeign { + + + + @Override + public ResultBean> monthFittingsList(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> monthFittingsListDetails(String createDate, String useOrgSid) { + return null; + } + + +} \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportVo.java new file mode 100644 index 0000000000..d7129a9331 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportVo.java @@ -0,0 +1,136 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: baobiao(baobiao)
+ * File: AsMonthFittingsInventoryReportVo.java
+ * Class: com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo
+ * Description: 月度配件库存管理指标完成情况报表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-03-05 14:43:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "月度配件库存管理指标完成情况报表 视图数据对象", description = "月度配件库存管理指标完成情况报表 视图数据对象") +public class AsMonthFittingsInventoryReportVo implements Vo { + + @ApiModelProperty("生成年月（yyyy-MM）") + private String createDate; // 生成年月（yyyy-MM） + @ApiModelProperty("品牌名") + private String brandName; // 品牌名 + @ApiModelProperty("品名（区域）") + private String zoneName; // 品名（区域） + @ApiModelProperty("项目（仓库）") + private String houseName; // 项目（仓库） + @ApiModelProperty("在修车辆") + private String repairVehAmount; // 在修车辆 + @ApiModelProperty("品种（个）-库存总计") + private String fittingsVarietyTotal; // 品种（个）-库存总计 + @ApiModelProperty("金额（元）-库存总计") + private String fittingsAmountTotal; // 金额（元）-库存总计 + @ApiModelProperty("品种（个）-库龄1-60天") + private String fittingsVarietyOne; // 品种（个）-库龄1-60天 + @ApiModelProperty("金额（元）-库龄1-60天") + private String fittingsAmountOne; // 金额（元）-库龄1-60天 + @ApiModelProperty("占比-库龄1-60天") + private String fittingsPercentOne; // 占比-库龄1-60天 + @ApiModelProperty("品种（个）-库龄61-90天") + private String fittingsVarietyTwo; // 品种（个）-库龄61-90天 + @ApiModelProperty("金额（元）-库龄61-90天") + private String fittingsAmountTwo; // 金额（元）-库龄61-90天 + @ApiModelProperty("占比-库龄61-90天") + private String fittingsPercentTwo; // 占比-库龄61-90天 + @ApiModelProperty("品种（个）-库龄91-180天") + private String fittingsVarietyThree; // 品种（个）-库龄91-180天 + @ApiModelProperty("金额（元）-库龄91-180天") + private String fittingsAmountThree; // 金额（元）-库龄91-180天 + @ApiModelProperty("占比-库龄91-180天") + private String fittingsPercentThree; // 占比-库龄91-180天 + @ApiModelProperty("品种（个）-库龄150-180天") + private String fittingsVarietyFour; // 品种（个）-库龄150-180天 + @ApiModelProperty("金额（元）-库龄150-180天") + private String fittingsAmountFour; // 金额（元）-库龄150-180天 + @ApiModelProperty("占比-库龄150-180天") + private String fittingsPercentFour; // 占比-库龄150-180天 + @ApiModelProperty("品种（个）-库龄181-270天") + private String fittingsVarietyFive; // 品种（个）-库龄181-270天 + @ApiModelProperty("金额（元）-库龄181-270天") + private String fittingsAmountFive; // 金额（元）-库龄181-270天 + @ApiModelProperty("占比-库龄181-270天") + private String fittingsPercentFive; // 占比-库龄181-270天 + @ApiModelProperty("品种（个）-库龄240-270天") + private String fittingsVarietySix; // 品种（个）-库龄240-270天 + @ApiModelProperty("金额（元）-库龄240-270天") + private String fittingsAmountSix; // 金额（元）-库龄240-270天 + @ApiModelProperty("占比-库龄240-270天") + private String fittingsPercentSix; // 占比-库龄240-270天 + @ApiModelProperty("品种（个）-库龄271-360天") + private String fittingsVarietySeven; // 品种（个）-库龄271-360天 + @ApiModelProperty("金额（元）-库龄271-360天") + private String fittingsAmountSeven; // 金额（元）-库龄271-360天 + @ApiModelProperty("占比-库龄271-360天") + private String fittingsPercentSeven; // 占比-库龄271-360天 + @ApiModelProperty("品种（个）-库龄330-360天") + private String fittingsVarietyEight; // 品种（个）-库龄330-360天 + @ApiModelProperty("金额（元）-库龄330-360天") + private String fittingsAmountEight; // 金额（元）-库龄330-360天 + @ApiModelProperty("占比-库龄330-360天") + private String fittingsPercentEight; // 占比-库龄330-360天 + @ApiModelProperty("品种（个）-库龄361-720天") + private String fittingsVarietyNine; // 品种（个）-库龄361-720天 + @ApiModelProperty("金额（元）-库龄361-720天") + private String fittingsAmountNine; // 金额（元）-库龄361-720天 + @ApiModelProperty("占比-库龄361-720天") + private String fittingsPercentNine; // 占比-库龄361-720天 + @ApiModelProperty("品种（个）-库龄720天以上") + private String fittingsVarietyTen; // 品种（个）-库龄720天以上 + @ApiModelProperty("金额（元）-库龄720天以上") + private String fittingsAmountTen; // 金额（元）-库龄720天以上 + @ApiModelProperty("占比-库龄720天以上") + private String fittingsPercentTen; // 占比-库龄720天以上 + @ApiModelProperty("当月出库配件成本-金额") + private String fittingsOutAmount; // 当月出库配件成本-金额 + @ApiModelProperty("当月出库配件成本-占比") + private String fittingsOutPercent; // 当月出库配件成本-占比 + @ApiModelProperty("当月入库配件成本-金额") + private String fittingsInAmount; // 当月入库配件成本-金额 + @ApiModelProperty("当月入库配件成本-占比") + private String fittingsInPercent; // 当月入库配件成本-占比 + +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListQuery.java new file mode 100644 index 0000000000..3e3dc2548e --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListQuery.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +@Data +public class MonthFittingsReportListQuery implements Query { + + private String startDate; + private String endDate; + private String useOrgName; + + +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListVo.java new file mode 100644 index 0000000000..2d18d37b3c --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asmonthfittingsinventoryreport/MonthFittingsReportListVo.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +@Data +public class MonthFittingsReportListVo implements Vo { + + private String createDate; + private String useOrgName; + private String useOrgSid; +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.java new file mode 100644 index 0000000000..122acd8855 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.MonthFittingsReportListVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReport; +import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo; + +import java.util.List; + +/** + * Project: baobiao(baobiao)
+ * File: AsMonthFittingsInventoryReportMapper.java
+ * Class: com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportMapper
+ * Description: 月度配件库存管理指标完成情况报表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-03-05 14:43:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsMonthFittingsInventoryReportMapper extends BaseMapper { + + //@Update("update as_month_fittings_inventory_report set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from as_month_fittings_inventory_report") + List selectListVo(); + + IPage monthFittingsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List monthFittingsListDetails(@Param(Constants.WRAPPER)QueryWrapper qw); +} \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.xml new file mode 100644 index 0000000000..971bb52833 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportRest.java new file mode 100644 index 0000000000..7a68ed935e --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportRest.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport; + +import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportFeign; +import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportVo; +import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.MonthFittingsReportListQuery; +import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.MonthFittingsReportListVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Project: baobiao(baobiao)
+ * File: AsMonthFittingsInventoryReportFeignFallback.java
+ * Class: com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportRest
+ * Description: 月度配件库存管理指标完成情况报表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-03-05 14:43:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "月度配件库存管理指标完成情况报表") +@RestController("com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportRest") +@RequestMapping("v1/MonthFittingsReport") +public class AsMonthFittingsInventoryReportRest implements AsMonthFittingsInventoryReportFeign { + + @Autowired + private AsMonthFittingsInventoryReportService asMonthFittingsInventoryReportService; + + @Override + public ResultBean> monthFittingsList(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = asMonthFittingsInventoryReportService.monthFittingsList(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> monthFittingsListDetails(String createDate, String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List pv = asMonthFittingsInventoryReportService.monthFittingsListDetails(createDate,useOrgSid); + return rb.success().setData(pv); + } + +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportService.java new file mode 100644 index 0000000000..a32d6bce9e --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asmonthfittingsinventoryreport/AsMonthFittingsInventoryReportService.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.reportcenter.api.asmonthfittingsinventoryreport.*; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: baobiao(baobiao)
+ * File: AsMonthFittingsInventoryReportService.java
+ * Class: com.yxt.anrui.reportcenter.biz.asmonthfittingsinventoryreport.AsMonthFittingsInventoryReportService
+ * Description: 月度配件库存管理指标完成情况报表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-03-05 14:43:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsMonthFittingsInventoryReportService extends MybatisBaseService { + + + public PagerVo monthFittingsList(PagerQuery pq) { + MonthFittingsReportListQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //生成日期开始时间 + String createTimeStart = query.getStartDate(); + //生成日期结束时间 + String createTimeEnd = query.getEndDate(); + qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (mf.createDate,'%Y-%m') >= date_format('" + createTimeStart + "','%Y-%m')"). + apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (mf.createDate,'%Y-%m') <= date_format('" + createTimeEnd + "','%Y-%m')" + ); + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("mf.useOrgName", query.getUseOrgName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.monthFittingsList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List monthFittingsListDetails(String createDate, String useOrgSid) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createDate", createDate); + qw.eq("useOrgSid", useOrgSid); + List list = baseMapper.monthFittingsListDetails(qw); + return list; + } + + +} \ No newline at end of file From ba86fae5dd756c2f8416654b7025b3279f7f6458 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 6 Mar 2025 08:58:19 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehrebateCheckapplydetailMapper.java | 14 - .../yxt/anrui/oa/api/AdSealuseApplyRest.java | 105 ++++++ .../yxt/anrui/oa/api/AdSealuseDetailRest.java | 36 +++ .../AdExpatriatesApplyService.java | 1 - .../AdExpatriatesHomeApplyService.java | 8 +- .../AdExpatriatesHomeApplyVo.java | 1 + .../biz/adfeteapply/AdFeteApplyService.java | 1 - .../AdFrockallotApplyService.java | 1 - .../AdLeasehostApplyService.java | 1 - .../AdOffspaceApplyService.java | 1 - .../AdPircarpulApplyService.java | 1 - .../AdSalecarpulApplyService.java | 1 - .../oa/biz/adsealuseapply/AdSealuseApply.java | 92 ++++++ .../AdSealuseApplyDetailsVo.java | 81 +++++ .../biz/adsealuseapply/AdSealuseApplyDto.java | 96 ++++++ .../adsealuseapply/AdSealuseApplyMapper.java | 35 ++ .../adsealuseapply/AdSealuseApplyMapper.xml | 26 ++ .../adsealuseapply/AdSealuseApplyService.java | 302 ++++++++++++++++++ .../biz/adsealuseapply/AdSealuseApplyVo.java | 105 ++++++ .../biz/adsealusedetail/AdSealuseDetail.java | 50 +++ .../adsealusedetail/AdSealuseDetailDto.java | 46 +++ .../AdSealuseDetailMapper.java | 40 +++ .../adsealusedetail/AdSealuseDetailMapper.xml | 15 + .../AdSealuseDetailService.java | 64 ++++ .../adsealusedetail/AdSealuseDetailVo.java | 48 +++ .../AdSealuseListDetailVo.java | 43 +++ .../biz/adseatapply/AdSeatApplyService.java | 1 - .../AdSenpircarpulApplyService.java | 1 - .../biz/adteamapply/AdTeamApplyService.java | 1 - .../yxt/anrui/oa/feign/file/OaFileEnum.java | 1 + 30 files changed, 1191 insertions(+), 27 deletions(-) create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseApplyRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseDetailRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApply.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDetailsVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetail.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseListDetailVo.java diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java index e56fb91544..a8919983b3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java @@ -39,22 +39,8 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; - import java.util.List; -/** - * Project: anrui-scm(单车返利核对)
- * File: ScmVehrebateCheckapplydetailMapper.java
- * Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailMapper
- * Description: 单车返利核对申请表_返利列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-29 16:01:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseApplyRest.java new file mode 100644 index 0000000000..552e309199 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseApplyRest.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.api; + +import com.yxt.anrui.oa.biz.adsealuseapply.*; +import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; +import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery; +import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +@Api(tags = "印章及资质证件使用申请") +@RestController +@RequestMapping("v1/adsealuseapply") +public class AdSealuseApplyRest { + + @Autowired + private AdSealuseApplyService adSealuseApplyService; + + @ApiOperation("初始化（新增或修改）") + @GetMapping({"/getInit", "/getInit/{sid}"}) + public ResultBean getInit( + @PathVariable(value = "sid", required = false) String sid, + @RequestParam(value = "userSid", required = false) String userSid, + @RequestParam(value = "orgPath", required = false) String orgPath) { + ResultBean rb = ResultBean.fireFail(); + if (sid == null || sid.isEmpty()) { + // 执行新增初始化 + if (userSid == null || orgPath == null) { + return rb.setMsg("userSid和orgPath不能为空"); + } + return adSealuseApplyService.getSaveInit(userSid, orgPath); + } else { + // 执行修改初始化 + return adSealuseApplyService.getUpdateInit(sid); + } + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AdSealuseApplyDto dto) { + return adSealuseApplyService.saveOrUpdateDto(dto); + } + + @ApiOperation("详情") + @GetMapping("/details/{sid}") + ResultBean details(@PathVariable("sid") String sid + , @RequestParam(value = "application", required = false) String application) { + return adSealuseApplyService.details(sid, application); + } + + @ApiOperation("提交审批流程") + @PostMapping("/submit") + public ResultBean submit(@RequestBody AdSealuseApplyDto dto) { + return adSealuseApplyService.submit(dto); + } + + @ApiOperation(value = "办理（同意）") + @PutMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteDto dto) { + return adSealuseApplyService.complete(dto); + } + + @ApiOperation(value = "驳回任务") + @PutMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody TaskDto dto) { + return adSealuseApplyService.reject(dto); + } + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap NodeQuery query) { + return adSealuseApplyService.getFlowOperateTitle(query); + } +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseDetailRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseDetailRest.java new file mode 100644 index 0000000000..a505c08bba --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSealuseDetailRest.java @@ -0,0 +1,36 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.api; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "印章及资质证件使用列表") +@RestController +@RequestMapping("v1/adsealusedetail") +public class AdSealuseDetailRest { + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java index 60c52dea02..a3f1dd629a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java @@ -74,7 +74,6 @@ public class AdExpatriatesApplyService extends MybatisBaseService staffPostVos = sysStaffPostFeign.selPostByStaffSid(sysUserVo.getStaffSid()).getData(); - if (staffPostVos.size() > 0){ + if (staffPostVos.size() > 0) { adExpatriatesHomeApplyVo.setJobKey(staffPostVos.get(0).getSid()); adExpatriatesHomeApplyVo.setJobValue(staffPostVos.get(0).getName()); } @@ -99,6 +99,8 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealuseapply; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "印章及资质证件使用申请", description = "印章及资质证件使用申请") +@TableName("ad_sealuse_apply") +public class AdSealuseApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("部门sid") + private String deptSid; // 部门sid + @ApiModelProperty("部门名称") + private String deptName; // 部门名称 + @ApiModelProperty("经办人sid") + private String userSid; // 经办人sid + @ApiModelProperty("经办人姓名") + private String userName; // 经办人姓名 + @ApiModelProperty("使用类型key") + private String useTypeKey; // 使用类型key + @ApiModelProperty("使用类型value") + private String useTypeValue; // 使用类型value + @ApiModelProperty("使用方式key") + private String useWayKey; // 使用方式key + @ApiModelProperty("使用方式value") + private String useWayValue; // 使用方式value + @ApiModelProperty("使用情况分类key") + private String useSitKey; // 使用情况分类key + @ApiModelProperty("使用情况分类value") + private String useSitValue; // 使用情况分类value + @ApiModelProperty("资质证件类别key") + private String certTypeKey; // 资质证件类别key + @ApiModelProperty("资质证件类别value") + private String certTypeValue; // 资质证件类别value + @ApiModelProperty("印章类别key") + private String sealTypeKey; // 印章类别key + @ApiModelProperty("印章类别value") + private String sealTypeValue; // 印章类别value + @ApiModelProperty("财务数据类别key") + private String dataTypeKey; // 财务数据类别key + @ApiModelProperty("财务数据类别value") + private String dataTypeValue; // 财务数据类别value + @ApiModelProperty("外出目的地") + private String destination; // 外出目的地 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("预计归还时间") + private Date returnDate; // 预计归还时间 + @ApiModelProperty("是否需要签字") + private String isSign; // 是否需要签字 + @ApiModelProperty("需要签字人员") + private String signUserName; // 需要签字人员 + @ApiModelProperty("盖章或签字文件份数") + private String signNum; // 盖章或签字文件份数 + @ApiModelProperty("具体用途") + private String purpose; // 具体用途 + @ApiModelProperty("基础表单sid") + private String formSid; // 基础表单sid + @ApiModelProperty("关联审批sid列表,英文逗号分隔") + private String linkFormSids; // 关联审批sid列表,英文逗号分隔 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDetailsVo.java new file mode 100644 index 0000000000..4875ee3e06 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDetailsVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealuseapply; + +import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulListDetailVo; +import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "印章及资质证件使用申请 视图数据详情", description = "印章及资质证件使用申请 视图数据详情") +public class AdSealuseApplyDetailsVo extends OaFormCommonVo { + + @ApiModelProperty("部门") + private String deptValue; + @ApiModelProperty("经办人") + private String userValue; + @ApiModelProperty("使用类型") + private String useTypeValue; + @ApiModelProperty("使用方式") + private String useWayValue; + @ApiModelProperty("使用情况分类") + private String useSitValue; + @ApiModelProperty("资质证件类别") + private String certTypeValue; + @ApiModelProperty("印章类别") + private String sealTypeValue; + @ApiModelProperty("财务数据类别") + private String dataTypeValue; + @ApiModelProperty("外出目的地") + private String destination; + @ApiModelProperty("预计归还时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date returnDate; + @ApiModelProperty("是否需要签字") + private String isSign; + @ApiModelProperty("需要签字人员") + private String signUserName; + @ApiModelProperty("盖章或签字文件份数") + private String signNum; + @ApiModelProperty("具体用途") + private String purpose; + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDto.java new file mode 100644 index 0000000000..5a98174b02 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyDto.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealuseapply; + +import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailDto; +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.anrui.oa.biz.oaform.OaFormDto; +import java.util.ArrayList; +import java.util.List; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "印章及资质证件使用申请 数据传输对象", description = "印章及资质证件使用申请 数据传输对象") +public class AdSealuseApplyDto extends OaFormDto { + + @ApiModelProperty("部门") + private FormCommon deptObj; + private String deptKey; + private String deptValue; + @ApiModelProperty("经办人") + private FormCommon userObj; + private String userKey; + private String userValue; + @ApiModelProperty("使用类型") + private FormCommon useTypeObj; + private String useTypeKey; + private String useTypeValue; + @ApiModelProperty("使用方式") + private FormCommon useWayObj; + private String useWayKey; + private String useWayValue; + @ApiModelProperty("使用情况分类") + private FormCommon useSitObj; + private String useSitKey; + private String useSitValue; + @ApiModelProperty("资质证件类别") + private FormCommon certTypeObj; + private String certTypeKey; + private String certTypeValue; + @ApiModelProperty("印章类别") + private FormCommon sealTypObj; + private String sealTypKey; + private String sealTypeValue; + @ApiModelProperty("财务数据类别") + private FormCommon dataTypeObj; + private String dataTypeKey; + private String dataTypeValue; + @ApiModelProperty("外出目的地") + private String destination; + @ApiModelProperty("预计归还时间") + private String returnDate; + @ApiModelProperty("是否需要签字") + private String isSign; + @ApiModelProperty("需要签字人员") + private String signUserName; + @ApiModelProperty("盖章或签字文件份数") + private String signNum; + @ApiModelProperty("具体用途") + private String purpose; + @ApiModelProperty("基础表单sid") + private String formSid; + @ApiModelProperty("关联审批单") + private String linkFormSids; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("文件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.java new file mode 100644 index 0000000000..4ea8df081f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.java @@ -0,0 +1,35 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealuseapply; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AdSealuseApplyMapper extends BaseMapper { + + AdSealuseApplyDetailsVo details(String sid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.xml new file mode 100644 index 0000000000..40e8bdc6fc --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyService.java new file mode 100644 index 0000000000..a544d74495 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyService.java @@ -0,0 +1,302 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealuseapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailDto; +import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailService; +import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailVo; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.biz.oaform.OaForm; +import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum; +import com.yxt.anrui.oa.biz.oaform.OaFormService; +import com.yxt.anrui.oa.biz.oaform.OaFormUrlEnum; +import com.yxt.anrui.oa.biz.oaform.flowable.*; +import com.yxt.anrui.oa.feign.file.OaFileEnum; +import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class AdSealuseApplyService extends MybatisBaseService { + + @Autowired + private OaAppendixService oaAppendixService; + @Autowired + private OaFormService oaFormService; + @Autowired + private AdSealuseDetailService adSealuseDetailService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + public ResultBean getSaveInit(String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + AdSealuseApplyVo adSealuseApplyVo = new AdSealuseApplyVo(); + adSealuseApplyVo.setCreateBySid(userSid); + adSealuseApplyVo.setOrgSidPath(orgPath); + return rb.success().setData(adSealuseApplyVo); + } + + public ResultBean getUpdateInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdSealuseApplyVo adSealuseApplyVo = new AdSealuseApplyVo(); + AdSealuseApply adSealuseApply = fetchBySid(sid); + if (adSealuseApply == null) { + return rb.setMsg("该申请不存在"); + } + OaForm oaForm = oaFormService.fetchBySid(sid); + adSealuseApplyVo.setTaskId(oaForm.getTaskId()); + adSealuseApplyVo.setProcInsId(oaForm.getProcInstId()); + //根据部门sid获取orgPath并赋值 + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData(); + String orgSidPath = organizationVo.getOrgSidPath(); + adSealuseApplyVo.setOrgSidPath(orgSidPath); + adSealuseApplyVo.setCreateBySid(oaForm.getCreateBySid()); + BeanUtil.copyProperties(adSealuseApply, adSealuseApplyVo); + List list = adSealuseDetailService.getUpdateInit(sid); + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + adSealuseApplyVo.setFiles(files); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adSealuseApplyVo.setAppes(appes); + adSealuseApplyVo.setList(list); + adSealuseApplyVo.setSid(sid); + return rb.success().setData(adSealuseApplyVo); + } + + public ResultBean saveOrUpdateDto(AdSealuseApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + List files = dto.getFiles(); + List appes = dto.getAppes(); + List list = dto.getList(); + if (StringUtils.isBlank(sid)) { + // 新建操作 + AdSealuseApply entity = new AdSealuseApply(); + BeanUtil.copyProperties(dto, entity, "sid"); + + dto.setBillNo("YZJZZZJSYSQ"); + dto.setSid(entity.getSid()); + ResultBean resultBean = oaFormService.saveOaForm(dto); + + if (!resultBean.getSuccess()) { + return rb; + } + + entity.setFormSid(resultBean.getData()); + baseMapper.insert(entity); + sid = entity.getSid(); + } else { + // 更新操作 + AdSealuseApply entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + adSealuseDetailService.saveDetails(list, sid); + // 处理附件 + saveFiles(sid, files, OaFileEnum.ADSEALUSEAPPLY.getAttachType(), "图片"); + saveFiles(sid, appes, OaFileEnum.ADSEALUSEAPPLY.getAttachType(), "文件"); + return rb.success().setData(sid); + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } + + public ResultBean details(String sid, String application) { + ResultBean rb = ResultBean.fireFail(); + AdSealuseApplyDetailsVo adSealuseApplyDetailsVo = baseMapper.details(sid); + if (adSealuseApplyDetailsVo == null) { + return rb.setMsg("该申请不存在"); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adSealuseApplyDetailsVo.setFiles(files); + adSealuseApplyDetailsVo.setAppes(appes); + //基础字段赋值 + BeanUtil.copyProperties(oaFormService.getDetails(sid), adSealuseApplyDetailsVo); + return rb.success().setData(adSealuseApplyDetailsVo); + } + + /** + * 提交 + * + * @param dto + * @return + */ + public ResultBean submit(AdSealuseApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean stringResultBean = saveOrUpdateDto(dto); + if (!stringResultBean.getSuccess()) { + return rb.setMsg(stringResultBean.getData()); + } + String businessSid = stringResultBean.getData(); + + SubmitDto submitDto = new SubmitDto(); + submitDto.setUserSid(dto.getCreateBySid()); + submitDto.setBusinessSid(businessSid); + + Map formVariables = new HashMap<>(); + formVariables = getMap(formVariables, businessSid); + submitDto.setFormVariables(formVariables); + submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId()); + submitDto.setNextTaskId(dto.getTaskId()); + submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule()); + return oaFormService.submit(submitDto); + } + + /** + * 办理（同意） + * + * @param dto + * @return + */ + public ResultBean complete(CompleteDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto(); + BeanUtil.copyProperties(dto, businessVariablesDto); + return oaFormService.complete(businessVariablesDto); + } + + /** + * 驳回 + * + * @param dto + * @return + */ + public ResultBean reject(TaskDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + return oaFormService.reject(dto); + } + + public ResultBean getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 + ResultBean rb = ResultBean.fireFail(); + + // 获取next值和formVariables + int next = query.getNext(); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); + query.setFormVariables(formVariables); + + // 校验next参数是否有效（只允许0或1） + if (next != 0 && next != 1) { + return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息 + } + + // 获取节点名称 + String data = getNodeName(query, next); + + // 如果data为null，表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 + return rb.success().setData(data); + } + + /** + * 网关参数组成 + * + * @param formVariables + * @param sid + * @return + */ + public Map getMap(Map formVariables, String sid) { + Map appMap = new HashMap<>(); + appMap.put("sid", sid); + /*appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid); + appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid); + appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle"); + appMap.put("agreeUrl", "oa/v1/HrHireApply/complete"); + appMap.put("stopUrl", "oa/v1/oaform/breakProcess"); + appMap.put("rejectUrl", "oa/v1/HrHireApply/reject"); + appMap.put("recallUrl", "oa/v1/oaform/revokeProcess"); + appMap.put("signUrl", "oa/v1/oaform/delegate"); + appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/ + appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl()); + appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl()); + appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl()); + appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl()); + appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl()); + formVariables.put("app", appMap); + //根据组织查询是否是分公司 + OaForm oaForm = oaFormService.fetchBySid(sid); + AdSealuseApply adSealuseApply = fetchBySid(sid); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData(); + //是否是分公司 + formVariables.put("isTrue", sysOrganization.getIsDept() == 0); + return formVariables; + } + + /** + * 根据next的值获取前一个节点或下一个节点的名称。 + * + * @param query 包含查询所需参数的NodeQuery对象 + * @param next 参数，0表示上一环节，1表示下一环节 + * @return 节点名称，如果失败则返回null + */ + private String getNodeName(NodeQuery query, int next) { + // 根据next值选择相应的服务方法获取节点信息 + ResultBean> resultBean = (next == 0) + ? oaFormService.getPreviousNodesForReject(query) // 获取上一环节的节点 + : oaFormService.getNextNodesForSubmit(query); // 获取下一环节的节点 + // 如果服务调用成功 + if (resultBean.getSuccess()) { + // 清除结果列表中的null值，避免空节点 + resultBean.getData().removeAll(Collections.singleton(null)); + // 如果结果列表非空，返回第一个节点的名称 + if (!resultBean.getData().isEmpty()) { + return resultBean.getData().get(0).getName(); + } + } else { + // 如果服务调用失败，返回null + return null; + } + // 如果结果为空，返回null + return null; + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyVo.java new file mode 100644 index 0000000000..7e465dbd38 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealuseapply/AdSealuseApplyVo.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealuseapply; + +import com.yxt.anrui.oa.biz.adsealusedetail.AdSealuseDetailVo; +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.core.vo.Vo; +import java.util.ArrayList; +import java.util.List; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "印章及资质证件使用申请 视图数据对象", description = "印章及资质证件使用申请 视图数据对象") +public class AdSealuseApplyVo implements Vo { + + private String sid; + /* private String userSid; + private String orgPath;*/ + private String orgSidPath; + private String createBySid; + + @ApiModelProperty("部门") + private FormCommon deptObj; + private String deptKey; + private String deptValue; + @ApiModelProperty("经办人") + private FormCommon userObj; + private String userKey; + private String userValue; + @ApiModelProperty("使用类型") + private FormCommon useTypeObj; + private String useTypeKey; + private String useTypeValue; + @ApiModelProperty("使用方式") + private FormCommon useWayObj; + private String useWayKey; + private String useWayValue; + @ApiModelProperty("使用情况分类") + private FormCommon useSitObj; + private String useSitKey; + private String useSitValue; + @ApiModelProperty("资质证件类别") + private FormCommon certTypeObj; + private String certTypeKey; + private String certTypeValue; + @ApiModelProperty("印章类别") + private FormCommon sealTypObj; + private String sealTypKey; + private String sealTypeValue; + @ApiModelProperty("财务数据类别") + private FormCommon dataTypeObj; + private String dataTypeKey; + private String dataTypeValue; + @ApiModelProperty("外出目的地") + private String destination; + @ApiModelProperty("预计归还时间") + private String returnDate; + @ApiModelProperty("是否需要签字") + private String isSign; + @ApiModelProperty("需要签字人员") + private String signUserName; + @ApiModelProperty("盖章或签字文件份数") + private String signNum; + @ApiModelProperty("具体用途") + private String purpose; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + + private String taskId; + @ApiModelProperty("流程实例id") + private String procInsId; + +// private String testPage; +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetail.java new file mode 100644 index 0000000000..7d74db120d --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetail.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealusedetail; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "印章及资质证件使用列表", description = "印章及资质证件使用列表") +@TableName("ad_sealuse_detail") +public class AdSealuseDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + @ApiModelProperty("管理公司sid") + private String manageCompanySid; // 管理公司sid + @ApiModelProperty("管理公司名称") + private String manageCompanyName; // 管理公司名称 + @ApiModelProperty("所属公司sid") + private String beCompanySid; // 所属公司sid + @ApiModelProperty("所属公司名称") + private String beCompanyName; // 所属公司名称 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailDto.java new file mode 100644 index 0000000000..7c1d061f96 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailDto.java @@ -0,0 +1,46 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealusedetail; + +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "印章及资质证件使用列表 数据传输对象", description = "印章及资质证件使用列表 数据传输对象") +public class AdSealuseDetailDto implements Dto { + + @ApiModelProperty("管理公司名称") + private FormCommon manageCompanyObj; + private String manageCompanyKey; + private String manageCompanyValue; + @ApiModelProperty("所属公司名称") + private FormCommon beCompanyObj; + private String beCompanyKey; + private String beCompanyValue; +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.java new file mode 100644 index 0000000000..48b82f8767 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.java @@ -0,0 +1,40 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealusedetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import java.util.List; + +@Mapper +public interface AdSealuseDetailMapper extends BaseMapper { + + List getUpdateInit(String sid); + + @Select("select * from ad_sealuse_detail where mainSid = #{mainSid}") + List selectByMainSid(String mainSid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.xml new file mode 100644 index 0000000000..f1efa0038d --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailMapper.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailService.java new file mode 100644 index 0000000000..5cd25abde3 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailService.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealusedetail; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + +@Service +public class AdSealuseDetailService extends MybatisBaseService { + + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List list2 = baseMapper.selectByMainSid(sid); + list2.removeAll(Collections.singleton(null)); + if (!list2.isEmpty()) { + list2.stream().forEach(v -> { + deleteBySid(v.getSid()); + }); + } + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + AdSealuseDetail adSealuseDetail = new AdSealuseDetail(); + BeanUtil.copyProperties(details, adSealuseDetail); + adSealuseDetail.setManageCompanySid(details.getManageCompanyKey()); + adSealuseDetail.setManageCompanyName(details.getManageCompanyValue()); + adSealuseDetail.setBeCompanySid(details.getBeCompanyKey()); + adSealuseDetail.setBeCompanyName(details.getBeCompanyValue()); + adSealuseDetail.setMainSid(sid); + baseMapper.insert(adSealuseDetail); + }); + } + } + + public List getUpdateInit(String sid) { + return baseMapper.getUpdateInit(sid); + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailVo.java new file mode 100644 index 0000000000..1a5cbf526f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseDetailVo.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealusedetail; + +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "印章及资质证件使用列表 视图数据对象", description = "印章及资质证件使用列表 视图数据对象") +public class AdSealuseDetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("管理公司名称") + private FormCommon manageCompanyObj; + private String manageCompanyKey; + private String manageCompanyName; + @ApiModelProperty("所属公司名称") + private FormCommon beCompanyObj; + private String beCompanyKey; + private String beCompanyValue; +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseListDetailVo.java new file mode 100644 index 0000000000..597c1121b6 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsealusedetail/AdSealuseListDetailVo.java @@ -0,0 +1,43 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsealusedetail; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "印章及资质证件使用列表 视图数据对象", description = "印章及资质证件使用列表 视图数据对象") +public class AdSealuseListDetailVo implements Vo { + + private String sid; + + @ApiModelProperty("管理公司名称") + private String manageCompanyName; + @ApiModelProperty("所属公司名称") + private String beCompanyValue; +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyService.java index 2d64085524..e66553456a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyService.java @@ -77,7 +77,6 @@ public class AdSeatApplyService extends MybatisBaseService Date: Thu, 6 Mar 2025 10:51:00 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) 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 1060a2b321..1d83e0243c 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 @@ -472,7 +472,6 @@ public class BaseAccadjApplyService extends MybatisBaseService resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -828,11 +827,12 @@ public class BaseAccadjApplyService extends MybatisBaseService resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -920,11 +923,12 @@ public class BaseAccadjApplyService extends MybatisBaseService resultBean1 = flowFeign.handleProsess(bv); if (!resultBean1.getSuccess()) { From 1482a93b74abf4265192e54463932f924dd2bad6 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 6 Mar 2025 10:54:51 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../astechtitleapply/AsTechTitleApply.java | 28 ++++++++++--------- .../as/biz/astechtitle/AsTechTitleMapper.java | 5 +++- .../biz/astechtitle/AsTechTitleService.java | 4 +++ .../AsTechTitleApplyService.java | 1 + 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java index e782b10619..e23067cc9f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java @@ -28,7 +28,9 @@ package com.yxt.anrui.as.api.astechtitleapply; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,30 +54,30 @@ import lombok.Data; public class AsTechTitleApply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("申请人") + @ApiModelProperty("申请人") private String createByName; // 申请人 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("办结日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("办结日期") private Date finishTime; // 办结日期 - @ApiModelProperty("实例id") + @ApiModelProperty("实例id") private String procInstId; // 实例id - @ApiModelProperty("流程定义id") + @ApiModelProperty("流程定义id") private String procDefId; // 流程定义id - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id - @ApiModelProperty("环节id") + @ApiModelProperty("环节id") private String nodeId; // 环节id - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java index de8e86cec5..6b2ed81618 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java @@ -76,7 +76,10 @@ public interface AsTechTitleMapper extends BaseMapper { void updateTech(@Param("sid") String sid, @Param("techSid") String techSid, @Param("techName") String techName); @Update("update as_tech_title set isBa = #{isBa} where sid = #{sid}") - void updateIsBa(@Param("sid")String sid,@Param("isBa") Integer isBa); + void updateIsBa(@Param("sid") String sid, @Param("isBa") Integer isBa); AsTechTitle selLikeTechSid(String techSid); + + @Update("update as_tech_title set weight = #{weight} where sid = #{sid}") + void updateWeight(@Param("sid") String sid, @Param("weight") String weight); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java index 6eeaa604eb..fb5a1702f9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java @@ -241,4 +241,8 @@ public class AsTechTitleService extends MybatisBaseService Date: Thu, 6 Mar 2025 11:07:59 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=9C=88=E8=BF=98=E8=AE=A1=E6=8F=90?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/fintemptimepush/FinTempTimePush.java | 25 +++++++++ .../fintemptimepush/FinTempTimePushDto.java | 17 ++++++ .../fintemptimepush/FinTempTimePushFeign.java | 23 ++++++++ .../FinTempTimePushMapper.java | 40 ++++++++++++++ .../fintemptimepush/FinTempTimePushMapper.xml | 13 +++++ .../fintemptimepush/FinTempTimePushRest.java | 48 +++++++++++++++++ .../FinTempTimePushService.java | 52 +++++++++++++++++++ .../fintemptimepush/TimingPushService.java | 40 ++++++++++++++ .../fin/biz/kingdee/FinKingDeeFeignRest.java | 4 +- .../LoanMonthlyAccrualApplyService.java | 42 +++++++++------ 10 files changed, 286 insertions(+), 18 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java new file mode 100644 index 0000000000..492a3cee1e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.fin.api.fintemptimepush; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +@ApiModel(value = "金蝶数据推送-临时表", description = "金蝶数据推送-临时表") +@TableName("fin_temp_time_push") +@Data +public class FinTempTimePush extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("业务sid") + private String busSid; + @ApiModelProperty("业务类型") + private String busType; + + + + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java new file mode 100644 index 0000000000..bd5a246876 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.fin.api.fintemptimepush; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class FinTempTimePushDto implements Dto { + + private String createBySid; + @ApiModelProperty("业务sid") + private String busSid; + @ApiModelProperty("业务类型") + private String busType; + + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java new file mode 100644 index 0000000000..1770b28628 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.fin.api.fintemptimepush; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Api(tags = "金蝶数据推送-临时表") +@FeignClient( + contextId = "anrui-fin-FinTempTimePush", + name = "anrui-fin", + path = "v1/FinTempTimePush") +public interface FinTempTimePushFeign { + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody FinTempTimePushDto dto); + + + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java new file mode 100644 index 0000000000..8e3d756085 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java @@ -0,0 +1,40 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.fintemptimepush; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface FinTempTimePushMapper extends BaseMapper { + + + List selListByBusType(@Param("busType") String busType); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml new file mode 100644 index 0000000000..7a5bd7acdf --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java new file mode 100644 index 0000000000..679b5ac352 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.fintemptimepush; + +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushFeign; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Api(tags = "金蝶数据推送-临时表") +@RestController("com.yxt.anrui.fin.biz.fintemptimepush.FinTempTimePushRest") +@RequestMapping("v1/FinTempTimePush") +public class FinTempTimePushRest implements FinTempTimePushFeign { + + @Autowired + private FinTempTimePushService finTempTimePushService; + @Override + public ResultBean save(FinTempTimePushDto dto) { + return finTempTimePushService.saveEntity(dto); + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java new file mode 100644 index 0000000000..94d7a0864d --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.fintemptimepush; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FinTempTimePushService extends MybatisBaseService { + + + public ResultBean saveEntity(FinTempTimePushDto dto) { + ResultBean rb = ResultBean.fireFail(); + FinTempTimePush finTempTimePush = new FinTempTimePush(); + BeanUtil.copyProperties(dto,finTempTimePush); + baseMapper.insert(finTempTimePush); + return rb.success(); + } + + public List selListByBusType(String busType) { + return baseMapper.selListByBusType(busType); + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java new file mode 100644 index 0000000000..6138bd6794 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.fin.biz.fintemptimepush; + +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush; +import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Collections; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/11/7 14:02 + */ +@Component +public class TimingPushService { + + @Autowired + private LoanMonthlyAccrualApplyFeign loanMonthlyAccrualApplyFeign; + @Autowired + private FinTempTimePushService finTempTimePushService; + + /** + * 定时推送月还计提凭证 + */ + @Scheduled(cron = "0 0 3 2,3,4,5,6,7,8,9,10 * ? ") //每月2-10号 3点推送 + public void monthlyAccrualVoucher() { + List list = finTempTimePushService.selListByBusType("月还计提"); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + for (FinTempTimePush f : list) { + loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid()); + finTempTimePushService.deleteBySid(f.getSid()); + } + } + + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index f459056e4f..9a31bfa3a9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -1187,9 +1187,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { newVoucher.setAccountBook(voucher.getUseOrgCode()); newVoucher.setVoucherNo(voucher.getUseOrgCode()); } - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String formatDate = sdf.format(date); + String formatDate = voucher.getBussDate(); String[] split = formatDate.split("-"); String month = split[1]; int m = Integer.parseInt(month); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java index 5dd680f3a4..12988098c9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java @@ -15,6 +15,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -124,6 +126,8 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService accrualInit(String orgPath) { ResultBean rb = ResultBean.fireFail(); @@ -636,21 +640,27 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); - //推送月还计提凭证数据 - Future future = pool.submit(() -> { - pushAccrualVoucher(businessSid); - }); - } catch (Exception e) { - e.printStackTrace(); - log.error("推送数据失败=========================" + e.getMessage()); - return rb.setMsg("推送数据失败"); - } + //推送金蝶保存数据临时表 + FinTempTimePushDto finTempTimePushDto = new FinTempTimePushDto(); + finTempTimePushDto.setCreateBySid(accrualApply.getCreateBySid()); + finTempTimePushDto.setBusSid(businessSid); + finTempTimePushDto.setBusType("月还计提"); + finTempTimePushFeign.save(finTempTimePushDto); +// try { +// ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() +// .setNameFormat("demo-pool-%d").build(); +// ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10, +// 1000, TimeUnit.MILLISECONDS, +// new LinkedBlockingQueue(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); +// //推送月还计提凭证数据 +// Future future = pool.submit(() -> { +// pushAccrualVoucher(businessSid); +// }); +// } catch (Exception e) { +// e.printStackTrace(); +// log.error("推送数据失败=========================" + e.getMessage()); +// return rb.setMsg("推送数据失败"); +// } } return rb.success().setData(resultBean.getData()); } else { @@ -659,6 +669,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService records = loanMonthlyAccrualRecordService.selByMainSid(businessSid); if (!records.isEmpty()) { int index = 1000; @@ -669,6 +680,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService newList = records.subList(i, i + index); if (!newList.isEmpty()) { GeneralVoucher generalVoucher = new GeneralVoucher(); + generalVoucher.setBussDate(DateUtil.formatDate(apply.getClosingDate())); List voucherDetails = new ArrayList<>(); for (LoanMonthlyAccrualRecord v : newList) { LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData();