wangchengming/Contract-Manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wangchengming:89aa22cd787c7dc91fb98b063e1d93bcf7a518c7
Branches Tags
wangchengming:main
..
compare: wangchengming:b27ebaccf165eaa57174b6ccaaec711b26121471
Branches Tags
wangchengming:main

No commits in common. "89aa22cd787c7dc91fb98b063e1d93bcf7a518c7" and "b27ebaccf165eaa57174b6ccaaec711b26121471" have entirely different histories.
89aa22cd78 ... b27ebaccf1

13 changed files with 123 additions and 463 deletions
Show Stats Expand all files Collapse all files

10
ruoyi-system/src/main/java/com/ruoyi/contract/controller/ConPurchaseController.java
View File

@ -211,18 +211,14 @@ public class ConPurchaseController extends BaseController {
return toAjax(iConPurchaseService.updatePurchaseDaysOverdue()); return toAjax(iConPurchaseService.updatePurchaseDaysOverdue());
} }
/** // @Log(title = "采购合同", businessType = BusinessType.IMPORT)
* 采购合同导入 // @SaCheckPermission("system:purchase:import")
* @param file
* @return
*/
@Log(title = "采购合同", businessType = BusinessType.IMPORT)
@PostMapping("/importData") @PostMapping("/importData")
public R<Integer> importData(MultipartFile file) { public R<Integer> importData(MultipartFile file) {
try { try {
return R.ok(iConPurchaseService.importPurchase(file)); return R.ok(iConPurchaseService.importPurchase(file));
} catch (Exception e) { } catch (Exception e) {
return R.fail(e.getMessage()); return R.fail("导入失败");
} }
} }
} }

15
ruoyi-system/src/main/java/com/ruoyi/contract/controller/ConSaleController.java
View File

@ -804,19 +804,4 @@ public class ConSaleController extends BaseController {
} }
/**
* 销售合同导入
* @param file
* @return
*/
@Log(title = "销售合同导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public R<Integer> importData(MultipartFile file) {
try {
return R.ok(iConSaleService.importData(file));
} catch (Exception e) {
return R.fail("导入失败");
}
}
} }

5
ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchaseMedia.java
View File

