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

1

Browse Source
This commit is contained in:
niuyan 2025-11-21 10:34:12 +08:00
parent 1cffd78f14
commit 702ba56c19
1 changed files with 99 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2187,29 +2187,24 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(i + 1)); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(i + 1));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("clientId")){
// 客户名称
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getClientName()));
fieldIndex = fieldIndex + 1;
}
if (fieldNameExtend.contains("projNumber")){ if (fieldNameExtend.contains("projNumber")){
// 项目编号 // 项目编号
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getProjNumber())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getProjNumber()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("projName")){
// 项目名称
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getProjName()));
fieldIndex = fieldIndex + 1;
}
if (fieldNameExtend.contains("mediaDeptId")){
// 媒介部门
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getMediaDeptName()));
fieldIndex = fieldIndex + 1;
}
if (fieldNameExtend.contains("contractNumber")){ if (fieldNameExtend.contains("contractNumber")){
// 合同编号 // 合同编号
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getContractNumber())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getContractNumber()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("clientId")){ if (fieldNameExtend.contains("projName")){
// 客户名称 // 项目名称
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getClientName())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getProjName()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (mediaFieldName.contains("cityId")){ if (mediaFieldName.contains("cityId")){
@ -2217,6 +2212,21 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getCityName())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getCityName()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (mediaFieldName.contains("upTime")){
// 上刊时间
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getUpTime()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("downTime")){
// 下刊时间
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getDownTime()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("period")){
// 周期
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getPeriod()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("mediaId")){ if (mediaFieldName.contains("mediaId")){
// 媒体类型 // 媒体类型
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getMediaName())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getMediaName()));
@ -2237,21 +2247,6 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getReleaseFrequency())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getReleaseFrequency()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (mediaFieldName.contains("upTime")){
// 上刊时间
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getUpTime()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("downTime")){
// 下刊时间
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getDownTime()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("period")){
// 周期
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getPeriod()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("printPrice")){ if (mediaFieldName.contains("printPrice")){
// 刊例价 // 刊例价
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getPrintPrice())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getPrintPrice()));
@ -2272,6 +2267,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getProductFee())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getProductFee()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("contractMoney")){
// 合同金额
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getContractMoney()));
fieldIndex = fieldIndex + 1;
}
if (fieldNameExtend.contains("firstName")){ if (fieldNameExtend.contains("firstName")){
// 甲方名称 // 甲方名称
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getFirstName())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getFirstName()));
@ -2282,9 +2282,10 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getSecondName())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getSecondName()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("contractMoney")){
// 合同金额 if (fieldNameExtend.contains("mediaDeptId")){
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getContractMoney())); // 媒介部门
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getMediaDeptName()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("invoiceId")){ if (fieldNameExtend.contains("invoiceId")){
@ -2346,34 +2347,28 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
fieldIndex,fieldIndex,FieldCompare.getStringAll(i + 1),false); fieldIndex,fieldIndex,FieldCompare.getStringAll(i + 1),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("clientId")){
// 客户名称
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getClientName()),false);
fieldIndex = fieldIndex + 1;
}
if (fieldNameExtend.contains("projNumber")){ if (fieldNameExtend.contains("projNumber")){
// 项目编号 // 项目编号
writer.merge(i + indexStart ,i + indexStart + mergeint - 1, writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getProjNumber()),false); fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getProjNumber()),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("projName")){
// 项目名称
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getProjName()),false);
fieldIndex = fieldIndex + 1;
}
if (fieldNameExtend.contains("mediaDeptId")){
// 媒介部门
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getMediaDeptName()),false);
fieldIndex = fieldIndex + 1;
}
if (fieldNameExtend.contains("contractNumber")){ if (fieldNameExtend.contains("contractNumber")){
// 合同编号 // 合同编号
writer.merge(i + indexStart ,i + indexStart + mergeint - 1, writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getContractNumber()),false); fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getContractNumber()),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("clientId")){ if (fieldNameExtend.contains("projName")){
// 客户名称 // 项目名称
writer.merge(i + indexStart ,i + indexStart + mergeint - 1, writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getClientName()),false); fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getProjName()),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
//一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee //一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee
@ -2384,6 +2379,21 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getCityName())); writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getCityName()));
inner = inner + 1; inner = inner + 1;
} }
if (mediaFieldName.contains("upTime")){
// 上刊时间
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getUpTime()));
inner = inner + 1;
}
if (mediaFieldName.contains("downTime")){
// 下刊时间
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getDownTime()));
inner = inner + 1;
}
if (mediaFieldName.contains("period")){
// 周期
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getPeriod()));
inner = inner + 1;
}
if (mediaFieldName.contains("mediaId")){ if (mediaFieldName.contains("mediaId")){
// 媒体类型 // 媒体类型
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getMediaName())); writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getMediaName()));
@ -2404,21 +2414,8 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getReleaseFrequency())); writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getReleaseFrequency()));
inner = inner + 1; inner = inner + 1;
} }
if (mediaFieldName.contains("upTime")){
// 上刊时间
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getUpTime()));
inner = inner + 1;
}
if (mediaFieldName.contains("downTime")){
// 下刊时间
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getDownTime()));
inner = inner + 1;
}
if (mediaFieldName.contains("period")){
// 周期
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getPeriod()));
inner = inner + 1;
}
if (mediaFieldName.contains("printPrice")){ if (mediaFieldName.contains("printPrice")){
// 刊例价 // 刊例价
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getPrintPrice())); writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getPrintPrice()));
@ -2444,7 +2441,12 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
fieldIndex = fieldIndex + inner; fieldIndex = fieldIndex + inner;
} }
} }
if (fieldNameExtend.contains("contractMoney")){
// 合同金额
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getContractMoney()),false);
fieldIndex = fieldIndex + 1;
}
if (fieldNameExtend.contains("firstName")){ if (fieldNameExtend.contains("firstName")){
// 甲方名称 // 甲方名称
writer.merge(i + indexStart ,i + indexStart + mergeint - 1, writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
@ -2457,12 +2459,15 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getSecondName()),false); fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getSecondName()),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("contractMoney")){ if (fieldNameExtend.contains("mediaDeptId")){
// 合同金额 // 媒介部门
writer.merge(i + indexStart ,i + indexStart + mergeint - 1, writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getContractMoney()),false); fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getMediaDeptName()),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldNameExtend.contains("invoiceId")){ if (fieldNameExtend.contains("invoiceId")){
// 发票类型 // 发票类型
writer.merge(i + indexStart ,i + indexStart + mergeint - 1, writer.merge(i + indexStart ,i + indexStart + mergeint - 1,
@ -2542,30 +2547,38 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
private List<String> orderFieldName(String fieldNameExtend, String mediaFieldName, String o) { private List<String> orderFieldName(String fieldNameExtend, String mediaFieldName, String o) {
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
result.add("序号"); result.add("序号");
if (fieldNameExtend.contains("clientId")){
// 客户名称
result.add("客户名称");
}
if (fieldNameExtend.contains("projNumber")){ if (fieldNameExtend.contains("projNumber")){
// 项目编号 // 项目编号
result.add("项目编号"); result.add("优客项目编号");
}
if (fieldNameExtend.contains("projName")){
// 项目名称
result.add("项目名称");
}
if (fieldNameExtend.contains("mediaDeptId")){
// 媒介部门
result.add("媒介部门");
} }
if (fieldNameExtend.contains("contractNumber")){ if (fieldNameExtend.contains("contractNumber")){
// 合同编号 // 合同编号
result.add("合同编号"); result.add("合同编号");
} }
if (fieldNameExtend.contains("clientId")){ if (fieldNameExtend.contains("projName")){
// 客户名称 // 项目名称
result.add("客户名称"); result.add("项目名称");
} }
if (mediaFieldName.contains("cityId")){ if (mediaFieldName.contains("cityId")){
// 城市 // 城市
result.add("城市"); result.add("城市");
} }
if (mediaFieldName.contains("upTime")){
// 上刊时间
result.add("发布开始时间");
}
if (mediaFieldName.contains("downTime")){
// 下刊时间
result.add("发布结束时间");
}
if (mediaFieldName.contains("period")){
// 周期
result.add("周期");
}
if (mediaFieldName.contains("mediaId")){ if (mediaFieldName.contains("mediaId")){
// 媒体类型 // 媒体类型
result.add("媒体类型"); result.add("媒体类型");
@ -2580,19 +2593,7 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
} }
if (mediaFieldName.contains("releaseFrequency")){ if (mediaFieldName.contains("releaseFrequency")){
// 发布频次 // 发布频次
result.add("发布频次"); result.add("频次");
}
if (mediaFieldName.contains("upTime")){
// 上刊时间
result.add("上刊时间");
}
if (mediaFieldName.contains("downTime")){
// 下刊时间
result.add("下刊时间");
}
if (mediaFieldName.contains("period")){
// 周期
result.add("周期");
} }
if (mediaFieldName.contains("printPrice")){ if (mediaFieldName.contains("printPrice")){
// 刊例价 // 刊例价
@ -2604,12 +2605,16 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
} }
if (mediaFieldName.contains("mediaFee")){ if (mediaFieldName.contains("mediaFee")){
// 媒体费 // 媒体费
result.add("媒体费"); result.add("净价");
} }
if (mediaFieldName.contains("productFee")){ if (mediaFieldName.contains("productFee")){
// 制作费 // 制作费
result.add("制作费"); result.add("制作费");
} }
if (fieldNameExtend.contains("contractMoney")){
// 合同金额
result.add("合同金额");
}
if (fieldNameExtend.contains("firstName")){ if (fieldNameExtend.contains("firstName")){
// 甲方名称 // 甲方名称
result.add("甲方名称"); result.add("甲方名称");
@ -2618,9 +2623,9 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
// 乙方名称 // 乙方名称
result.add("乙方名称"); result.add("乙方名称");
} }
if (fieldNameExtend.contains("contractMoney")){ if (fieldNameExtend.contains("mediaDeptId")){
// 合同金额 // 媒介部门
result.add("合同金额"); result.add("媒介部门");
} }
if (fieldNameExtend.contains("invoiceId")){ if (fieldNameExtend.contains("invoiceId")){
// 发票类型 // 发票类型