FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作组导入导出

Browse Source
This commit is contained in:
庄新伟
2022-03-14 09:29:55 +08:00
parent 334dfb40f4
commit bae566fd1f
45 changed files with 1012 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java
+8 -18
View File
@@ -10,6 +10,7 @@ import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel;
import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService;
import com.adc.da.util.exception.AdcDaBaseException;
@@ -110,27 +111,16 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
@ApiOperation(value = "|SarFileSplitItemsEO|导入")
@PostMapping(value = "/importAssocCosts")
public ResponseMessage<List<WgdAssocCost>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
List<WgdAssocCost> res= ExcelImportUtilByWk.readExcelpublic(WgdAssocCost.class,file);
public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
QueryWrapper<WgdAssocCost> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdAssocCost.class, info -> !info.getColumn().equals("id"));
List<WgdAssocCost> wgdAssocInfos=iWgdAssocCostService.list(queryWrapper);
List<WgdAssocCost> remove=new ArrayList<>();
res.forEach(wgdAssocInfo -> {
if (wgdAssocInfos.contains(wgdAssocInfo)){
remove.add(wgdAssocInfo);
}
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (iWgdAssocCostService.saveOrUpdateBatch(res)) {
return Result.success();
StringBuilder stringBuilder=new StringBuilder();
List<WgdAssocCost> res=iWgdAssocCostService.importAssocCosts(file,stringBuilder);
if (stringBuilder.toString().length()>0){
return Result.error("-1","",stringBuilder.toString());
}else {
return Result.error();
return Result.success(res);
}
}
@ApiOperation("查询详情")
@GetMapping("getAssocCostById")
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java
+8 -19
View File
@@ -7,6 +7,7 @@ import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel;
import com.adc.da.slrs.processModel.entity.importExcelDTO;
import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService;
@@ -88,27 +89,15 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
@ApiOperation(value = "|SarFileSplitItemsEO|导入")
@PostMapping(value = "/importAllAssocInfos")
public ResponseMessage<List<WgdAssocInfo>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
List<WgdAssocInfo> res= ExcelImportUtilByWk.readExcelpublic(WgdAssocInfo.class,file);
QueryWrapper<WgdAssocInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdAssocInfo.class, info -> !info.getColumn().equals("id"));
List<WgdAssocInfo> wgdAssocInfos=iWgdAssocInfoService.list(queryWrapper);
List<WgdAssocInfo> remove=new ArrayList<>();
res.forEach(wgdAssocInfo -> {
if (wgdAssocInfos.contains(wgdAssocInfo)){
remove.add(wgdAssocInfo);
}
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (res.size()>0 && iWgdAssocInfoService.saveOrUpdateBatch(res)) {
return Result.success();
public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
StringBuilder stringBuilder=new StringBuilder();
List<WgdAssocInfo> res=iWgdAssocInfoService.delWithWkData(file,stringBuilder);
if (stringBuilder.toString().length()>0){
return Result.error("-1","",stringBuilder.toString());
}else {
return Result.error();
return Result.success(res);
}
}
@ApiOperation("查询")
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
+8 -19
View File
@@ -9,6 +9,7 @@ import com.adc.da.http.Result;
import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel;
import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService;
@@ -98,27 +99,15 @@ public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
@ApiOperation(value = "|SarFileSplitItemsEO|导入")
@PostMapping(value = "/importAllCommiInfos")
public ResponseMessage<List<WgdCommiInfo>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
List<WgdCommiInfo> res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file);
QueryWrapper<WgdCommiInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdCommiInfo.class, info -> !info.getColumn().equals("id"));
List<WgdCommiInfo> wgdAssocInfos=iWgdCommiInfoService.list(queryWrapper);
List<WgdCommiInfo> remove=new ArrayList<>();
res.forEach(wgdAssocInfo -> {
if (wgdAssocInfos.contains(wgdAssocInfo)){
remove.add(wgdAssocInfo);
}
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (iWgdCommiInfoService.saveOrUpdateBatch(res)) {
return Result.success();
public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
StringBuilder stringBuilder=new StringBuilder();
List<WgdCommiInfo> res=iWgdCommiInfoService.importCommiInfo(file,stringBuilder);
if (stringBuilder.toString().length()>0){
return Result.error("-1","",stringBuilder.toString());
}else {
return Result.error();
return Result.success(res);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java
+7 -19
View File
@@ -9,6 +9,7 @@ import com.adc.da.http.Result;
import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel;
import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService;
@@ -98,26 +99,13 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
@ApiOperation(value = "|SarFileSplitItemsEO|导入")
@PostMapping(value = "/importExReviseCost")
public ResponseMessage<List<WgdExReviseCost>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
List<WgdExReviseCost> res= ExcelImportUtilByWk.readExcelpublic(WgdExReviseCost.class,file);
QueryWrapper<WgdExReviseCost> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdExReviseCost.class, info -> !info.getColumn().equals("id"));
List<WgdExReviseCost> wgdAssocInfos=iWgdExReviseCostService.list(queryWrapper);
List<WgdExReviseCost> remove=new ArrayList<>();
res.forEach(wgdAssocInfo -> {
if (wgdAssocInfos.contains(wgdAssocInfo)){
remove.add(wgdAssocInfo);
}
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (iWgdExReviseCostService.saveOrUpdateBatch(res)) {
return Result.success();
public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
StringBuilder stringBuilder=new StringBuilder();
List<WgdExReviseCost> res=iWgdExReviseCostService.importExReviseCost(file,stringBuilder);
if (stringBuilder.toString().length()>0){
return Result.error("-1","",stringBuilder.toString());
}else {
return Result.error();
return Result.success(res);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java
+11 -21
View File
@@ -10,6 +10,7 @@ import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel;
import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService;
import com.adc.da.util.exception.AdcDaBaseException;
@@ -80,7 +81,7 @@ public class WgdMeetCostController extends BaseController<WgdMeetCost> {
}
@ApiOperation("导出参会费用信息统计")
@GetMapping("/exportAllAssocCosts")
@GetMapping("/exportAllMeetCosts")
public void exportAllAssocInfos(String idList, String exportName, HttpServletResponse response, HttpServletRequest request){//查询所有
OutputStream os = null;
Workbook workbook = null;
@@ -115,28 +116,17 @@ public class WgdMeetCostController extends BaseController<WgdMeetCost> {
}
@ApiOperation(value = "|SarFileSplitItemsEO|导入")
@PostMapping(value = "/importAssocCosts")
public ResponseMessage<List<WgdMeetCost>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
List<WgdMeetCost> res= ExcelImportUtilByWk.readExcelpublic(WgdMeetCost.class,file);
QueryWrapper<WgdMeetCost> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdMeetCost.class, info -> !info.getColumn().equals("id"));
List<WgdMeetCost> wgdAssocInfos=iWgdMeetCostService.list(queryWrapper);
List<WgdMeetCost> remove=new ArrayList<>();
res.forEach(wgdAssocInfo -> {
if (wgdAssocInfos.contains(wgdAssocInfo)){
remove.add(wgdAssocInfo);
}
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (iWgdMeetCostService.saveOrUpdateBatch(res)) {
return Result.success();
@PostMapping(value = "/importMeetCost")
public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
StringBuilder stringBuilder=new StringBuilder();
List<WgdMeetCost> res=iWgdMeetCostService.importMeetCost(file,stringBuilder);
if (stringBuilder.toString().length()>0){
return Result.error("-1","",stringBuilder.toString());
}else {
return Result.error();
return Result.success(res);
}
}
@GetMapping("getMeetCostById")
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java
+3 -3
View File
@@ -63,14 +63,14 @@ public class WgdAssocInfo extends BasePage {
@ApiModelProperty(value = "初始入会时间")
@Excel(name = "初始入会时间", orderNum = "8",width = 20.0 , exportFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date iniTime;
@ApiModelProperty(value = "本届入会时间")
@Excel(name = "本届入会时间", orderNum = "9",width = 20.0 , exportFormat = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date curTime;
@ApiModelProperty(value = "费用标准")
@@ -83,7 +83,7 @@ public class WgdAssocInfo extends BasePage {
@ApiModelProperty(value = "上次缴纳时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@Excel(name = "上次缴纳时间", orderNum = "12",width = 20.0 , exportFormat = "yyyy-MM-dd HH:mm:ss")
private Date lastPayTime;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java
+3 -1
View File
@@ -4,6 +4,7 @@ import java.util.Date;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.adc.da.base.page.BasePage;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -37,7 +38,8 @@ public class WgdMeetCost extends BasePage {
private String meetName;
@ApiModelProperty(value = "会议时间")
@Excel(name = "会议时间", orderNum = "2",width = 20.0)
@Excel(name = "会议时间", orderNum = "2",width = 20.0, exportFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date meetTime;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java
+2
View File
@@ -5,6 +5,7 @@ import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -26,4 +27,5 @@ public interface IWgdAssocCostService extends IService<WgdAssocCost> {
int insertWgdAssocCost(WgdAssocCost wgdAssocCost);//插入
int deleteWgdAssocCost(String id);//删除
int deleteWgdAssocCosts(String ids);//批量删除
List<WgdAssocCost> importAssocCosts(MultipartFile file , StringBuilder stringBuilder);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java
+4
View File
@@ -1,7 +1,9 @@
package com.adc.da.slrs.wgdCensusZ.service;
import com.adc.da.slrs.processModel.entity.importExcelDTO;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -22,4 +24,6 @@ public interface IWgdAssocInfoService extends IService<WgdAssocInfo> {
int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//插入
int deleteWgdAssocInfo(String id);//删除
int deleteWgdAssocInfos(String ids);//批量删除
List<WgdAssocInfo> delWithWkData(MultipartFile file , StringBuilder stringBuilder);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java
+3
View File
@@ -1,8 +1,10 @@
package com.adc.da.slrs.wgdCensusZ.service;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -23,4 +25,5 @@ public interface IWgdCommiInfoService extends IService<WgdCommiInfo> {
int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo);//插入
int deleteWgdCommiInfo(String id);//删除
int deleteWgdCommiInfos(String ids);//批量删除
List<WgdCommiInfo> importCommiInfo(MultipartFile file , StringBuilder stringBuilder);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java
+2
View File
@@ -3,6 +3,7 @@ package com.adc.da.slrs.wgdCensusZ.service;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -23,4 +24,5 @@ public interface IWgdExReviseCostService extends IService<WgdExReviseCost> {
int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost);//插入
int deleteWgdExReviseCost(String id);//删除
int deleteWgdExReviseCosts(String ids);//批量删除
List<WgdExReviseCost> importExReviseCost(MultipartFile file , StringBuilder stringBuilder);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java
+4
View File
@@ -1,8 +1,10 @@
package com.adc.da.slrs.wgdCensusZ.service;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -23,4 +25,6 @@ public interface IWgdMeetCostService extends IService<WgdMeetCost> {
int insertWgdMeetCost(WgdMeetCost wgdMeetCost);//插入
int deleteWgdMeetCost(String id);//删除
int deleteWgdMeetCosts(String ids);//批量删除
List<WgdMeetCost> importMeetCost(MultipartFile file , StringBuilder stringBuilder);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java
+69
View File
@@ -1,17 +1,26 @@
package com.adc.da.slrs.wgdCensusZ.service.impl;
import com.adc.da.http.Result;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
/**
* <p>
@@ -27,6 +36,9 @@ public class WgdAssocCostServiceImpl extends ServiceImpl<WgdAssocCostDao, WgdAss
@Autowired
WgdAssocCostDao wgdAssocCostDao;
@Autowired
IWgdAssocCostService iWgdAssocCostService;
@Override
public List<WgdAssocCost> selectAllAssocCosts() {
return wgdAssocCostDao.selectAllAssocCosts();
@@ -74,4 +86,61 @@ public class WgdAssocCostServiceImpl extends ServiceImpl<WgdAssocCostDao, WgdAss
String[] str = ids.split(",");
return wgdAssocCostDao.deleteBatch(str);
}
@Override
public List<WgdAssocCost> importAssocCosts(MultipartFile file, StringBuilder stringBuilder) {
List<WgdAssocCost> res= ExcelImportUtilByWk.readExcelpublic(WgdAssocCost.class,file);
DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
int i=1;
for (WgdAssocCost wgdAssocCost: res) {
if (null == wgdAssocCost.getScName() || "".equals(wgdAssocCost.getScName())){
stringBuilder.append("第" + i + "行第1列协会名称-标委会填写不符合格式要求请检查；");
}
if (null == wgdAssocCost.getWgName() || "".equals(wgdAssocCost.getWgName())){
stringBuilder.append("第" + i + "行第3列协会名称-工作组填写不符合格式要求请检查；");
}
if (null == wgdAssocCost.getCostOutlay() || "".equals(wgdAssocCost.getCostOutlay())){
stringBuilder.append("第" + i + "行第6列费用列支填写不符合格式要求请检查；");
}
if (null == wgdAssocCost.getAnnualPayment() || "".equals(wgdAssocCost.getAnnualPayment())){
stringBuilder.append("第" + i + "行第7列每年缴费情况填写不符合格式要求请检查；");
}
i++;
}
QueryWrapper<WgdAssocCost> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdAssocCost.class, info -> !info.getColumn().equals("id"));
List<WgdAssocCost> wgdAssocCost=iWgdAssocCostService.list(queryWrapper);
List<WgdAssocCost> remove=new ArrayList<>();
wgdAssocCost.forEach(WgbWbtj -> {
WgbWbtj.setId(null);
if (res.contains(WgbWbtj)){
remove.add(WgbWbtj);
}
res.forEach(resAssoc->{
if (null == resAssoc.getScName() || "".equals(resAssoc.getScName())){
remove.add(resAssoc);
}
if (null == resAssoc.getWgName() || "".equals(resAssoc.getWgName())){
remove.add(resAssoc);
}
if (null == resAssoc.getCostOutlay() || "".equals(resAssoc.getCostOutlay())){
remove.add(resAssoc);
}
if (null == resAssoc.getAnnualPayment() || "".equals(resAssoc.getAnnualPayment())){
remove.add(resAssoc);
}
});
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (res.size()>0 && iWgdAssocCostService.saveOrUpdateBatch(res)) {
return res;
}else {
stringBuilder.append("表格数据全部重复");
}
return res;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java
+97
View File
@@ -1,14 +1,25 @@
package com.adc.da.slrs.wgdCensusZ.service.impl;
import com.adc.da.http.Result;
import com.adc.da.slrs.processModel.entity.importExcelDTO;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocInfoDao;
import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* <p>
@@ -23,6 +34,8 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAss
@Autowired
WgdAssocInfoDao wgdAssocInfoDao;
@Autowired
IWgdAssocInfoService iWgdAssocInfoService;
@Override
public List<WgdAssocInfo> getAllWgdAssocInfos() {
@@ -62,4 +75,88 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAss
String[] str = ids.split(",");
return wgdAssocInfoDao.deleteBatch(str);
}
@Override
public List<WgdAssocInfo> delWithWkData(MultipartFile file, StringBuilder stringBuilder) {
List<WgdAssocInfo> res= ExcelImportUtilByWk.readExcelpublic(WgdAssocInfo.class,file);
DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
int i=1;
for (WgdAssocInfo importExcelDTO: res) {
if (null == importExcelDTO.getScName() || "".equals(importExcelDTO.getScName())){
stringBuilder.append("第" + i + "行第1列协会名称-标委会填写不符合格式要求请检查；");
}
if (null == importExcelDTO.getSscName() || "".equals(importExcelDTO.getSscName())){
stringBuilder.append("第" + i + "行第2列协会名称-分标委填写不符合格式要求请检查；");
}
if (null == importExcelDTO.getWgName() || "".equals(importExcelDTO.getWgName())){
stringBuilder.append("第" + i + "行第3列协会名称-工作组填写不符合格式要求请检查；");
}
if (null == importExcelDTO.getRole() || "".equals(importExcelDTO.getRole())){
stringBuilder.append("第" + i + "行第4列会员角色填写不符合格式要求请检查；");
}
if (null == importExcelDTO.getAttend() || "".equals(importExcelDTO.getAttend())){
stringBuilder.append("第" + i + "行第5列参与人填写不符合格式要求请检查；");
}
try {
if (null!=importExcelDTO.getIniTime() && !"".equals(importExcelDTO.getIniTime())) {
importExcelDTO.setIniTime(importExcelDTO.getIniTime());
}
}catch (Exception e){
stringBuilder.append("第"+i+"行第9列初始入会时间填写不符合格式要求请检查；");
}
try {
if (null!=importExcelDTO.getCurTime() && !"".equals(importExcelDTO.getCurTime())) {
importExcelDTO.setCurTime(importExcelDTO.getCurTime());
}
}catch (Exception e){
stringBuilder.append("第"+i+"行第10列本届入会时间填写不符合格式要求请检查；");
}
try {
if (null!=importExcelDTO.getLastPayTime() && !"".equals(importExcelDTO.getLastPayTime())) {
importExcelDTO.setLastPayTime(importExcelDTO.getLastPayTime());
}
}catch (Exception e){
stringBuilder.append("第"+i+"行第13列上次缴纳时间填写不符合格式要求请检查；");
}
i++;
}
QueryWrapper<WgdAssocInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdAssocInfo.class, info -> !info.getColumn().equals("id"));
List<WgdAssocInfo> wgdAssocInfos=iWgdAssocInfoService.list(queryWrapper);
List<WgdAssocInfo> remove=new ArrayList<>();
wgdAssocInfos.forEach(WgbWbtj -> {
WgbWbtj.setId(null);
if (res.contains(WgbWbtj)){
remove.add(WgbWbtj);
}
res.forEach(resOne->{
if (null == resOne.getScName() || "".equals(resOne.getScName())){
remove.add(resOne);
}
if (null == resOne.getSscName() || "".equals(resOne.getSscName())){
remove.add(resOne);
}
if (null == resOne.getWgName() || "".equals(resOne.getWgName())){
remove.add(resOne);
}
if (null == resOne.getRole() || "".equals(resOne.getRole())){
remove.add(resOne);
}
if (null == resOne.getAttend() || "".equals(resOne.getAttend())){
remove.add(resOne);
}
});
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (res.size()>0 && iWgdAssocInfoService.saveOrUpdateBatch(res)) {
return res;
}else {
stringBuilder.append("表格数据全部重复");
}
return res;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java
+87
View File
@@ -1,15 +1,24 @@
package com.adc.da.slrs.wgdCensusZ.service.impl;
import com.adc.da.http.Result;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.dao.WgdCommiInfoDao;
import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService;
import com.adc.da.util.MD5Util;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
* <p>
@@ -25,6 +34,9 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
@Autowired
WgdCommiInfoDao wgdCommiInfoDao;
@Autowired
IWgdCommiInfoService iWgdCommiInfoService;
@Override
public List<WgdCommiInfo> getAllWgdCommiInfos() {
return wgdCommiInfoDao.selectAll();
@@ -65,4 +77,79 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
String[] str = ids.split(",");
return wgdCommiInfoDao.deleteBatch(str);
}
@Override
public List<WgdCommiInfo> importCommiInfo(MultipartFile file, StringBuilder stringBuilder) {
List<WgdCommiInfo> res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file);
DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
int i=1;
for (WgdCommiInfo wgdCommiInfo: res) {
if (null == wgdCommiInfo.getScName() || "".equals(wgdCommiInfo.getScName())){
stringBuilder.append("第" + i + "行第2列协会名称-标委会填写不符合格式要求请检查；");
}
if (null == wgdCommiInfo.getSscName() || "".equals(wgdCommiInfo.getSscName())){
stringBuilder.append("第" + i + "行第3列协会名称-分标委填写不符合格式要求请检查；");
}
if (null == wgdCommiInfo.getWgName() || "".equals(wgdCommiInfo.getWgName())){
stringBuilder.append("第" + i + "行第4列协会名称-工作组填写不符合格式要求请检查；");
}
if (null == wgdCommiInfo.getRole() || "".equals(wgdCommiInfo.getRole())){
stringBuilder.append("第" + i + "行第6列会员角色填写不符合格式要求请检查；");
}
if (null == wgdCommiInfo.getAttend() || "".equals(wgdCommiInfo.getAttend())){
stringBuilder.append("第" + i + "行第7列参与人填写不符合格式要求请检查；");
}
if (null == wgdCommiInfo.getTel() || "".equals(wgdCommiInfo.getTel())){
stringBuilder.append("第" + i + "行第10列参与人填写不符合格式要求请检查；");
}
try {
if (null!=wgdCommiInfo.getCurTime() && !"".equals(wgdCommiInfo.getCurTime())) {
wgdCommiInfo.setCurTime(wgdCommiInfo.getCurTime());
}
}catch (Exception e){
stringBuilder.append("第"+i+"行第5列本届入会时间填写不符合格式要求请检查；");
}
i++;
}
QueryWrapper<WgdCommiInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdCommiInfo.class, info -> !info.getColumn().equals("id"));
List<WgdCommiInfo> wgdCommiInfo=iWgdCommiInfoService.list(queryWrapper);
List<WgdCommiInfo> remove=new ArrayList<>();
wgdCommiInfo.forEach(WgbWbtj -> {
WgbWbtj.setId(null);
if (res.contains(WgbWbtj)){
remove.add(WgbWbtj);
}
res.forEach(resCommiInfo->{
if (null == resCommiInfo.getScName() || "".equals(resCommiInfo.getScName())){
remove.add(resCommiInfo);
}
if (null == resCommiInfo.getSscName() || "".equals(resCommiInfo.getSscName())){
remove.add(resCommiInfo);
}
if (null == resCommiInfo.getWgName() || "".equals(resCommiInfo.getWgName())){
remove.add(resCommiInfo);
}
if (null == resCommiInfo.getRole() || "".equals(resCommiInfo.getRole())){
remove.add(resCommiInfo);
}
if (null == resCommiInfo.getAttend() || "".equals(resCommiInfo.getAttend())){
remove.add(resCommiInfo);
}
if (null == resCommiInfo.getTel() || "".equals(resCommiInfo.getTel())){
remove.add(resCommiInfo);
}
});
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (res.size()>0 && iWgdCommiInfoService.saveOrUpdateBatch(res)) {
return res;
}else {
stringBuilder.append("表格数据全部重复");
}
return res;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java
+35
View File
@@ -1,15 +1,21 @@
package com.adc.da.slrs.wgdCensusZ.service.impl;
import com.adc.da.http.Result;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
import com.adc.da.slrs.wgdCensusZ.dao.WgdExReviseCostDao;
import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
* <p>
@@ -25,6 +31,8 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao,
@Autowired
WgdExReviseCostDao wgdExReviseCostDao;
@Autowired
IWgdExReviseCostService iWgdExReviseCostService;
@Override
public List<WgdExReviseCost> getAllWgdExReviseCosts() {
@@ -64,4 +72,31 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao,
String[] str = ids.split(",");
return wgdExReviseCostDao.deleteBatch(str);
}
@Override
public List<WgdExReviseCost> importExReviseCost(MultipartFile file, StringBuilder stringBuilder) {
List<WgdExReviseCost> res= ExcelImportUtilByWk.readExcelpublic(WgdExReviseCost.class,file);
QueryWrapper<WgdExReviseCost> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdExReviseCost.class, info -> !info.getColumn().equals("id"));
List<WgdExReviseCost> wgdExReviseCost=iWgdExReviseCostService.list(queryWrapper);
List<WgdExReviseCost> remove=new ArrayList<>();
wgdExReviseCost.forEach(WgbWbtj -> {
WgbWbtj.setId(null);
if (res.contains(WgbWbtj)){
remove.add(WgbWbtj);
}
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (res.size()>0 && iWgdExReviseCostService.saveOrUpdateBatch(res)) {
return res;
}else {
stringBuilder.append("表格数据全部重复");
}
return res;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java
+49
View File
@@ -1,15 +1,23 @@
package com.adc.da.slrs.wgdCensusZ.service.impl;
import com.adc.da.http.Result;
import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
import com.adc.da.slrs.wgdCensusZ.dao.WgdMeetCostDao;
import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
* <p>
@@ -25,6 +33,9 @@ public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetC
@Autowired
WgdMeetCostDao wgdMeetCostDao;
@Autowired
IWgdMeetCostService iWgdMeetCostService;
@Override
public List<WgdMeetCost> getAllWgdMeetCosts() {
return wgdMeetCostDao.selectAll();
@@ -63,4 +74,42 @@ public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetC
String[] str = ids.split(",");
return wgdMeetCostDao.deleteBatch(str);
}
@Override
public List<WgdMeetCost> importMeetCost(MultipartFile file, StringBuilder stringBuilder) {
List<WgdMeetCost> res= ExcelImportUtilByWk.readExcelpublic(WgdMeetCost.class,file);
DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
int i=1;
for (WgdMeetCost wgdCommiInfo: res) {
try {
if (null!=wgdCommiInfo.getMeetTime() && !"".equals(wgdCommiInfo.getMeetTime())) {
wgdCommiInfo.setMeetTime(wgdCommiInfo.getMeetTime());
}
}catch (Exception e){
stringBuilder.append("第"+i+"行第3列本届会议时间填写不符合格式要求请检查；");
}
i++;
}
QueryWrapper<WgdMeetCost> queryWrapper = new QueryWrapper<>();
queryWrapper.select(WgdMeetCost.class, info -> !info.getColumn().equals("id"));
List<WgdMeetCost> wgdMeetCost=iWgdMeetCostService.list(queryWrapper);
List<WgdMeetCost> remove=new ArrayList<>();
wgdMeetCost.forEach(WgbWbtj -> {
WgbWbtj.setId(null);
if (res.contains(WgbWbtj)){
remove.add(WgbWbtj);
}
});
res.removeAll(remove);
res.forEach(wgdAssocInfo -> {
wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
});
if (res.size()>0 && iWgdMeetCostService.saveOrUpdateBatch(res)) {
return res;
}else {
stringBuilder.append("表格数据全部重复");
}
return res;
}
}