@ -115,11 +115,6 @@ public class ConPurchaseMedia extends BaseEntity {
*/ */
@FieldNameApi(name ="媒体费") @FieldNameApi(name ="媒体费")
private Double mediaFee; private Double mediaFee;
/**
* 媒体费单位
*/
@FieldNameApi(name ="媒体费单位")
private String mediaFeeUnit;
/** /**
* 制作费 * 制作费
*/ */

6
ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseMediaBo.java
View File

@ -151,12 +151,6 @@ public class ConPurchaseMediaBo extends BaseEntity {
@CustomBaenAnnotation(value = "媒体费") @CustomBaenAnnotation(value = "媒体费")
private Double mediaFee; private Double mediaFee;
/**
* 媒体费单位
*/
@CustomBaenAnnotation(value = "媒体费单位")
private String mediaFeeUnit;
/** /**
* 制作费 * 制作费
*/ */

14
ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConSaleMediaBo.java
View File

@ -189,18 +189,4 @@ public class ConSaleMediaBo extends BaseEntityAdd {
@CustomBaenAnnotation(value = "其他返点金额") @CustomBaenAnnotation(value = "其他返点金额")
@Digits(integer = 15,fraction = 4,message = "其他返点金额最多允许15位整数,4位小数") @Digits(integer = 15,fraction = 4,message = "其他返点金额最多允许15位整数,4位小数")
private Double otherReverMoney; private Double otherReverMoney;
/**
* 其他返点2
*/
@CustomBaenAnnotation(value = "其他返点2")
@Digits(integer = 15,fraction = 4,message = "其他返点2最多允许15位整数,4位小数")
private String otherReverPoit2;
/**
* 其他返点金额2
*/
@CustomBaenAnnotation(value = "其他返点金额2")
@Digits(integer = 15,fraction = 4,message = "其他返点金额2最多允许15位整数,4位小数")
private Double otherReverMoney2;
} }

119
ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java
View File

@ -1,119 +0,0 @@
package com.ruoyi.contract.domain.dto;
import cn.hutool.core.annotation.Alias;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 销售合同导入DTO
* 用于接收Hutool Excel读取的数据
*/
@Data
public class ConSaleImportDto implements Serializable {
private static final long serialVersionUID = 1L;
@Alias("客户名称")
private String clientName;
@Alias("优客项目编号")
private String contractNo;
@Alias("订单编号")
private String projectNo;
@Alias("项目名称")
private String projectName;
@Alias("城市")
private String city;
@Alias("发布开始时间")
private String publishStartDate;
@Alias("发布结束时间")
private String publishEndDate;
@Alias("发布周期（天）")
private Double publishCycle;
@Alias("媒体类型")
private String mediaType;
@Alias("媒体位置")
private String mediaPosition;
@Alias("数量")
private Double quantity;
@Alias("频次")
private String frequency;
@Alias("刊例价")
private Double listPrice;
@Alias("刊例价单位")
private String listPriceUnit;
@Alias("折扣")
private String discount;
@Alias("订单发布费")
private Double mediaFee;
@Alias("订单制作费（修改字段）")
private Double productionFee;
@Alias("订单总金额")
private Double totalAmount;
@Alias("比稿")
private String isBid;
@Alias("比稿返点")
private String bidRebate;
@Alias("比稿返点金额")
private Double bidRebateAmount = 0.0;
@Alias("其他返点1")
private String otherReverPoit = "0";
@Alias("其他返点金额1")
private Double otherReverMoney = 0.0;
@Alias("其他返点2")
private String otherReverPoit2 = "0";
@Alias("其他返点金额2")
private Double otherReverMoney2 = 0.0;
@Alias("开票时间")
private String invoiceDate;
@Alias("甲方名称")
private String partyA;
@Alias("乙方名称")
private String partyB;
@Alias("签订日期")
private String signDate;
@Alias("合同附件")
private String contractAttachment;
@Alias("其他附件")
private String otherAttachment;
@Alias("补充说明")
private String notes;
@Alias("状态")
private String status;
@Alias("项目执行人")
private String projectExecutor;
}

15
ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseImportVO.java
View File

@ -1,10 +1,7 @@
package com.ruoyi.contract.domain.vo; package com.ruoyi.contract.domain.vo;
import cn.hutool.core.annotation.Alias; import cn.hutool.core.annotation.Alias;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
/** /**
@ -31,13 +28,9 @@ public class ConPurchaseImportVO {
@Alias("城市") @Alias("城市")
private String cityName; private String cityName;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@Alias("发布开始时间") @Alias("发布开始时间")
private Date startTime; private Date startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@Alias("发布结束时间") @Alias("发布结束时间")
private Date endTime; private Date endTime;
@ -81,23 +74,21 @@ public class ConPurchaseImportVO {
private String firstName; private String firstName;
@Alias("供应商名称") @Alias("供应商名称")
private String secondName; private String supplierName;
@Alias("媒介部门") @Alias("媒介部门")
private String mediaDeptName; private String mediaDeptName;
@Alias("发票类型") @Alias("发票类型")
private String invoiceName; private String invoiceType;
@Alias("税率") @Alias("税率")
private String taxPoints; private String taxRate;
@Alias("发票内容") @Alias("发票内容")
private String invoiceContent; private String invoiceContent;
@Alias("签订日期") @Alias("签订日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date signTime; private Date signTime;
@Alias("合同附件") @Alias("合同附件")

2
ruoyi-system/src/main/java/com/ruoyi/contract/service/IConPurchaseService.java
View File

@ -106,5 +106,5 @@ public interface IConPurchaseService {
* @return 结果 * @return 结果
* @throws Exception * @throws Exception
*/ */
int importPurchase(MultipartFile file) throws Exception; int importPurchase(MultipartFile file);
} }

17
ruoyi-system/src/main/java/com/ruoyi/contract/service/IConSaleService.java
View File

