From 95e441ad707d65b1b69a088776c1edc01b0ee5c7 Mon Sep 17 00:00:00 2001 From: liupopo Date: Wed, 28 Jun 2023 18:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E6=97=A5=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/biz/csmcash/CsmCashGd.java | 80 +++++++++++++++++++ .../customer/biz/csmcash/CsmCashGdMapper.java | 8 ++ .../biz/csmcash/CsmCashGdService.java | 35 ++++++++ .../customer/biz/csmcash/CsmCashRest.java | 25 ++++++ .../ReportInventoryDayGatherService.java | 6 +- 5 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGd.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdMapper.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGd.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGd.java new file mode 100644 index 00000000..cc1e6429 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGd.java @@ -0,0 +1,80 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; + +import java.util.Date; + +@TableName("csm_cash_gd") +public class CsmCashGd extends EntityWithId { + + private String sid = IdUtil.fastSimpleUUID(); // sid + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss", + timezone = "GMT+8" + ) + private Date createTime = new Date(); // 记录创建时间 + private String remarks; // 备注信息 + private int status = 0; // 状态：0=f未核对，1=已核对(核对后数据不可再更改) + private String dataDate; // 日期 + private String accountName; // 账户名称 + private double accountAmount; // 金额 + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getDataDate() { + return dataDate; + } + + public void setDataDate(String dataDate) { + this.dataDate = dataDate; + } + + public String getAccountName() { + return accountName; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } + + public double getAccountAmount() { + return accountAmount; + } + + public void setAccountAmount(double accountAmount) { + this.accountAmount = accountAmount; + } +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdMapper.java new file mode 100644 index 00000000..b1ad4cdd --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdMapper.java @@ -0,0 +1,8 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CsmCashGdMapper extends BaseMapper { +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java new file mode 100644 index 00000000..306bcddf --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import cn.hutool.poi.excel.ExcelReader; +import cn.hutool.poi.excel.ExcelUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.result.FileUploadResult; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +@Service +public class CsmCashGdService extends ServiceImpl { + + @Autowired + private FileUploadComponent fileUploadComponent; + + public ResultBean uploadAnd2Db(MultipartFile file) { + ResultBean rb = ResultBean.fireFail(); + + ResultBean fub = fileUploadComponent.uploadFile(file, "kcxxcx"); + String filePath = fub.getData().getFilePath(); + String fp = fileUploadComponent.getUploadPath() + filePath; + + ExcelReader reader = ExcelUtil.getReader(fp); + List> readAll = reader.readAll(); + + + return rb.success(); + } +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java new file mode 100644 index 00000000..3ffe961d --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.customer.api.gdinventorylog.GdInventoryLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RestController("com.yxt.supervise.customer.biz.csmcash.CsmCashRest") +@RequestMapping("/csmcash") +public class CsmCashRest { + + @Autowired + private CsmCashGdService csmCashGdService; + + @PostMapping("/uploadGdData") + public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { + ResultBean rb = ResultBean.fireFail(); + rb = csmCashGdService.uploadAnd2Db(file); + return rb; + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java index e5a13133..d02a221d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java @@ -3,11 +3,7 @@ package com.yxt.supervise.report.biz.reportinventory; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherQuery; import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; -import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -62,7 +58,7 @@ public class ReportInventoryDayGatherService extends ServiceImpl