OpenGitLink
/
snow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复用户和部门

This commit is contained in:
jinqiming 2021-11-05 17:59:59 +08:00
parent a7ef470972
commit fd845d6f46
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snow-framework/src/main/java/com/snow/framework/excel/FinanceAlipayFlowListener.java
View File

@ -1,12 +1,12 @@
package com.snow.framework.excel; package com.snow.framework.excel;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.event.AnalysisEventListener;
import com.snow.common.enums.FinanceTradeType; import com.snow.common.enums.FinanceTradeType;
import com.snow.common.exception.BusinessException; import com.snow.common.exception.BusinessException;
import com.snow.common.utils.DateUtils; import com.snow.common.utils.DateUtils;
import com.snow.common.utils.StringUtils; import com.snow.common.utils.StringUtils;
import com.snow.common.utils.bean.BeanUtils;
import com.snow.system.domain.FinanceAlipayFlow; import com.snow.system.domain.FinanceAlipayFlow;
import com.snow.system.domain.FinanceAlipayFlowImport; import com.snow.system.domain.FinanceAlipayFlowImport;
import com.snow.system.domain.SysUser; import com.snow.system.domain.SysUser;
@ -88,7 +88,6 @@ public class FinanceAlipayFlowListener extends AnalysisEventListener<FinanceAlip
if(!firstHead.equals("支付宝交易记录明细查询")&&rowIndex==0){ if(!firstHead.equals("支付宝交易记录明细查询")&&rowIndex==0){
throw new BusinessException("非标准化模板请勿导入，请下载标准模板或使用支付宝导出的原账单模板"); throw new BusinessException("非标准化模板请勿导入，请下载标准模板或使用支付宝导出的原账单模板");
} }
System.out.println("表头信息："+headMap);
} }
//读取完成后执行 //读取完成后执行
@ -108,8 +107,7 @@ public class FinanceAlipayFlowListener extends AnalysisEventListener<FinanceAlip
if(StringUtils.isNotNull(financeAlipayFlow1)){ if(StringUtils.isNotNull(financeAlipayFlow1)){
throw new BusinessException("交易号：【"+t.getTradeNo()+"】已存在请勿重复导入数据"); throw new BusinessException("交易号：【"+t.getTradeNo()+"】已存在请勿重复导入数据");
} }
FinanceAlipayFlow financeAlipayFlow = new FinanceAlipayFlow(); FinanceAlipayFlow financeAlipayFlow = BeanUtil.copyProperties(t,FinanceAlipayFlow.class);
BeanUtils.copyProperties(t, financeAlipayFlow);
String payTime = t.getPayTime(); String payTime = t.getPayTime();
String tradeCreateTime = t.getTradeCreateTime(); String tradeCreateTime = t.getTradeCreateTime();
String lastModifyTime = t.getLastModifyTime(); String lastModifyTime = t.getLastModifyTime();

4
snow-framework/src/main/java/com/snow/framework/excel/FinanceWeChartFlowListener.java
View File

@ -1,5 +1,6 @@
package com.snow.framework.excel; package com.snow.framework.excel;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.event.AnalysisEventListener;
@ -102,8 +103,7 @@ public class FinanceWeChartFlowListener extends AnalysisEventListener<FinanceWeC
if(ObjectUtil.isNotNull(financeAlipayFlow1)){ if(ObjectUtil.isNotNull(financeAlipayFlow1)){
throw new BusinessException("交易号：【"+t.getTradeNo()+"】已存在请勿重复导入数据"); throw new BusinessException("交易号：【"+t.getTradeNo()+"】已存在请勿重复导入数据");
} }
FinanceAlipayFlow financeAlipayFlow = new FinanceAlipayFlow(); FinanceAlipayFlow financeAlipayFlow = BeanUtil.copyProperties(t,FinanceAlipayFlow.class);
BeanUtils.copyProperties(t, financeAlipayFlow);
String payTime = t.getPayTime(); String payTime = t.getPayTime();
if (!StringUtils.isEmpty(payTime)) { if (!StringUtils.isEmpty(payTime)) {
Date date = DateUtils.parseDate(payTime); Date date = DateUtils.parseDate(payTime);