@ -1,18 +1,24 @@
package com.ruoyi.contract.service; package com.ruoyi.contract.service;
import com.ruoyi.contract.domain.ConOtherPayment;
import com.ruoyi.contract.domain.ConSale; import com.ruoyi.contract.domain.ConSale;
import com.ruoyi.contract.domain.bo.ConStaticBo; import com.ruoyi.contract.domain.bo.ConStaticBo;
import com.ruoyi.contract.domain.bo.consale.ConSaleBoExtend; import com.ruoyi.contract.domain.bo.consale.ConSaleBoExtend;
import com.ruoyi.contract.domain.bo.consale.ConSaleExcelSearch;
import com.ruoyi.contract.domain.bo.consale.ConSaleSearch;
import com.ruoyi.contract.domain.bo.consale.ConSaleTotalVo; import com.ruoyi.contract.domain.bo.consale.ConSaleTotalVo;
import com.ruoyi.contract.domain.vo.ConSaleVo; import com.ruoyi.contract.domain.vo.ConSaleVo;
import com.ruoyi.contract.domain.bo.ConSaleBo; import com.ruoyi.contract.domain.bo.ConSaleBo;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.Console;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 销售合同信息Service接口 * 销售合同信息Service接口
@ -99,13 +105,4 @@ public interface IConSaleService {
* 更新同步统计表字段 * 更新同步统计表字段
*/ */
ConStaticBo updateStaticDate(ConSale add); ConStaticBo updateStaticDate(ConSale add);
/**
* 导入销售合同
*
* @param file 导入的Excel文件
* @return 导入结果信息
* @throws Exception 导入过程中可能抛出的异常
*/
int importData(MultipartFile file) throws Exception;
} }

233
ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java
View File

