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

更新合同导入字段

Browse Source
This commit is contained in:
zhanghuibin 2025-11-21 18:17:26 +08:00
parent 76d6a5afb2
commit 535811b6ab
4 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ public class ConSaleImportDto implements Serializable {
@Alias("客户名称") @Alias("客户名称")
private String clientName; private String clientName;
@Alias("优客项目编号") @Alias("项目编号")
private String contractNo; private String contractNo;
@Alias("订单编号") @Alias("订单编号")
@ -31,13 +31,13 @@ public class ConSaleImportDto implements Serializable {
@Alias("城市") @Alias("城市")
private String city; private String city;
@Alias("发布开始时间") @Alias("上刊时间")
private String publishStartDate; private String publishStartDate;
@Alias("发布结束时间") @Alias("下刊时间")
private String publishEndDate; private String publishEndDate;
@Alias("发布周期（天）") @Alias("周期")
private Double publishCycle; private Double publishCycle;
@Alias("媒体类型") @Alias("媒体类型")
@ -49,7 +49,7 @@ public class ConSaleImportDto implements Serializable {
@Alias("数量") @Alias("数量")
private Double quantity; private Double quantity;
@Alias("频次") @Alias("发布频次")
private String frequency; private String frequency;
@Alias("刊例价") @Alias("刊例价")
@ -64,10 +64,10 @@ public class ConSaleImportDto implements Serializable {
@Alias("订单发布费") @Alias("订单发布费")
private Double mediaFee; private Double mediaFee;
@Alias("订单制作费（修改字段）") @Alias("订单制作费")
private Double productionFee; private Double productionFee;
@Alias("订单总金额") @Alias("合同金额")
private Double totalAmount; private Double totalAmount;
@Alias("比稿") @Alias("比稿")
@ -103,12 +103,6 @@ public class ConSaleImportDto implements Serializable {
@Alias("签订日期") @Alias("签订日期")
private String signDate; private String signDate;
@Alias("合同附件")
private String contractAttachment;
@Alias("其他附件")
private String otherAttachment;
@Alias("补充说明") @Alias("补充说明")
private String notes; private String notes;

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

@ -16,7 +16,7 @@ public class ConPurchaseImportVO {
@Alias("客户名称") @Alias("客户名称")
private String clientName; private String clientName;
@Alias("优客项目编号") @Alias("项目编号")
private String projNumber; private String projNumber;
@Alias("合同编号") @Alias("合同编号")
@ -28,17 +28,17 @@ public class ConPurchaseImportVO {
@Alias("城市") @Alias("城市")
private String cityName; private String cityName;
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@Alias("发布开始时间") @Alias("上刊时间")
private Date startTime; private Date startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@Alias("发布结束时间") @Alias("下刊时间")
private Date endTime; private Date endTime;
@Alias("发布周期（天）") @Alias("周期")
private String publishDays; private String publishDays;
@Alias("媒体类型") @Alias("媒体类型")
@ -50,7 +50,7 @@ public class ConPurchaseImportVO {
@Alias("采购数量") @Alias("采购数量")
private String purchaseQuantity; private String purchaseQuantity;
@Alias("频次") @Alias("发布频次")
private String frequency; private String frequency;
@Alias("刊例价") @Alias("刊例价")
@ -62,22 +62,22 @@ public class ConPurchaseImportVO {
@Alias("折扣") @Alias("折扣")
private String discount; private String discount;
@Alias("净价") @Alias("媒体费")
private String netPrice; private String netPrice;
@Alias("净价单位") @Alias("媒体费单位")
private String netPriceUnit; private String netPriceUnit;
@Alias("制作费") @Alias("制作费")
private String productionFee; private String productionFee;
@Alias("合同总金额") @Alias("合同金额")
private Double contractMoney; private Double contractMoney;
@Alias("甲方名称") @Alias("甲方名称")
private String firstName; private String firstName;
@Alias("供应商名称") @Alias("乙方名称")
private String secondName; private String secondName;
@Alias("媒介部门") @Alias("媒介部门")
@ -97,24 +97,6 @@ public class ConPurchaseImportVO {
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date signTime; private Date signTime;
@Alias("合同附件")
private String contractAccess;
@Alias("上刊")
private String upPrint;
@Alias("换刊")
private String exchangePrint;
@Alias("下刊")
private String nextPrint;
@Alias("媒体链条")
private String mediaLink;
@Alias("附件")
private String attachment;
@Alias("状态") @Alias("状态")
private String state; private String state;
} }

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

@ -171,15 +171,10 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
purchaseBo.setContractMoney(firstRow.getContractMoney()); purchaseBo.setContractMoney(firstRow.getContractMoney());
purchaseBo.setInvoiceContent(firstRow.getInvoiceContent()); purchaseBo.setInvoiceContent(firstRow.getInvoiceContent());
purchaseBo.setSignTime(firstRow.getSignTime()); purchaseBo.setSignTime(firstRow.getSignTime());
purchaseBo.setUpPrint(firstRow.getUpPrint());
purchaseBo.setExchangePrint(firstRow.getExchangePrint());
purchaseBo.setNextPrint(firstRow.getNextPrint());
purchaseBo.setMediaLink(firstRow.getMediaLink());
purchaseBo.setFirstName(firstRow.getFirstName()); purchaseBo.setFirstName(firstRow.getFirstName());
purchaseBo.setMediaDeptName(firstRow.getMediaDeptName()); purchaseBo.setMediaDeptName(firstRow.getMediaDeptName());
purchaseBo.setSecondName(firstRow.getSecondName()); // 供应商名称（乙方名称） purchaseBo.setSecondName(firstRow.getSecondName());
purchaseBo.setTaxPoints(firstRow.getTaxPoints()); // 税率（税点） purchaseBo.setTaxPoints(firstRow.getTaxPoints());
purchaseBo.setMediaLink(firstRow.getMediaLink());
// 状态转换 // 状态转换
String state = "生效".equals(firstRow.getState()) ? "1" : "0"; String state = "生效".equals(firstRow.getState()) ? "1" : "0";
@ -265,7 +260,12 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
} }
// 城市 // 城市
if (StringUtils.isNotBlank(row.getCityName())) { if (StringUtils.isNotBlank(row.getCityName())) {
ConCity conCity = conCityMapper.selectList(new LambdaQueryWrapper<ConCity>().likeRight(ConCity::getCityName, row.getCityName())).stream().findFirst().orElse(null); // 城市一般是按照XXX/XXX/XXX这样的规则
String targetWholeName = row.getCityName().replace("/", "，");
ConCity conCity = conCityMapper.selectOne(new LambdaQueryWrapper<ConCity>()
.eq(ConCity::getWholeName, targetWholeName));
if (conCity != null) { if (conCity != null) {
mediaBo.setCityId(conCity.getId()); mediaBo.setCityId(conCity.getId());
mediaBo.setCityName(conCity.getCityName()); mediaBo.setCityName(conCity.getCityName());

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

@ -192,9 +192,14 @@ public class ConSaleServiceImpl implements IConSaleService {
ConSaleMediaBo mediaBo = new ConSaleMediaBo(); ConSaleMediaBo mediaBo = new ConSaleMediaBo();
// 根据城市名称查询城市ID // 城市
if (StringUtils.isNotBlank(row.getCity())) { if (StringUtils.isNotBlank(row.getCity())) {
ConCity conCity = conCityMapper.selectList(new LambdaQueryWrapper<ConCity>().likeRight(ConCity::getCityName, row.getCity())).stream().findFirst().orElse(null); // 城市一般是按照XXX/XXX/XXX这样的规则
String targetWholeName = row.getCity().replace("/", "，");
ConCity conCity = conCityMapper.selectOne(new LambdaQueryWrapper<ConCity>()
.eq(ConCity::getWholeName, targetWholeName));
if (conCity != null) { if (conCity != null) {
mediaBo.setCityId(conCity.getId()); mediaBo.setCityId(conCity.getId());
mediaBo.setCityName(conCity.getCityName()); mediaBo.setCityName(conCity.getCityName());