Browse Source

回款

master
liupopo 2 years ago
parent
commit
bd7deaf8c8
  1. 20
      supervise-customer-ui/src/api/customer/csmcash.js
  2. 151
      supervise-customer-ui/src/views/daydataupload/cash/index.vue
  3. 48
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/CodeMsgEnum.java
  4. 67
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGd.java
  5. 43
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java
  6. 152
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLog.java
  7. 106
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogService.java
  8. 20
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java

20
supervise-customer-ui/src/api/customer/csmcash.js

@ -0,0 +1,20 @@
import request from '@/utils/request'
// 入库导入的记录
export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: '/api',
url: '/customer/csmcash/listPage',
method: 'post',
data: params
})
},
// 通过sid查询一条记录
fetchBySid: function(sid) {
return request({
url: '/supervise/v1/gdinstoragelog/fetchDetailsBySid/' + sid
})
}
}

151
supervise-customer-ui/src/views/daydataupload/cash/index.vue

@ -28,16 +28,32 @@
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="orderDate" label="数据日期" align="center" width="200" />
<el-table-column prop="createTime" label="导入时间" align="center" width="200" />
<el-table-column prop="allNum" label="总记录数" align="center" width="200" />
<el-table-column prop="validNum" label="普通商品数" align="center" width="200" />
<el-table-column prop="errRowNum" label="烟草商品数" align="center" width="200" />
<el-table-column prop="dataDate" label="数据日期" align="center" width="120" />
<el-table-column prop="createTime" label="导入时间" align="center" width="160" />
<el-table-column prop="salesAmountYesterday" label="昨日销售总计金额(元)" align="center" width="180" />
<el-table-column prop="cashedAmountToday" label="今日应回款金额(元)" align="center" width="180" />
<el-table-column prop="cashedAmountTodayReal" label="今日实际回款金额(元)" align="center" width="180" />
<el-table-column prop="cashedAmountDifferent" label="回款差额金额(元)" align="center" width="180" />
<el-table-column label="操作" wid align="center">
<template slot-scope="scope">
<div v-if="scope.row.state==1"><el-tag type="info">正在导入数据库...</el-tag><el-button type="text" icon="el-icon-refresh" style="margin-left: 5px;" @click="loadList()"></el-button></div>
<div v-else-if="scope.row.state==2"><el-tag type="warning">正在创建报表...</el-tag><el-button type="text" icon="el-icon-refresh" style="margin-left: 5px;" @click="loadList()"></el-button></div>
<div v-else-if="scope.row.state==3"><el-tag type="success">正在生成Excel...</el-tag><el-button type="text" icon="el-icon-refresh" style="margin-left: 5px;" @click="loadList()"></el-button></div>
<div v-if="scope.row.state==1"><el-tag type="info">正在导入数据库...</el-tag><el-button
type="text"
icon="el-icon-refresh"
style="margin-left: 5px;"
@click="loadList()"
>刷新</el-button></div>
<div v-else-if="scope.row.state==2"><el-tag type="warning">正在创建报表...</el-tag><el-button
type="text"
icon="el-icon-refresh"
style="margin-left: 5px;"
@click="loadList()"
>刷新</el-button></div>
<div v-else-if="scope.row.state==3"><el-tag type="success">正在生成Excel...</el-tag><el-button
type="text"
icon="el-icon-refresh"
style="margin-left: 5px;"
@click="loadList()"
>刷新</el-button></div>
<el-button v-else-if="scope.row.state==4&&scope.row.fileUrl.length>1" type="text" @click="toDownload(scope.row)">下载库存日报表</el-button>
<div v-else>没有报表文件</div>
</template>
@ -74,7 +90,7 @@
>
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">上传 汇融银行_库存信息查询.xlsx文件</div>
<div slot="tip" class="el-upload__tip">上传 汇融银行_按日汇总对账报表.xlsx文件</div>
</el-upload>
</div>
<div>
@ -82,14 +98,11 @@
<el-card class="box-card">
<div>{{ uploadResultMesssage }}</div>
</el-card>
</div>
<div>
<h3>库存汇总数据</h3>
<el-card class="box-card">
<div>{{ hzResultMesssage }}</div>
<el-card v-show="showSelectButton" class="box-card">
<div style="color: red;margin-bottom: 15px;">是否覆盖之前的数据如果选择覆盖相关回款数据将被重置</div>
<div>
<el-button :disabled="!hzFilePath" size="small" type="primary" @click="doDownloadHz">下载库存汇总文件</el-button>
<!-- <el-button :disabled="!ychzFilePath" size="small" type="primary" @click="doDownloadHzYc">下载烟草汇总文件</el-button> -->
<el-button size="small" type="primary" @click="doDownloadHz">不覆盖关闭</el-button>
<el-button size="small" type="primary" @click="doDownloadHzYc">覆盖并重置数据</el-button>
</div>
</el-card>
</div>
@ -102,7 +115,7 @@
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import req from '@/api/supervise/gdinventorylog'
import req from '@/api/customer/csmcash'
export default {
name: 'DaydatauploadCash',
@ -143,15 +156,14 @@
btnLabel: '关闭'
}
],
fullscreenloading: null,
dialogVisible: false,
updateAction: '/api/customer' + '/csmcash/uploadGdData',
name: '库存数据导入',
fileList: [],
uploadResultMesssage: '',
hzResultMesssage: '',
hzFilePath: '',
ychzFilePath: '',
fullscreenloading: null
showSelectButton: false,
currentLogSid: '',
ychzFilePath: ''
}
},
mounted() {
@ -209,7 +221,7 @@
this.queryParams.total = res.data.total
this.dataList = res.data.records
}).catch(e => {
console.log('GdinventoryLog-loadList-ee:', e)
console.log('CsmCashLog-loadList-ee:', e)
})
},
doClose() {
@ -220,15 +232,12 @@
this.dialogVisible = true
},
dialogClose() {
this.currentLog = {}
this.clearLog()
this.fileList = []
this.filecandown = true
this.showSelectButton = false
this.currentLogSid = ''
this.dialogVisible = false
},
//
handleReturn() {
this.$router.go(-1)
},
submitUpload() {
this.$refs.upload.submit()
},
@ -246,71 +255,49 @@
}
},
handleSuccess(resp, file, fileList) {
// if (this.fullscreenloading) this.fullscreenloading.close()
// this.fullscreenloading = null
console.log('222', resp)
const rdata = resp.data
const _this = this
if (this.fullscreenloading) this.fullscreenloading.close()
this.fullscreenloading = null
_this.uploadResultMesssage = '文件上传完成,正在进行数据整理~'
if (resp.success) {
_this.uploadResultMesssage = '按日汇总对账报表数据已经导入,可进行回款数据比对~'
_this.loadList()
setTimeout(function() {
_this.dialogClose()
}, 3000)
// _this.fullscreenloading.text = '~'
// this.fileList = []
// _this.uploadResultMesssage = '' + rdata.allNum + ' ' + rdata.validNum + ' ' + rdata.errRowNum + ' ' + rdata.durations + ' '
// const param = {
// orderDate: rdata.orderDate
// }
// req.kcReport(param)
// .then(res => {
// console.log('333', res)
// _this.fullscreenloading.text = 'Excel'
} else {
_this.fileList = []
if (resp.code === 'cash_5001') {
_this.uploadResultMesssage = '没有进行数据导入,异常信息为:' + resp.msg
} else if (resp.code === 'cash_5002') {
_this.uploadResultMesssage = resp.msg
// req.kcExcel({ logid: rdata.id })
// .then(res => {
// if (this.fullscreenloading) this.fullscreenloading.close()
// this.fullscreenloading = null
// console.log('444', res)
// _this.hzFilePath = res.data.fileUrl
// })
// .catch(e => {
// if (this.fullscreenloading) this.fullscreenloading.close()
// this.fullscreenloading = null
// })
// })
// .catch(e => {
// if (this.fullscreenloading) this.fullscreenloading.close()
// this.fullscreenloading = null
// })
},
toDownload(row) {
console.log('lll', row)
if (row.fileUrl) {
window.open(row.fileUrl, '_blank')
_this.showSelectButton = true
_this.currentLogSid = resp.data.sid
} else {
_this.uploadResultMesssage = '上传数据文件异常,请选择正确的汇总对账报表文件上传,异常信息为:' + resp.msg
}
}
},
doDownloadHz() {
window.open(this.hzFilePath, '_blank')
// downloadhz({ filepath: this.hzFilePath })
// .then(res => {
// console.log('xxx', res)
// const blob = new Blob([res.data])
// const url = window.URL.createObjectURL(blob) // url blob
// const a = document.createElement('a')
// a.href = url
// a.download = '.xlsx'
// a.click()
// window.URL.revokeObjectURL(url) // ur
// })
// .catch(e => {
// console.log(e)
// })
clearLog() {
if (this.currentLogSid) {
req.clearLog(this.currentLogSid).then(res => {
this.queryParams.total = res.data.total
this.dataList = res.data.records
}).catch(e => {
console.log('CsmCashLog-loadList-ee:', e)
})
}
},
doDownloadHzYc() {
window.open(this.ychzFilePath, '_blank')
coverLog(logsid) {
if (logsid) {
req.clearLog(logsid).then(res => {
this.queryParams.total = res.data.total
this.dataList = res.data.records
}).catch(e => {
console.log('CsmCashLog-loadList-ee:', e)
})
}
}
}
}

48
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/CodeMsgEnum.java

@ -0,0 +1,48 @@
package com.yxt.supervise.customer;
import com.yxt.common.core.result.IResultCodeMsg;
/**
* 统一返回信息的code和msg需要更新并安装yxt-common-core项目
*/
public enum CodeMsgEnum implements IResultCodeMsg {
/**
* 返回正常
*/
HTML200("200", "返回正常"),
/**
* 页面不存在
*/
HTML404("404", "页面不存在"),
/**
* 服务器错误
*/
HTML500("500", "服务器错误"),
/**
* 回款报表已经生成不可再次导入
*/
CASH_5001("cash_5001", "报表已生成,不可再次导入"),
/**
* 当日数据已存在但未生成报表可修改是否覆盖
*/
CASH_5002("cash_5002", "当日数据已存在,是否覆盖");
private String code;
private String msg;
private CodeMsgEnum(String code, String msg) {
this.code = code;
this.msg = msg;
}
@Override
public String getMsg() {
return msg;
}
@Override
public String getCode() {
return code;
}
}

67
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGd.java

@ -4,12 +4,23 @@ 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 lombok.Data;
import java.util.Date;
@Data
@TableName("csm_cash_gd")
public class CsmCashGd extends EntityWithId {
public CsmCashGd() {
}
public CsmCashGd(String dataDate, String accountName, double accountAmount) {
this.dataDate = dataDate;
this.accountName = accountName;
this.accountAmount = accountAmount;
}
private String sid = IdUtil.fastSimpleUUID(); // sid
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
@ -22,59 +33,5 @@ public class CsmCashGd extends EntityWithId {
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;
}
private String logsid; // 日志记录的SID',
}

43
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java

@ -1,51 +1,26 @@
package com.yxt.supervise.customer.biz.csmcash;
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.apache.commons.lang3.StringUtils;
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<CsmCashGdMapper, CsmCashGd> {
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private CsmCashLogService csmCashLogService;
public ResultBean<CsmCashLog> uploadAnd2Db(MultipartFile file) {
ResultBean rb = ResultBean.fireFail();
ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "kcxxcx");
String filePath = fub.getData().getFilePath();
String fp = fileUploadComponent.getUploadPath() + filePath;
private CsmCashSalesService csmCashSalesService;
ExcelReader reader = ExcelUtil.getReader(fp);
List<Map<String, Object>> readAll = reader.readAll();
String dataDate;
try {
Map<String, Object> stringObjectMap = readAll.get(0);
String odate = (String) stringObjectMap.get("日期");
if (StringUtils.isBlank(odate) || 19 != odate.length())
return rb.setMsg("读取Excel文件数据异常!");
dataDate = odate.substring(0, 10);
} catch (Exception e) {
e.printStackTrace();
return rb.setMsg("解析36524导出的按日汇总对账报表出错,请检查格式");
public void initCashByLog(CsmCashLog cashLog) {
List<CsmCashGd> gdList = this.listByLogsid(cashLog.getSid());
csmCashSalesService.clearAndCreateOfDay(cashLog.getDataDate(), gdList);
}
CsmCashLog currLog = csmCashLogService.fetchEnableOfDay(dataDate);
if(currLog.)
CsmCashLog ccl = new CsmCashLog();
return rb.success().setData(ccl);
private List<CsmCashGd> listByLogsid(String logsid) {
QueryWrapper<CsmCashGd> qw = new QueryWrapper<>();
qw.eq("logsid", logsid);
return baseMapper.selectList(qw);
}
}

152
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLog.java

@ -1,5 +1,6 @@
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;
@ -9,7 +10,20 @@ import java.util.Date;
@TableName("csm_cash_log")
public class CsmCashLog extends EntityWithId {
private String sid; //sid
public CsmCashLog() {
}
public CsmCashLog(String dataDate) {
this.dataDate = dataDate;
}
public CsmCashLog(int isEnable, int status, String dataDate) {
this.isEnable = isEnable;
this.status = status;
this.dataDate = dataDate;
}
private String sid = IdUtil.fastSimpleUUID(); //sid
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
@ -30,4 +44,140 @@ public class CsmCashLog extends EntityWithId {
private double cashedAmountToday = 0; //今日应回款金额(元)
private double cashedAmountTodayReal = 0; //今日实际回款金额(元)
private double cashedAmountDifferent = 0; //回款差额金额(元)
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 getIsEnable() {
return isEnable;
}
public void setIsEnable(int isEnable) {
this.isEnable = isEnable;
}
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 getFileFullPath() {
return fileFullPath;
}
public void setFileFullPath(String fileFullPath) {
this.fileFullPath = fileFullPath;
}
public String getOutFilePath() {
return outFilePath;
}
public void setOutFilePath(String outFilePath) {
this.outFilePath = outFilePath;
}
public String getFileUrl() {
return fileUrl;
}
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
public int getAllNum() {
return allNum;
}
public void setAllNum(int allNum) {
this.allNum = allNum;
}
public int getValidNum() {
return validNum;
}
public void setValidNum(int validNum) {
this.validNum = validNum;
}
public int getDurations() {
return durations;
}
public void setDurations(int durations) {
this.durations = durations;
}
public int getErrRowNum() {
return errRowNum;
}
public void setErrRowNum(int errRowNum) {
this.errRowNum = errRowNum;
}
public double getSalesAmountYesterday() {
return salesAmountYesterday;
}
public void setSalesAmountYesterday(double salesAmountYesterday) {
this.salesAmountYesterday = salesAmountYesterday;
}
public double getCashedAmountToday() {
return cashedAmountToday;
}
public void setCashedAmountToday(double cashedAmountToday) {
this.cashedAmountToday = cashedAmountToday;
}
public double getCashedAmountTodayReal() {
return cashedAmountTodayReal;
}
public void setCashedAmountTodayReal(double cashedAmountTodayReal) {
this.cashedAmountTodayReal = cashedAmountTodayReal;
}
public double getCashedAmountDifferent() {
return cashedAmountDifferent;
}
public void setCashedAmountDifferent(double cashedAmountDifferent) {
this.cashedAmountDifferent = cashedAmountDifferent;
}
}

106
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogService.java

@ -1,13 +1,37 @@
package com.yxt.supervise.customer.biz.csmcash;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.FileUploadResult;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.customer.CodeMsgEnum;
import com.yxt.supervise.customer.api.gdinventorylog.GdInventoryLog;
import com.yxt.supervise.customer.api.gdinventorylog.GdInventoryLogQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Service
public class CsmCashLogService extends ServiceImpl<CsmCashLogMapper, CsmCashLog> {
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private CsmCashGdService csmCashGdService;
public List<CsmCashLog> listByDataDate(String dataDate) {
QueryWrapper<CsmCashLog> qw = new QueryWrapper<>();
qw.eq("dataDate", dataDate);
@ -20,4 +44,86 @@ public class CsmCashLogService extends ServiceImpl<CsmCashLogMapper, CsmCashLog>
qw.eq("dataDate", dataDate);
return baseMapper.selectOne(qw);
}
public ResultBean<CsmCashLog> uploadAnd2Db(MultipartFile file) {
ResultBean rb = ResultBean.fireFail();
ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "kcxxcx");
String filePath = fub.getData().getFilePath();
String fp = fileUploadComponent.getUploadPath() + filePath;
ExcelReader reader = ExcelUtil.getReader(fp);
List<Map<String, Object>> readAll = reader.readAll();
String dataDate;
try {
Map<String, Object> stringObjectMap = readAll.get(0);
String odate = (String) stringObjectMap.get("日期");
if (StringUtils.isBlank(odate) || 19 != odate.length())
return rb.setMsg("读取Excel文件数据异常!");
dataDate = odate.substring(0, 10);
} catch (Exception e) {
e.printStackTrace();
return rb.setMsg("解析36524导出的按日汇总对账报表出错,请检查格式");
}
CsmCashLog currLog = this.fetchEnableOfDay(dataDate);
if (currLog == null) {
List<CsmCashGd> gdList = new ArrayList<>();
currLog = new CsmCashLog(1, 1, dataDate);
currLog.setFileFullPath(fp);
Map<String, Object> currMap = readAll.get(0);
for (String key : currMap.keySet()) {
if (!"日期".equals(key)) {
Object val = currMap.get(key);
double v = NumberUtil.parseNumber("" + val).doubleValue();
CsmCashGd gd = new CsmCashGd(dataDate, key, v);
gd.setLogsid(currLog.getSid());
gdList.add(gd);
}
}
super.save(currLog);
csmCashGdService.saveBatch(gdList);
csmCashGdService.initCashByLog(currLog);
return rb.success().setData(currLog);
}
if (currLog.getStatus() > 2) {
return rb.fail(CodeMsgEnum.CASH_5001).setData(currLog);
} else {
List<CsmCashGd> gdList = new ArrayList<>();
CsmCashLog newLog = new CsmCashLog(0, 1, dataDate);
newLog.setFileFullPath(fp);
Map<String, Object> currMap = readAll.get(0);
for (String key : currMap.keySet()) {
if (!"日期".equals(key)) {
Object val = currMap.get(key);
double v = NumberUtil.parseNumber("" + val).doubleValue();
CsmCashGd gd = new CsmCashGd(dataDate, key, v);
gd.setLogsid(newLog.getSid());
gdList.add(gd);
}
}
super.save(newLog);
csmCashGdService.saveBatch(gdList);
return rb.fail(CodeMsgEnum.CASH_5002).setData(newLog);
}
}
public IPage<CsmCashLog> listPage(PagerQuery<CsmCashLogQuery> pq) {
CsmCashLogQuery params = pq.getParams();
QueryWrapper<CsmCashLog> qw = new QueryWrapper<>();
qw.eq("isEnable", 1);
if (StrUtil.isNotBlank(params.getDataDateStart())) {
qw.ge("dataDate", params.getDataDateStart());
}
if (StrUtil.isNotBlank(params.getDataDateEnd())) {
qw.le("dataDate", params.getDataDateEnd());
}
qw.orderByDesc("dataDate", "createTime");
IPage<CsmCashLog> iPage = PagerUtil.queryToPage(pq);
IPage<CsmCashLog> page = baseMapper.selectPage(iPage, qw);
return page;
}
}

20
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java

@ -1,11 +1,11 @@
package com.yxt.supervise.customer.biz.csmcash;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
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.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@RestController("com.yxt.supervise.customer.biz.csmcash.CsmCashRest")
@ -13,12 +13,20 @@ import org.springframework.web.multipart.MultipartFile;
public class CsmCashRest {
@Autowired
private CsmCashGdService csmCashGdService;
private CsmCashLogService csmCashLogService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<IPage<CsmCashLog>> listPage(@RequestBody PagerQuery<CsmCashLogQuery> pq) {
ResultBean rb = ResultBean.fireFail();
IPage<CsmCashLog> pv = csmCashLogService.listPage(pq);
return rb.success().setData(pv);
}
@PostMapping("/uploadGdData")
public ResultBean<CsmCashLog> uploadGdData(@RequestParam("file") MultipartFile file) {
ResultBean rb = ResultBean.fireFail();
rb = csmCashGdService.uploadAnd2Db(file);
rb = csmCashLogService.uploadAnd2Db(file);
return rb;
}
}

Loading…
Cancel
Save