@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelUtil;
@ -23,7 +22,6 @@ import com.ruoyi.common.utils.sql.HeadExcelUtils;
import com.ruoyi.contract.domain.*; import com.ruoyi.contract.domain.*;
import com.ruoyi.contract.domain.bo.*; import com.ruoyi.contract.domain.bo.*;
import com.ruoyi.contract.domain.bo.conpurchase.ConPurchaseBoExtend; import com.ruoyi.contract.domain.bo.conpurchase.ConPurchaseBoExtend;
import com.ruoyi.contract.domain.dto.ConSaleImportDto;
import com.ruoyi.contract.domain.vo.*; import com.ruoyi.contract.domain.vo.*;
import com.ruoyi.contract.domain.vo.conpurchasevo.ConPurchaseTotalVo; import com.ruoyi.contract.domain.vo.conpurchasevo.ConPurchaseTotalVo;
import com.ruoyi.contract.mapper.*; import com.ruoyi.contract.mapper.*;
@ -127,166 +125,125 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
@Resource @Resource
private Validator validator; private Validator validator;
/**
* 导入采购合同信息
* @param file 导入文件
* @return
* @throws Exception
*/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public int importPurchase(MultipartFile file) throws Exception { public int importPurchase(MultipartFile file) {
ExcelReader reader = ExcelUtil.getReader(file.getInputStream()); List<ConPurchaseImportVO> list;
List<ConPurchaseImportVO> list = reader.readAll(ConPurchaseImportVO.class); try (InputStream inputStream = file.getInputStream()) {
reader.close(); ExcelReader reader = ExcelUtil.getReader(inputStream);
list = reader.readAll(ConPurchaseImportVO.class);
} catch (IOException e) {
throw new ServiceException("导入采购合同失败");
}
if (CollectionUtil.isEmpty(list)) { if (CollectionUtil.isEmpty(list)) {
throw new ServiceException("导入数据不能为空"); throw new ServiceException("导入数据不能为空");
} }
// 按合同编号对导入数据进行分组 for (int i = 0; i < list.size(); i++) {
Map<String, List<ConPurchaseImportVO>> mapByContractNumber = list.stream() ConPurchaseImportVO vo = list.get(i);
.filter(vo -> StringUtils.isNotBlank(vo.getContractNumber())) try {
.collect(Collectors.groupingBy(ConPurchaseImportVO::getContractNumber)); // 校验必填项
if (StringUtils.isBlank(vo.getContractNumber())) {
throw new ServiceException("合同编号不能为空");
}
// 遍历每个合同分组 ConPurchase conPurchase = baseMapper.selectOne(new LambdaQueryWrapper<ConPurchase>()
for (Map.Entry<String, List<ConPurchaseImportVO>> entry : mapByContractNumber.entrySet()) { .eq(ConPurchase::getContractNumber, vo.getContractNumber()));
String contractNumber = entry.getKey();
List<ConPurchaseImportVO> rows = entry.getValue();
ConPurchaseImportVO firstRow = rows.get(0); // 使用第一行数据作为主信息
// 判断合同是否存在 if (conPurchase == null) {
ConPurchase existingContract = baseMapper.selectOne(new LambdaQueryWrapper<ConPurchase>() // 不存在，新增合同
.eq(ConPurchase::getContractNumber, contractNumber)); conPurchase = new ConPurchase();
// 手动进行字段映射
conPurchase.setContractNumber(vo.getContractNumber());
conPurchase.setProjNumber(vo.getProjNumber());
conPurchase.setProjName(vo.getProjName());
conPurchase.setStartTime(vo.getStartTime());
conPurchase.setEndTime(vo.getEndTime());
conPurchase.setContractMoney(vo.getContractMoney());
conPurchase.setInvoiceContent(vo.getInvoiceContent());
conPurchase.setSignTime(vo.getSignTime());
conPurchase.setUpPrint(vo.getUpPrint());
conPurchase.setExchangePrint(vo.getExchangePrint());
conPurchase.setNextPrint(vo.getNextPrint());
conPurchase.setMediaLink(vo.getMediaLink());
String state = "生效".equals(vo.getState()) ? "1" : "0";
conPurchase.setState(state);
conPurchase.setFirstName(vo.getFirstName());
conPurchase.setMediaDeptName(vo.getMediaDeptName());
// 供应商名称（乙方名称）
conPurchase.setSecondName(vo.getSupplierName());
//税率（税点）
conPurchase.setTaxPoints(vo.getTaxRate());
if (existingContract == null) { //甲方
// 合同不存在 -> 调用 insertByBo 新增 if (StringUtils.isNotBlank(vo.getFirstName())) {
ConPurchaseBo purchaseBo = new ConPurchaseBo(); ConFirst conFirst = conFirstMapper.selectOne(new LambdaQueryWrapper<ConFirst>().eq(ConFirst::getFirstName, vo.getFirstName()));
// 手动映射主表字段 if (conFirst != null) {
purchaseBo.setContractNumber(firstRow.getContractNumber()); conPurchase.setFirstId(conFirst.getId());
purchaseBo.setProjNumber(firstRow.getProjNumber()); }
purchaseBo.setProjName(firstRow.getProjName()); }
purchaseBo.setStartTime(firstRow.getStartTime()); //媒介部门
purchaseBo.setEndTime(firstRow.getEndTime()); if (StringUtils.isNotBlank(vo.getMediaDeptName())) {
purchaseBo.setContractMoney(firstRow.getContractMoney()); ConMediaDept conMediaDept = conMediaDeptMapper.selectOne(new LambdaQueryWrapper<ConMediaDept>().eq(ConMediaDept::getMediaDeptName, vo.getMediaDeptName()));
purchaseBo.setInvoiceContent(firstRow.getInvoiceContent()); if (conMediaDept != null) {
purchaseBo.setSignTime(firstRow.getSignTime()); conPurchase.setMediaDeptId(conMediaDept.getId());
purchaseBo.setUpPrint(firstRow.getUpPrint()); }
purchaseBo.setExchangePrint(firstRow.getExchangePrint()); }
purchaseBo.setNextPrint(firstRow.getNextPrint()); //发票类型
purchaseBo.setMediaLink(firstRow.getMediaLink()); if (StringUtils.isNotBlank(vo.getInvoiceType())) {
purchaseBo.setFirstName(firstRow.getFirstName()); ConInvoice conInvoice = conInvoiceMapper.selectOne(new LambdaQueryWrapper<ConInvoice>().eq(ConInvoice::getInvoiceName, vo.getInvoiceType()));
purchaseBo.setMediaDeptName(firstRow.getMediaDeptName()); if (conInvoice != null) {
purchaseBo.setSecondName(firstRow.getSecondName()); // 供应商名称（乙方名称） conPurchase.setInvoiceId(conInvoice.getId());
purchaseBo.setTaxPoints(firstRow.getTaxPoints()); // 税率（税点） }
purchaseBo.setMediaLink(firstRow.getMediaLink()); }
// 状态转换 validEntityBeforeSave(conPurchase);
String state = "生效".equals(firstRow.getState()) ? "1" : "0"; baseMapper.insert(conPurchase);
purchaseBo.setState(state); }
// 关联客户ID // 新增媒体数据
if (StringUtils.isNotBlank(firstRow.getClientName())) { ConPurchaseMedia conPurchaseMedia = new ConPurchaseMedia();
ConClient conClient = conClientMapper.selectOne(new LambdaQueryWrapper<ConClient>().eq(ConClient::getClientName, firstRow.getClientName())); conPurchaseMedia.setPurchaseId(conPurchase.getId());
if (conClient != null) {
purchaseBo.setClientId(conClient.getId()); // 媒体类型
if (StringUtils.isNotBlank(vo.getMediaType())) {
ConMediaType conMediaType = conMediaTypeMapper.selectOne(new LambdaQueryWrapper<ConMediaType>().eq(ConMediaType::getMediaType, vo.getMediaType()));
if (conMediaType != null) {
conPurchaseMedia.setMediaId(conMediaType.getId());
} }
} }
//城市
// 关联甲方ID if (StringUtils.isNotBlank(vo.getCityName())) {
if (StringUtils.isNotBlank(firstRow.getFirstName())) { ConCity conCity = conCityMapper.selectList(new LambdaQueryWrapper<ConCity>().likeRight(ConCity::getCityName, vo.getCityName())).stream().findFirst().orElse(null);
ConFirst conFirst = conFirstMapper.selectOne(new LambdaQueryWrapper<ConFirst>().eq(ConFirst::getFirstName, firstRow.getFirstName())); if (conCity != null) {
if (conFirst != null) { conPurchaseMedia.setCityId(conCity.getId());
purchaseBo.setFirstId(conFirst.getId()); String cityIds = iConCityService.selectTreeIds(conCity.getId());
} conPurchaseMedia.setCityIds(cityIds);
}
// 关联媒介部门ID
if (StringUtils.isNotBlank(firstRow.getMediaDeptName())) {
ConMediaDept conMediaDept = conMediaDeptMapper.selectOne(new LambdaQueryWrapper<ConMediaDept>().eq(ConMediaDept::getMediaDeptName, firstRow.getMediaDeptName()));
if (conMediaDept != null) {
purchaseBo.setMediaDeptId(conMediaDept.getId());
}
}
// 关联发票类型ID
if (StringUtils.isNotBlank(firstRow.getInvoiceName())) {
ConInvoice conInvoice = conInvoiceMapper.selectOne(new LambdaQueryWrapper<ConInvoice>().eq(ConInvoice::getInvoiceName, firstRow.getInvoiceName()));
if (conInvoice != null) {
purchaseBo.setInvoiceId(conInvoice.getId());
} }
} }
conPurchaseMedia.setMediaPosition(vo.getMediaLocation());
conPurchaseMedia.setAccountNumber(safeParseDouble(vo.getPurchaseQuantity()));
conPurchaseMedia.setReleaseFrequency(vo.getFrequency());
conPurchaseMedia.setUpTime(vo.getStartTime());
conPurchaseMedia.setDownTime(vo.getEndTime());
conPurchaseMedia.setPeriod(safeParseDouble(vo.getPublishDays()));
conPurchaseMedia.setPrintPrice(safeParseDouble(vo.getListPrice()));
conPurchaseMedia.setPrintPriceUnit(vo.getListPriceUnit());
conPurchaseMedia.setDiscount(vo.getDiscount());
conPurchaseMedia.setMediaFee(safeParseDouble(vo.getNetPrice()));
conPurchaseMedia.setProductFee(safeParseDouble(vo.getProductionFee()));
// 映射媒体子表信息 conPurchaseMediaMapper.insert(conPurchaseMedia);
List<ConPurchaseMediaBo> mediaBoList = rows.stream().map(row -> {
ConPurchaseMediaBo mediaBo = new ConPurchaseMediaBo();
this.mapRowToMediaBo(row, mediaBo);
return mediaBo;
}).collect(Collectors.toList());
purchaseBo.setPurchaseMediaBoList(mediaBoList);
this.insertByBo(purchaseBo);
} else { } catch (Exception e) {
// 合同已存在 -> 调用 updateByBo 追加媒体信息 log.error("导入采购合同失败", e);
ConPurchaseVo existingVo = this.queryById(existingContract.getId());
ConPurchaseBo purchaseBo = BeanUtil.toBean(existingVo, ConPurchaseBo.class);
// 获取已有的媒体信息
List<ConPurchaseMediaBo> existingMedia = purchaseBo.getPurchaseMediaBoList();
if (existingMedia == null) {
existingMedia = new ArrayList<>();
}
// 创建并添加本次导入的新媒体信息
List<ConPurchaseMediaBo> newMediaList = rows.stream().map(row -> {
ConPurchaseMediaBo mediaBo = new ConPurchaseMediaBo();
this.mapRowToMediaBo(row, mediaBo);
return mediaBo;
}).collect(Collectors.toList());
existingMedia.addAll(newMediaList);
purchaseBo.setPurchaseMediaBoList(existingMedia);
this.updateByBo(purchaseBo);
} }
} }
return list.size(); return list.size();
} }
/**
* 辅助方法：将导入行数据映射到媒体BO
*/
private void mapRowToMediaBo(ConPurchaseImportVO row, ConPurchaseMediaBo mediaBo) {
// 媒体类型
if (StringUtils.isNotBlank(row.getMediaType())) {
ConMediaType conMediaType = conMediaTypeMapper.selectOne(new LambdaQueryWrapper<ConMediaType>().eq(ConMediaType::getMediaType, row.getMediaType()));
if (conMediaType != null) {
mediaBo.setMediaId(conMediaType.getId());
mediaBo.setMediaName(conMediaType.getMediaType());
}
}
// 城市
if (StringUtils.isNotBlank(row.getCityName())) {
ConCity conCity = conCityMapper.selectList(new LambdaQueryWrapper<ConCity>().likeRight(ConCity::getCityName, row.getCityName())).stream().findFirst().orElse(null);
if (conCity != null) {
mediaBo.setCityId(conCity.getId());
mediaBo.setCityName(conCity.getCityName());
String cityIds = iConCityService.selectTreeIds(conCity.getId());
mediaBo.setCityIds(cityIds);
}
}
mediaBo.setMediaPosition(row.getMediaLocation());
mediaBo.setAccountNumber(safeParseDouble(row.getPurchaseQuantity()));
mediaBo.setReleaseFrequency(row.getFrequency());
mediaBo.setUpTime(row.getStartTime());
mediaBo.setDownTime(row.getEndTime());
mediaBo.setPeriod(safeParseDouble(row.getPublishDays()));
mediaBo.setPrintPrice(safeParseDouble(row.getListPrice()));
mediaBo.setPrintPriceUnit(row.getListPriceUnit());
mediaBo.setDiscount(StrUtil.isNotBlank(row.getDiscount()) ? row.getDiscount() : "0");
mediaBo.setMediaFee(safeParseDouble(row.getNetPrice()));
mediaBo.setMediaFeeUnit(row.getNetPriceUnit());
mediaBo.setProductFee(safeParseDouble(row.getProductionFee()));
}
private Double safeParseDouble(String str) { private Double safeParseDouble(String str) {
if (StringUtils.isBlank(str) || "-".equals(str)) { if (StringUtils.isBlank(str) || "-".equals(str)) {
return null; return null;

5
ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleMediaServiceImpl.java
View File

@ -179,11 +179,6 @@ public class ConSaleMediaServiceImpl implements IConSaleMediaService {
bean.setOtherReverPoit(bean.getOtherReverPoit() + "%"); bean.setOtherReverPoit(bean.getOtherReverPoit() + "%");
} }
} }
if (ObjectUtil.isNotNull(bean.getOtherReverPoit2())){
if (!bean.getOtherReverPoit2().contains("%")){
bean.setOtherReverPoit(bean.getOtherReverPoit2() + "%");
}
}
System.out.println(bean.getCityId()); System.out.println(bean.getCityId());
return bean; return bean;
}).collect(Collectors.toList()); }).collect(Collectors.toList());

