|
@@ -3,6 +3,7 @@ package org.jeecg.ctop.finance.settlement.service.serviceImpl;
|
|
import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
|
import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
|
import cn.afterturn.easypoi.excel.entity.ImportParams;
|
|
import cn.afterturn.easypoi.excel.entity.ImportParams;
|
|
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
|
|
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
|
|
|
|
+import cn.hutool.core.bean.copier.CopyOptions;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
@@ -22,8 +23,10 @@ import org.jeecg.ctop.finance.settlement.mapper.SettlementFileInfoMapper;
|
|
import org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper;
|
|
import org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper;
|
|
import org.jeecg.ctop.finance.settlement.service.ISettlementFileInfoService;
|
|
import org.jeecg.ctop.finance.settlement.service.ISettlementFileInfoService;
|
|
import org.jeecg.ctop.finance.settlement.service.ISettlementInfoService;
|
|
import org.jeecg.ctop.finance.settlement.service.ISettlementInfoService;
|
|
|
|
+import org.jeecg.ctop.finance.utils.SettlementUtil;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.data.mapping.AccessOptions;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
@@ -123,4 +126,26 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
|
|
return Result.successMsg("删除成功。",null);
|
|
return Result.successMsg("删除成功。",null);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ *
|
|
|
|
+ * @description: 上传账户截图
|
|
|
|
+ *
|
|
|
|
+ * @param settlementFileInfo
|
|
|
|
+ * @param settlementList
|
|
|
|
+ * @return: org.jeecg.common.api.vo.Result
|
|
|
|
+ * @author: zianY
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ public Result insertAccountImages(ctopCwjsSettlementFileInfo settlementFileInfo, List<ctopCwjsSettlementFileInfo> settlementList) {
|
|
|
|
+ settlementList.forEach(settlement -> {
|
|
|
|
+ settlement.setAccountId(SettlementUtil.subAccountName(settlement.getFileName()));
|
|
|
|
+ //BeanUtils.copyProperties(settlementFileInfo,settlement,true,CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
|
|
|
|
+ BeanUtils.copyProperties(settlementFileInfo,settlement,SettlementUtil.getNullPropertyNames(settlementFileInfo));
|
|
|
|
+ settlementFileInfoMapper.insert(settlement);
|
|
|
|
+ });
|
|
|
|
+ return Result.successMsg("账户截图上传成功。",null);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|