144
ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
View File

@ -7,9 +7,12 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter; import cn.hutool.poi.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Translation;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateSpeciUtil; import com.ruoyi.common.utils.DateSpeciUtil;
import com.ruoyi.common.utils.FieldCompare; import com.ruoyi.common.utils.FieldCompare;
@ -24,23 +27,30 @@ import com.ruoyi.common.utils.sql.HeadExcelUtils;
import com.ruoyi.contract.domain.*; import com.ruoyi.contract.domain.*;
import com.ruoyi.contract.domain.bo.*; import com.ruoyi.contract.domain.bo.*;
import com.ruoyi.contract.domain.bo.consale.ConSaleBoExtend; import com.ruoyi.contract.domain.bo.consale.ConSaleBoExtend;
import com.ruoyi.contract.domain.bo.consale.ConSaleExcelSearch;
import com.ruoyi.contract.domain.bo.consale.ConSaleSearch; import com.ruoyi.contract.domain.bo.consale.ConSaleSearch;
import com.ruoyi.contract.domain.bo.consale.ConSaleTotalVo; import com.ruoyi.contract.domain.bo.consale.ConSaleTotalVo;
import com.ruoyi.contract.domain.dto.ConSaleImportDto;
import com.ruoyi.contract.domain.vo.*; import com.ruoyi.contract.domain.vo.*;
import com.ruoyi.contract.mapper.*; import com.ruoyi.contract.domain.vo.conpurchasevo.ConPurchaseTotalVo;
import com.ruoyi.contract.mapper.ConCityMapper;
import com.ruoyi.contract.mapper.ConClientMapper;
import com.ruoyi.contract.service.*; import com.ruoyi.contract.service.*;
import com.sun.corba.se.spi.orbutil.threadpool.WorkQueue;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.ehcache.impl.internal.loaderwriter.writebehind.BatchingLocalHeapWriteBehindQueue;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.contract.mapper.ConSaleMapper;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.Console;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.math.MathContext;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -126,132 +136,6 @@ public class ConSaleServiceImpl implements IConSaleService {
@Resource @Resource
private IConMediaTypeService iConMediaTypeService; private IConMediaTypeService iConMediaTypeService;
private final ConFirstMapper conFirstMapper;
private final ConMediaTypeMapper conMediaTypeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public int importData(MultipartFile file) throws Exception {
ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
// 读取所有行数据到DTO列表
List<ConSaleImportDto> dtoList = reader.readAll(ConSaleImportDto.class);
reader.close();
if (CollUtil.isEmpty(dtoList)) {
throw new ServiceException("导入数据为空！");
}
for (ConSaleImportDto row : dtoList) {
// 校验项目编号（订单编号）是否为空
if (StringUtils.isBlank(row.getProjectNo())) {
throw new ServiceException("合同编号不能为空");
}
ConSaleBo saleBo = new ConSaleBo();
saleBo.setContractNumber(row.getContractNo()); // 合同编号 (来自“优客项目编号”)
saleBo.setProjNumber(row.getProjectNo()); // 项目编号 (来自“订单编号”)
saleBo.setProjName(row.getProjectName());
saleBo.setProjExecutor(row.getProjectExecutor());
saleBo.setSecondName(row.getPartyB());
saleBo.setSupple(row.getNotes());
String state = "生效".equals(row.getStatus()) ? "1" : "0";
saleBo.setContractMoney(row.getTotalAmount());
saleBo.setState(state);
// 根据客户名称查询客户ID
if (StringUtils.isNotBlank(row.getClientName())) {
ConClient client = conClientMapper.selectOne(new LambdaQueryWrapper<ConClient>().eq(ConClient::getClientName, row.getClientName()));
if (client != null) {
saleBo.setClientId(client.getId());
saleBo.setClientName(client.getClientName());
}
}
// 根据甲方名称查询甲方ID
if (StringUtils.isNotBlank(row.getPartyA())) {
ConFirst first = conFirstMapper.selectOne(new LambdaQueryWrapper<ConFirst>().eq(ConFirst::getFirstName, row.getPartyA()));
if (first != null) {
saleBo.setFirstId(first.getId());
saleBo.setFirstName(first.getFirstName());
}
}
// 解析日期
try {
if (StringUtils.isNotBlank(row.getSignDate())) {
saleBo.setSignTime(DateUtil.parse(row.getSignDate(), "yyyy-MM-dd"));
}
if (StringUtils.isNotBlank(row.getInvoiceDate())) {
saleBo.setBillingTime(DateUtil.parse(row.getInvoiceDate(), "yyyy-MM-dd"));
}
} catch (Exception e) {
throw new ServiceException("订单 " + row.getProjectNo() + " 的签约或开票日期格式不正确，请使用 yyyy-MM-dd 格式");
}
ConSaleMediaBo mediaBo = new ConSaleMediaBo();
// 根据城市名称查询城市ID
if (StringUtils.isNotBlank(row.getCity())) {
ConCity conCity = conCityMapper.selectList(new LambdaQueryWrapper<ConCity>().likeRight(ConCity::getCityName, row.getCity())).stream().findFirst().orElse(null);
if (conCity != null) {
mediaBo.setCityId(conCity.getId());
mediaBo.setCityName(conCity.getCityName());
String cityIds = iConCityService.selectTreeIds(conCity.getId());
mediaBo.setCityIds(cityIds);
}
}
// 根据媒体类型查询ID
if (StringUtils.isNotBlank(row.getMediaType())) {
ConMediaType mediaType = conMediaTypeMapper.selectOne(new LambdaQueryWrapper<ConMediaType>().eq(ConMediaType::getMediaType, row.getMediaType()));
if (mediaType != null) {
mediaBo.setMediaId(mediaType.getId());
mediaBo.setMediaName(mediaType.getMediaType());
}
}
mediaBo.setMediaPosition(row.getMediaPosition());
mediaBo.setAccountNumber(row.getQuantity());
mediaBo.setReleaseFrequency(row.getFrequency());
mediaBo.setPrintPrice(row.getListPrice());
mediaBo.setPrintPriceUnit(row.getListPriceUnit());
mediaBo.setDiscount(row.getDiscount());
mediaBo.setMediaFee(row.getMediaFee());
mediaBo.setProductFee(row.getProductionFee());
mediaBo.setCompet("是".equals(row.getIsBid()) ? "1" : "2");
mediaBo.setRemark(row.getNotes());
mediaBo.setPeriod(row.getPublishCycle());
mediaBo.setCompetReverPoit(StrUtil.isNotBlank(row.getBidRebate()) ? row.getBidRebate() : "0");
mediaBo.setCompetReverMoney(ObjectUtil.isNotNull(row.getBidRebateAmount()) ? row.getBidRebateAmount() : 0.0);
mediaBo.setOtherReverPoit(StrUtil.isNotBlank(row.getOtherReverPoit()) ? row.getOtherReverPoit() : "0");
mediaBo.setOtherReverMoney(ObjectUtil.isNotNull(row.getOtherReverMoney()) ? row.getOtherReverMoney() : 0.0);
mediaBo.setOtherReverPoit2(StrUtil.isNotBlank(row.getOtherReverPoit2()) ? row.getOtherReverPoit2() : "0");
mediaBo.setOtherReverMoney2(ObjectUtil.isNotNull(row.getOtherReverMoney2()) ? row.getOtherReverMoney2() : 0.0);
// 解析日期
try {
if (StringUtils.isNotBlank(row.getPublishStartDate())) {
mediaBo.setUpTime(DateUtil.parse(row.getPublishStartDate(), "yyyy-MM-dd"));
}
if (StringUtils.isNotBlank(row.getPublishEndDate())) {
mediaBo.setDownTime(DateUtil.parse(row.getPublishEndDate(), "yyyy-MM-dd"));
}
} catch (Exception e) {
throw new ServiceException("订单 " + row.getProjectNo() + " 的发布起止日期格式不正确，请使用 yyyy-MM-dd 格式");
}
List<ConSaleMediaBo> mediaList = new ArrayList<>();
mediaList.add(mediaBo);
saleBo.setConSaleMediaBoList(mediaList);
// 调用现有服务将封装好的 saleBo 存入数据库
this.insertByBo(saleBo);
}
return dtoList.size();
}
/** /**
* 查询销售合同信息 * 查询销售合同信息
*/ */

1
ruoyi-system/src/main/resources/mapper/contract/ConPurchaseMediaMapper.xml
View File

@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="printPriceUnit" column="print_price_unit"/> <result property="printPriceUnit" column="print_price_unit"/>
<result property="discount" column="discount"/> <result property="discount" column="discount"/>
<result property="mediaFee" column="media_fee"/> <result property="mediaFee" column="media_fee"/>
<result property="mediaFeeUnit" column="media_fee_unit"/>
<result property="productFee" column="product_fee"/> <result property="productFee" column="product_fee"/>
<result property="createBy" column="create_by"/> <result property="createBy" column="create_by"/>
<result property="createUserId" column="create_user_id"/> <result property="createUserId" column="create_user_id"/>