工作组导入导出

adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java

@@ -94,7 +94,8 @@ public class ExcelImportUtilByWk {
                             cell = row.getCell(a);
                             if (null!=mapExcel.get(a).exportFormat() && !"".equals(mapExcel.get(a).exportFormat())) {
                                 String value = convertCellValueToString(cell);
-                                Date date= DateUtils.stringToDate(value,mapExcel.get(a).exportFormat());
+                                Date date= DateUtils.stringToDate(TrainFormDate.dealWithTimeZoneyyyy(value,mapExcel.get(a).exportFormat()),mapExcel.get(a).exportFormat());
+//                                Date date= DateUtils.stringToDate(value,mapExcel.get(a).exportFormat());
                                 map.get(a).set(o, date);
                             }else {
                                 String value = convertCellValueToString(cell);

adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/TrainFormDate.java

@@ -71,41 +71,48 @@ public class TrainFormDate {
         time = time.replace("年", "-");
         time = time.replace("月", "-");
         time = time.replace("日", "");
-        time = time.replace(" ", "");
+        try{
-        String times="";
-        String[] da=time.split("-");
-        for (String s:da) {
-            if (s.trim().length()==1){
-                s="0"+s;
-            }
-            times+=s+"-";
-        }
-        times=times.trim().substring(0,times.length()-1);
-        Pattern p = Pattern.compile("^(?:(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))(\\/|-|\\.)(?:0?2\\1(?:29))$)|(?:(?:1[6-9]|[2-9]\\d)?\\d{2})(\\/|-|\\.)(?:(?:(?:0?[13578]|1[02])\\2(?:31))|(?:(?:0?[1,3-9]|1[0-2])\\2(29|30))|(?:(?:0?[1-9])|(?:1[0-2]))\\2(?:0?[1-9]|1\\d|2[0-8]))$");
-        if (p.matcher(times).matches()) {
-            return times;
-        } else {
-            DateFormat formate2 = new SimpleDateFormat("EEEMMMddHH:mm:sszzzyyyy", Locale.ENGLISH);
             Date date = null;
-            try {
+            date = formate1.parse(time);
-                date = formate2.parse(time);
+            String success=formate1.format(date);
-                String dateString = formate1.format(date);
-                return dateString;
-            } catch (ParseException e1) {
-                try {
-                    int days = Integer.parseInt(time);
-                    Calendar c = Calendar.getInstance();
-                    c.set(1900, 0, 1);
-                    c.add(Calendar.DATE, days - 2);
-                    Date realdate = c.getTime();
-                    String realday = formate1.format(realdate);
-                    return realday;
-                }
-                catch (Exception e2){
-                    return null;
-                }
-            }
 
+            return success;
+        }catch (Exception e) {
+            time = time.replace(" ", "");
+            String times = "";
+            String[] da = time.split("-");
+            for (String s : da) {
+                if (s.trim().length() == 1) {
+                    s = "0" + s;
+                }
+                times += s + "-";
+            }
+            times = times.trim().substring(0, times.length() - 1);
+            Pattern p = Pattern.compile("^(?:(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))(\\/|-|\\.)(?:0?2\\1(?:29))$)|(?:(?:1[6-9]|[2-9]\\d)?\\d{2})(\\/|-|\\.)(?:(?:(?:0?[13578]|1[02])\\2(?:31))|(?:(?:0?[1,3-9]|1[0-2])\\2(29|30))|(?:(?:0?[1-9])|(?:1[0-2]))\\2(?:0?[1-9]|1\\d|2[0-8]))$");
+            if (p.matcher(times).matches()) {
+                return times;
+            } else {
+                DateFormat formate2 = new SimpleDateFormat("EEEMMMddHH:mm:sszzzyyyy", Locale.ENGLISH);
+                Date date = null;
+                try {
+                    date = formate2.parse(time);
+                    String dateString = formate1.format(date);
+                    return dateString;
+                } catch (ParseException e1) {
+                    try {
+                        int days = Integer.parseInt(time);
+                        Calendar c = Calendar.getInstance();
+                        c.set(1900, 0, 1);
+                        c.add(Calendar.DATE, days - 2);
+                        Date realdate = c.getTime();
+                        String realday = formate1.format(realdate);
+                        return realday;
+                    } catch (Exception e2) {
+                        return null;
+                    }
+                }
+
+            }
         }
 
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java

@@ -12,6 +12,7 @@ import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.util.exception.AdcDaBaseException;
 import com.adc.da.util.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -85,7 +86,7 @@ public class WgdCgfyController extends BaseController<WgdCgfy> {
             } else {
                 datas = iWgdCgfyService.getAllWgdCgfys();
             }
-            workbook = ExcelExportUtilByWk.exportWithData(exportParams,WgdWbtj.class,datas);
+            workbook = ExcelExportUtilByWk.exportWithData(exportParams,WgdCgfy.class,datas);
             os = response.getOutputStream();
             workbook.write(os);
             os.flush();
@@ -98,27 +99,15 @@ public class WgdCgfyController extends BaseController<WgdCgfy> {
 
     @ApiOperation(value = "|SarFileSplitItemsEO|导入")
     @PostMapping(value = "/importAllCgfys")
-    public ResponseMessage<List<WgdCgfy>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdCgfy> res= ExcelImportUtilByWk.readExcelpublic(WgdCgfy.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-
+        List<WgdCgfy> res=iWgdCgfyService.importCgfy(file,stringBuilder);
-        QueryWrapper<WgdCgfy> queryWrapper = new QueryWrapper<>();
+        if (stringBuilder.toString().length()>0){
-        queryWrapper.select(WgdCgfy.class, info -> !info.getColumn().equals("id"));
+            return Result.error("-1","",stringBuilder.toString());
-        List<WgdCgfy> wgdAssocInfos=iWgdCgfyService.list(queryWrapper);
-        List<WgdCgfy> 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 (iWgdCgfyService.saveOrUpdateBatch(res)) {
-            return Result.success();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
+
     }
 
     @GetMapping("/getCgfyById")

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java

@@ -86,7 +86,7 @@ public class WgdFyfyController extends BaseController<WgdFyfy> {
             } else {
                 datas = iWgdFyfyService.getAllWgdFyfys();
             }
-            workbook = ExcelExportUtilByWk.exportWithData(exportParams, WgdWbtj.class,datas);
+            workbook = ExcelExportUtilByWk.exportWithData(exportParams, WgdFyfy.class,datas);
             os = response.getOutputStream();
             workbook.write(os);
             os.flush();
@@ -99,27 +99,15 @@ public class WgdFyfyController extends BaseController<WgdFyfy> {
 
     @ApiOperation(value = "|SarFileSplitItemsEO|导入")
     @PostMapping(value = "/importAllFyfys")
-    public ResponseMessage<List<WgdFyfy>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdFyfy> res= ExcelImportUtilByWk.readExcelpublic(WgdFyfy.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-
+        List<WgdFyfy> res=iWgdFyfyService.importFyfy(file,stringBuilder);
-        QueryWrapper<WgdFyfy> queryWrapper = new QueryWrapper<>();
+        if (stringBuilder.toString().length()>0){
-        queryWrapper.select(WgdFyfy.class, info -> !info.getColumn().equals("id"));
+            return Result.error("-1","",stringBuilder.toString());
-        List<WgdFyfy> wgdAssocInfos=iWgdFyfyService.list(queryWrapper);
-        List<WgdFyfy> 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 (iWgdFyfyService.saveOrUpdateBatch(res)) {
-            return Result.success();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
+
     }
 
     @GetMapping("/getFyfyById")

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java

@@ -86,7 +86,7 @@ public class WgdSrbController extends BaseController<WgdSrb> {
             } else {
                 datas = iWgdSrbService.getAllWgdSrbs();
             }
-            workbook = ExcelExportUtilByWk.exportWithData(exportParams, WgdWbtj.class,datas);
+            workbook = ExcelExportUtilByWk.exportWithData(exportParams, WgdSrb.class,datas);
             os = response.getOutputStream();
             workbook.write(os);
             os.flush();
@@ -99,27 +99,15 @@ public class WgdSrbController extends BaseController<WgdSrb> {
 
     @ApiOperation(value = "|SarFileSplitItemsEO|导入")
     @PostMapping(value = "/importAllSrbs")
-    public ResponseMessage<List<WgdSrb>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdSrb> res= ExcelImportUtilByWk.readExcelpublic(WgdSrb.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-
+        List<WgdSrb> res=iWgdSrbService.importSrb(file,stringBuilder);
-        QueryWrapper<WgdSrb> queryWrapper = new QueryWrapper<>();
+        if (stringBuilder.toString().length()>0){
-        queryWrapper.select(WgdSrb.class, info -> !info.getColumn().equals("id"));
+            return Result.error("-1","",stringBuilder.toString());
-        List<WgdSrb> wgdAssocInfos=iWgdSrbService.list(queryWrapper);
-        List<WgdSrb> 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 (iWgdSrbService.saveOrUpdateBatch(res)) {
-            return Result.success();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
+
     }
 
     @GetMapping("/getSrbById")

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java

@@ -10,6 +10,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
 import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService;
 import com.adc.da.util.IOUtils;
@@ -96,27 +97,13 @@ public class WgdWbtjController extends BaseController<WgdWbtj> {
 
     @ApiOperation(value = "|SarFileSplitItemsEO|导入")
     @PostMapping(value = "/importAllAllWbtjs")
-    public ResponseMessage<List<WgdWbtj>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdWbtj> res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-        QueryWrapper<WgdWbtj> queryWrapper = new QueryWrapper<>();
+        List<WgdWbtj> res=iWgdWbtjService.importWbtj(file,stringBuilder);
-        queryWrapper.select(WgdWbtj.class,tableFieldInfo -> !tableFieldInfo.getColumn().equals("id"));
+        if (stringBuilder.toString().length()>0){
-        List<WgdWbtj> WgdWbtjs=iWgdWbtjService.list(queryWrapper);
+            return Result.error("-1","",stringBuilder.toString());
-        List<WgdWbtj> remove=new ArrayList<>();
-        WgdWbtjs.forEach(WgbWbtj -> {
-            WgbWbtj.setId(null);
-            if (res.contains(WgbWbtj)){
-                remove.add(WgbWbtj);
-            }
-
-        });
-        res.removeAll(remove);
-        res.forEach(WgbWbtj -> {
-            WgbWbtj.setId(String.valueOf(UUID.randomUUID()));
-        });
-        if (res.size()>0 && iWgdWbtjService.saveOrUpdateBatch(res)) {
-            return Result.success();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java

@@ -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.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService;
@@ -97,27 +98,15 @@ public class WgdWbxdController extends BaseController<WgdWbxd> {
 
     @ApiOperation(value = "|SarFileSplitItemsEO|导入")
     @PostMapping(value = "/importAllWbxds")
-    public ResponseMessage<List<WgdWbxd>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdWbxd> res= ExcelImportUtilByWk.readExcelpublic(WgdWbxd.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-
+        List<WgdWbxd> res=iWgdWbxdService.importWbxd(file,stringBuilder);
-        QueryWrapper<WgdWbxd> queryWrapper = new QueryWrapper<>();
+        if (stringBuilder.toString().length()>0){
-        queryWrapper.select(WgdWbxd.class, info -> !info.getColumn().equals("id"));
+            return Result.error("-1","",stringBuilder.toString());
-        List<WgdWbxd> wgdAssocInfos=iWgdWbxdService.list(queryWrapper);
-        List<WgdWbxd> 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 (iWgdWbxdService.saveOrUpdateBatch(res)) {
-            return Result.success();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
+
     }
 
     @GetMapping("/getWbxdById")

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java

@@ -1,18 +1,38 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+import com.adc.da.excel.poi.excel.entity.ExportParams;
+import com.adc.da.excel.poi.excel.entity.enums.ExcelType;
 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.utils.ExcelExportUtilByWk;
+import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService;
+import com.adc.da.util.exception.AdcDaBaseException;
+import com.adc.da.util.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * <p>
@@ -43,6 +63,55 @@ public class WgdZcbController extends BaseController<WgdZcb> {
         return Result.success(pageInfo);
     }
 
+    @ApiOperation("导出标准制修订补助资金收支统计支出表")
+    @GetMapping("/exportAllZcbs")
+    public void exportAllAssocInfos(String idList, String exportName, HttpServletResponse response, HttpServletRequest request){//查询所有
+        OutputStream os = null;
+        Workbook workbook = null;
+        try {
+            if(StringUtils.isEmpty(exportName) ||exportName.equals("null")){
+                exportName="标准制修订补助资金收支统计支出表";
+            }
+            response.setHeader("Content-Disposition",
+                    "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx", request));
+            response.setContentType("application/force-download");
+            ExportParams exportParams = new ExportParams();
+            exportParams.setType(ExcelType.XSSF);
+            exportParams.setSheetName(exportName);
+            List<WgdZcb> datas=new ArrayList<>();
+            if (null!=idList) {
+                List<String> ids = new ArrayList<>(Arrays.asList(idList.split(",")));
+                QueryWrapper<WgdZcb> wrapper=new QueryWrapper<>();
+                wrapper.in("id",ids);
+                datas = iWgdZcbService.list(wrapper);
+            } else {
+                datas = iWgdZcbService.getAllWgdZcbs();
+            }
+            workbook = ExcelExportUtilByWk.exportWithData(exportParams, WgdZcb.class,datas);
+            os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+        } catch (IOException e) {
+            throw new AdcDaBaseException("下载文件失败，请重试");
+        } finally {
+            IOUtils.closeQuietly(os);
+        }
+    }
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|导入")
+    @PostMapping(value = "/importAllZcbs")
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
+        StringBuilder stringBuilder=new StringBuilder();
+        List<WgdZcb> res=iWgdZcbService.importZcb(file,stringBuilder);
+        if (stringBuilder.toString().length()>0){
+            return Result.error("-1","",stringBuilder.toString());
+        }else {
+            return Result.success(res);
+        }
+
+
+    }
+
     @GetMapping("/getZcbById")
     public ResponseMessage<Object> getWgdZcbById(String id) {//查询详情
         return Result.success(iWgdZcbService.getWgdZcbById(id));

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java

@@ -20,7 +20,6 @@ import lombok.experimental.Accessors;
  * @since 2021-11-12
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdCgfy对象", description="采购费用信息统计")
 public class WgdCgfy extends BasePage {

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java

@@ -3,8 +3,10 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+import java.util.Date;
 
 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;
@@ -21,7 +23,6 @@ import org.springframework.format.annotation.DateTimeFormat;
  * @since 2021-11-12
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdFyfy对象", description="翻译费用信息统计")
 public class WgdFyfy extends BasePage {
@@ -56,9 +57,10 @@ public class WgdFyfy extends BasePage {
     private String cost;
 
     @ApiModelProperty(value = "翻译完成时间")
-    @Excel(name = "翻译完成时间", orderNum = "6",width = 20.0)
+    @Excel(name = "翻译完成时间", orderNum = "6",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 String time;
+    private Date time;
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java

@@ -3,8 +3,10 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+import java.util.Date;
 
 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;
@@ -21,7 +23,6 @@ import org.springframework.format.annotation.DateTimeFormat;
  * @since 2021-11-12
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表")
 public class WgdSrb extends BasePage {
@@ -47,9 +48,10 @@ public class WgdSrb extends BasePage {
     private String cost;
 
     @ApiModelProperty(value = "入账时间")
-    @Excel(name = "入账时间", orderNum = "4",width = 20.0)
+    @Excel(name = "入账时间", orderNum = "4",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 String time;
+    private Date time;
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java

@@ -12,6 +12,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 /**
  * <p>
  * 参与外部协会会议统计
@@ -38,10 +40,10 @@ public class WgdWbtj extends BasePage {
     private String meeting;
 
     @ApiModelProperty(value = "会议时间")
-    @Excel(name = "会议时间", orderNum = "2",width = 20.0)
+    @Excel(name = "会议时间", orderNum = "2",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")
-    private String time;
+    private Date time;
 
     @ApiModelProperty(value = "会议地点")
     @Excel(name = "会议地点", orderNum = "3",width = 20.0)

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java

@@ -3,8 +3,10 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+import java.util.Date;
 
 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;
@@ -21,7 +23,6 @@ import org.springframework.format.annotation.DateTimeFormat;
  * @since 2021-11-12
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计")
 public class WgdWbxd extends BasePage {
@@ -59,14 +60,16 @@ public class WgdWbxd extends BasePage {
     private String preside;
 
     @ApiModelProperty(value = "发布日期")
-    @Excel(name = "发布日期", orderNum = "7",width = 20.0)
+    @Excel(name = "发布日期", orderNum = "7",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 String dataStart;
+    private Date dataStart;
 
     @ApiModelProperty(value = "实施日期")
-    @Excel(name = "实施日期", orderNum = "8",width = 20.0)
+    @Excel(name = "实施日期", orderNum = "8",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 String dataImplement;
+    private Date dataImplement;
 
     @ApiModelProperty(value = "颁布机构")
     @Excel(name = "颁布机构", orderNum = "9",width = 20.0)
@@ -77,9 +80,10 @@ public class WgdWbxd extends BasePage {
     private String drafting;
 
     @ApiModelProperty(value = "备案时间")
-    @Excel(name = "备案时间", orderNum = "11",width = 20.0)
+    @Excel(name = "备案时间", orderNum = "11",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 String dataRecord;
+    private Date dataRecord;
 
     @ApiModelProperty(value = "提报单位名称")
     @Excel(name = "提报单位名称", orderNum = "12",width = 20.0)

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusLeo.entity;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
 
@@ -19,7 +20,6 @@ import lombok.experimental.Accessors;
  * @since 2021-11-12
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表")
 public class WgdZcb extends BasePage {
@@ -29,15 +29,19 @@ public class WgdZcb extends BasePage {
     private String id;
 
     @ApiModelProperty(value = "项目名称")
+    @Excel(name = "项目名称", orderNum = "0",width = 20.0)
     private String name;
 
     @ApiModelProperty(value = "支出金额")
+    @Excel(name = "支出金额", orderNum = "1",width = 20.0)
     private String cost;
 
     @ApiModelProperty(value = "用途")
+    @Excel(name = "用途", orderNum = "2",width = 20.0)
     private String purposes;
 
     @ApiModelProperty(value = "详细附件")
+//    @Excel(name = "详细附件", orderNum = "3",width = 20.0)
     private String annexs;
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java

@@ -1,7 +1,9 @@
 package com.adc.da.slrs.wgdCensusLeo.service;
 
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
+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;
 
@@ -22,4 +24,5 @@ public interface IWgdCgfyService extends IService<WgdCgfy> {
     int insertWgdCgfy(WgdCgfy wgdCgfy);//插入
     int deleteWgdCgfy(String id);//删除
     int deleteWgdCgfys(String ids);//批量删除
+    List<WgdCgfy> importCgfy(MultipartFile file , StringBuilder stringBuilder);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java

@@ -1,7 +1,9 @@
 package com.adc.da.slrs.wgdCensusLeo.service;
 
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -22,4 +24,5 @@ public interface IWgdFyfyService extends IService<WgdFyfy> {
     int insertWgdFyfy(WgdFyfy wgdFyfy);//插入
     int deleteWgdFyfy(String id);//删除
     int deleteWgdFyfys(String ids);//批量删除
+    List<WgdFyfy> importFyfy(MultipartFile file , StringBuilder stringBuilder);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java

@@ -1,7 +1,9 @@
 package com.adc.da.slrs.wgdCensusLeo.service;
 
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -22,4 +24,5 @@ public interface IWgdSrbService extends IService<WgdSrb> {
     int insertWgdSrb(WgdSrb wgdSrb);//插入
     int deleteWgdSrb(String id);//删除
     int deleteWgdSrbs(String ids);//批量删除
+    List<WgdSrb> importSrb(MultipartFile file , StringBuilder stringBuilder);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java

@@ -1,7 +1,9 @@
 package com.adc.da.slrs.wgdCensusLeo.service;
 
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -22,4 +24,5 @@ public interface IWgdWbtjService extends IService<WgdWbtj> {
     int insertWgdWbtj(WgdWbtj wgdWbtj);//插入
     int deleteWgdWbtj(String id);//删除
     int deleteWgdWbtjs(String ids);//批量删除
+    List<WgdWbtj> importWbtj(MultipartFile file , StringBuilder stringBuilder);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java

@@ -1,7 +1,9 @@
 package com.adc.da.slrs.wgdCensusLeo.service;
 
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -22,4 +24,5 @@ public interface IWgdWbxdService extends IService<WgdWbxd> {
     int insertWgdWbxd(WgdWbxd wgdWbxd);//插入
     int deleteWgdWbxd(String id);//删除
     int deleteWgdWbxds(String ids);//批量删除
+    List<WgdWbxd> importWbxd(MultipartFile file , StringBuilder stringBuilder);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java

@@ -1,7 +1,9 @@
 package com.adc.da.slrs.wgdCensusLeo.service;
 
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -22,4 +24,5 @@ public interface IWgdZcbService extends IService<WgdZcb> {
     int insertWgdZcb(WgdZcb wgdZcb);//插入
     int deleteWgdZcb(String id);//删除
     int deleteWgdZcbs(String ids);//批量删除
+    List<WgdZcb> importZcb(MultipartFile file , StringBuilder stringBuilder);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java

@@ -1,15 +1,21 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
+import com.adc.da.http.Result;
+import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService;
 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.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * <p>
@@ -25,6 +31,8 @@ public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> impleme
     @Autowired
     WgdCgfyDao wgdCgfyDao;
 
+    @Autowired
+    IWgdCgfyService iWgdCgfyService;
     @Override
     public List<WgdCgfy> getAllWgdCgfys() {
         return wgdCgfyDao.selectAll();
@@ -63,4 +71,31 @@ public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> impleme
         String[] str = ids.split(",");
         return wgdCgfyDao.deleteBatch(str);
     }
+
+    @Override
+    public List<WgdCgfy> importCgfy(MultipartFile file, StringBuilder stringBuilder) {
+
+        List<WgdCgfy> res= ExcelImportUtilByWk.readExcelpublic(WgdCgfy.class,file);
+
+        QueryWrapper<WgdCgfy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select(WgdCgfy.class, info -> !info.getColumn().equals("id"));
+        List<WgdCgfy> wgdCgfy=iWgdCgfyService.list(queryWrapper);
+        List<WgdCgfy> remove=new ArrayList<>();
+        wgdCgfy.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 && iWgdCgfyService.saveOrUpdateBatch(res)) {
+            return res;
+        }else {
+            return null;
+        }
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java

@@ -1,14 +1,20 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
+import com.adc.da.http.Result;
+import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService;
 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>
@@ -24,6 +30,9 @@ public class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> impleme
     @Autowired
     WgdFyfyDao wgdFyfyDao;
 
+    @Autowired
+    IWgdFyfyService iWgdFyfyService;
+
     @Override
     public List<WgdFyfy> getAllWgdFyfys() {
         return wgdFyfyDao.selectAll();
@@ -62,4 +71,31 @@ public class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> impleme
         String[] str = ids.split(",");
         return wgdFyfyDao.deleteBatch(str);
     }
+
+    @Override
+    public List<WgdFyfy> importFyfy(MultipartFile file, StringBuilder stringBuilder) {
+        List<WgdFyfy> res= ExcelImportUtilByWk.readExcelpublic(WgdFyfy.class,file);
+
+        QueryWrapper<WgdFyfy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select(WgdFyfy.class, info -> !info.getColumn().equals("id"));
+        List<WgdFyfy> wgdFyfy=iWgdFyfyService.list(queryWrapper);
+        List<WgdFyfy> remove=new ArrayList<>();
+        wgdFyfy.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 && iWgdFyfyService.saveOrUpdateBatch(res)) {
+            return res;
+        }else {
+            stringBuilder.append("表格数据全部重复");
+        }
+        return res;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java

@@ -1,14 +1,24 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
+import com.adc.da.http.Result;
+import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
 import com.adc.da.util.UUIDUtils;
+import com.adc.da.util.utils.StringUtils;
+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>
@@ -24,6 +34,9 @@ public class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements
     @Autowired
     WgdSrbDao wgdSrbDao;
 
+    @Autowired
+    IWgdSrbService iWgdSrbService;
+
     @Override
     public List<WgdSrb> getAllWgdSrbs() {
         return wgdSrbDao.selectAll();
@@ -62,4 +75,43 @@ public class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements
         String[] str = ids.split(",");
         return wgdSrbDao.deleteBatch(str);
     }
+
+    @Override
+    public List<WgdSrb> importSrb(MultipartFile file, StringBuilder stringBuilder) {
+
+        List<WgdSrb> res= ExcelImportUtilByWk.readExcelpublic(WgdSrb.class,file);
+        DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
+        int i=1;
+        for (WgdSrb wgdSrb: res) {
+            try {
+                if (null!=wgdSrb.getTime() &&  !"".equals(wgdSrb.getTime())) {
+                    wgdSrb.setTime(wgdSrb.getTime());
+                }
+            }catch (Exception e){
+                stringBuilder.append("第"+i+"行第5列入账时间填写不符合格式要求请检查；");
+            }
+            i++;
+        }
+        QueryWrapper<WgdSrb> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select(WgdSrb.class, info -> !info.getColumn().equals("id"));
+        List<WgdSrb> wgdSrb=iWgdSrbService.list(queryWrapper);
+        List<WgdSrb> remove=new ArrayList<>();
+        wgdSrb.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 && iWgdSrbService.saveOrUpdateBatch(res)) {
+            return res;
+        }else {
+            stringBuilder.append("表格数据全部重复");
+        }
+        return res;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java

@@ -1,14 +1,22 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
+import com.adc.da.http.Result;
+import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbtjDao;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService;
 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>
@@ -24,6 +32,9 @@ public class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> impleme
     @Autowired
     WgdWbtjDao wgdWbtjDao;
 
+    @Autowired
+    IWgdWbtjService iWgdWbtjService;
+
     @Override
     public List<WgdWbtj> getAllWgdWbtjs() {
         return wgdWbtjDao.selectAll();
@@ -62,4 +73,98 @@ public class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> impleme
         String[] str = ids.split(",");
         return wgdWbtjDao.deleteBatch(str);
     }
+
+    @Override
+    public List<WgdWbtj> importWbtj(MultipartFile file, StringBuilder stringBuilder) {
+        List<WgdWbtj> res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file);
+        DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
+        int i=1;
+        for (WgdWbtj wgdWbtj: res) {
+            if (null == wgdWbtj.getHost() || "".equals(wgdWbtj.getHost())){
+                stringBuilder.append("第" + i + "行第1列主办单位填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbtj.getMeeting() || "".equals(wgdWbtj.getMeeting())){
+                stringBuilder.append("第" + i + "行第2列会议名称填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbtj.getPlace() || "".equals(wgdWbtj.getPlace())){
+                stringBuilder.append("第" + i + "行第4列会议地点填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbtj.getContributions() || "".equals(wgdWbtj.getContributions())){
+                stringBuilder.append("第" + i + "行第5列会费标准填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbtj.getExpenses() || "".equals(wgdWbtj.getExpenses())){
+                stringBuilder.append("第" + i + "行第7列费用列支填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbtj.getUser() || "".equals(wgdWbtj.getUser())){
+                stringBuilder.append("第" + i + "行第8列参会人员填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbtj.getLeadership() || "".equals(wgdWbtj.getLeadership())){
+                stringBuilder.append("第" + i + "行第9列主管领导填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbtj.getParticipants() || "".equals(wgdWbtj.getParticipants())){
+                stringBuilder.append("第" + i + "行第10列参会单位填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbtj.getIssues() || "".equals(wgdWbtj.getIssues())){
+                stringBuilder.append("第" + i + "行第13列主要议题填写不符合格式要求请检查；");
+            }
+            try {
+                if (null!=wgdWbtj.getTime() &&  !"".equals(wgdWbtj.getTime())) {
+                    wgdWbtj.setTime(wgdWbtj.getTime());
+                }
+            }catch (Exception e){
+                stringBuilder.append("第"+i+"行第3列会议时间填写不符合格式要求请检查；");
+            }
+            i++;
+        }
+        QueryWrapper<WgdWbtj> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select(WgdWbtj.class,tableFieldInfo -> !tableFieldInfo.getColumn().equals("id"));
+        List<WgdWbtj> WgdWbtjs=iWgdWbtjService.list(queryWrapper);
+        List<WgdWbtj> remove=new ArrayList<>();
+        WgdWbtjs.forEach(WgbWbtj -> {
+            WgbWbtj.setId(null);
+            if (res.contains(WgbWbtj)){
+                remove.add(WgbWbtj);
+            }
+            res.forEach(resWbtj->{
+                if (null == resWbtj.getHost() || "".equals(resWbtj.getHost())){
+                    remove.add(resWbtj);
+                }
+                if (null == resWbtj.getMeeting() || "".equals(resWbtj.getMeeting())){
+                    remove.add(resWbtj);
+                }
+                if (null == resWbtj.getPlace() || "".equals(resWbtj.getPlace())){
+                    remove.add(resWbtj);
+                }
+                if (null == resWbtj.getContributions() || "".equals(resWbtj.getContributions())){
+                    remove.add(resWbtj);
+                }
+                if (null == resWbtj.getExpenses() || "".equals(resWbtj.getExpenses())){
+                    remove.add(resWbtj);
+                }
+                if (null == resWbtj.getUser() || "".equals(resWbtj.getUser())){
+                    remove.add(resWbtj);
+                }
+                if (null == resWbtj.getLeadership() || "".equals(resWbtj.getLeadership())){
+                    remove.add(resWbtj);
+                }
+                if (null == resWbtj.getParticipants() || "".equals(resWbtj.getParticipants())){
+                    remove.add(resWbtj);
+                }
+                if (null == resWbtj.getIssues() || "".equals(resWbtj.getIssues())){
+                    remove.add(resWbtj);
+                }
+            });
+
+        });
+        res.removeAll(remove);
+        res.forEach(WgbWbtj -> {
+            WgbWbtj.setId(String.valueOf(UUID.randomUUID()));
+        });
+        if (res.size()>0 && iWgdWbtjService.saveOrUpdateBatch(res)) {
+            return res;
+        }else {
+            stringBuilder.append("表格数据全部重复");
+        }
+        return res;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java

@@ -1,14 +1,22 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
+import com.adc.da.http.Result;
+import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbxdDao;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService;
 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>
@@ -24,6 +32,9 @@ public class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> impleme
     @Autowired
     WgdWbxdDao wgdWbxdDao;
 
+    @Autowired
+    IWgdWbxdService iWgdWbxdService;
+
     @Override
     public List<WgdWbxd> getAllWgdWbxds() {
         return wgdWbxdDao.selectAll();
@@ -62,4 +73,84 @@ public class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> impleme
         String[] str = ids.split(",");
         return wgdWbxdDao.deleteBatch(str);
     }
+
+    @Override
+    public List<WgdWbxd> importWbxd(MultipartFile file, StringBuilder stringBuilder) {
+
+
+        List<WgdWbxd> res= ExcelImportUtilByWk.readExcelpublic(WgdWbxd.class,file);
+        DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
+        int i=1;
+        for (WgdWbxd wgdWbxd: res) {
+            if (null == wgdWbxd.getName() || "".equals(wgdWbxd.getName())){
+                stringBuilder.append("第" + i + "行第3列标准名称填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbxd.getType() || "".equals(wgdWbxd.getType())){
+                stringBuilder.append("第" + i + "行第6列标类型填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbxd.getPreside() || "".equals(wgdWbxd.getPreside())){
+                stringBuilder.append("第" + i + "行第7列主持或参与填写不符合格式要求请检查；");
+            }
+            if (null == wgdWbxd.getParticipants() || "".equals(wgdWbxd.getParticipants())){
+                stringBuilder.append("第" + i + "行第14列参与人填写不符合格式要求请检查；");
+            }
+            try {
+                if (null!=wgdWbxd.getDataStart() &&  !"".equals(wgdWbxd.getDataStart())) {
+                    wgdWbxd.setDataStart(wgdWbxd.getDataStart());
+                }
+            }catch (Exception e){
+                stringBuilder.append("第"+i+"行第8列发布日期填写不符合格式要求请检查；");
+            }
+            try {
+                if (null!=wgdWbxd.getDataImplement() &&  !"".equals(wgdWbxd.getDataImplement())) {
+                    wgdWbxd.setDataImplement(wgdWbxd.getDataImplement());
+                }
+            }catch (Exception e){
+                stringBuilder.append("第"+i+"行第9列实施日期填写不符合格式要求请检查；");
+            }
+            try {
+                if (null!=wgdWbxd.getDataRecord() &&  !"".equals(wgdWbxd.getDataRecord())) {
+                    wgdWbxd.setDataRecord(wgdWbxd.getDataRecord());
+                }
+            }catch (Exception e){
+                stringBuilder.append("第"+i+"行第12列备案时间填写不符合格式要求请检查；");
+            }
+            i++;
+        }
+        QueryWrapper<WgdWbxd> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select(WgdWbxd.class, info -> !info.getColumn().equals("id"));
+        List<WgdWbxd> wgdAssocInfos=iWgdWbxdService.list(queryWrapper);
+        List<WgdWbxd> remove=new ArrayList<>();
+        wgdAssocInfos.forEach(WgbWbtj -> {
+            WgbWbtj.setId(null);
+            if (res.contains(WgbWbtj)){
+                remove.add(WgbWbtj);
+            }
+            res.forEach(resWBxd->{
+                if (null == resWBxd.getName() || "".equals(resWBxd.getName())){
+                    remove.add(resWBxd);
+                }
+                if (null == resWBxd.getType() || "".equals(resWBxd.getType())){
+                    remove.add(resWBxd);
+                }
+                if (null == resWBxd.getPreside() || "".equals(resWBxd.getPreside())){
+                    remove.add(resWBxd);
+                }
+                if (null == resWBxd.getParticipants() || "".equals(resWBxd.getParticipants())){
+                    remove.add(resWBxd);
+                }
+            });
+
+        });
+        res.removeAll(remove);
+        res.forEach(wgdAssocInfo -> {
+            wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
+        });
+        if (res.size()>0 && iWgdWbxdService.saveOrUpdateBatch(res)) {
+            return res;
+        }else {
+            stringBuilder.append("表格数据全部重复");
+        }
+        return res;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java

@@ -1,14 +1,20 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
+import com.adc.da.http.Result;
+import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdZcbDao;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService;
 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>
@@ -24,6 +30,8 @@ public class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements
     @Autowired
     WgdZcbDao wgdZcbDao;
 
+    @Autowired
+    IWgdZcbService iWgdZcbService;
     @Override
     public List<WgdZcb> getAllWgdZcbs() {
         return wgdZcbDao.selectAll();
@@ -62,4 +70,37 @@ public class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements
         String[] str = ids.split(",");
         return wgdZcbDao.deleteBatch(str);
     }
+
+    @Override
+    public List<WgdZcb> importZcb(MultipartFile file, StringBuilder stringBuilder) {
+
+        List<WgdZcb> res= ExcelImportUtilByWk.readExcelpublic(WgdZcb.class,file);
+
+        QueryWrapper<WgdZcb> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select(WgdZcb.class, info -> !info.getColumn().equals("id"));
+        List<WgdZcb> wgdZcb=iWgdZcbService.list(queryWrapper);
+        List<WgdZcb> remove=new ArrayList<>();
+        wgdZcb.forEach(WgbWbtj -> {
+            WgbWbtj.setId(null);
+            if (res.contains(WgbWbtj)){
+                remove.add(WgbWbtj);
+            }
+            res.forEach(resZcb->{
+                if (null!=resZcb.getAnnexs() &&  !"".equals(resZcb.getAnnexs())) {
+                    resZcb.setAnnexs(null);
+                }
+            });
+
+        });
+        res.removeAll(remove);
+        res.forEach(wgdAssocInfo -> {
+            wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
+        });
+        if (res.size()>0 && iWgdZcbService.saveOrUpdateBatch(res)) {
+            return res;
+        }else {
+            stringBuilder.append("表格数据全部重复");
+        }
+        return res;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java

@@ -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 {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdAssocCost> res= ExcelImportUtilByWk.readExcelpublic(WgdAssocCost.class,file);
 
-        QueryWrapper<WgdAssocCost> queryWrapper = new QueryWrapper<>();
+        StringBuilder stringBuilder=new StringBuilder();
-        queryWrapper.select(WgdAssocCost.class, info -> !info.getColumn().equals("id"));
+        List<WgdAssocCost> res=iWgdAssocCostService.importAssocCosts(file,stringBuilder);
-        List<WgdAssocCost> wgdAssocInfos=iWgdAssocCostService.list(queryWrapper);
+        if (stringBuilder.toString().length()>0){
-        List<WgdAssocCost> remove=new ArrayList<>();
+            return Result.error("-1","",stringBuilder.toString());
-        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();
         }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

@@ -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 {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdAssocInfo> res= ExcelImportUtilByWk.readExcelpublic(WgdAssocInfo.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-
+        List<WgdAssocInfo> res=iWgdAssocInfoService.delWithWkData(file,stringBuilder);
-        QueryWrapper<WgdAssocInfo> queryWrapper = new QueryWrapper<>();
+        if (stringBuilder.toString().length()>0){
-        queryWrapper.select(WgdAssocInfo.class, info -> !info.getColumn().equals("id"));
+            return Result.error("-1","",stringBuilder.toString());
-        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();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
+
     }
 
     @ApiOperation("查询")

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java

@@ -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 {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdCommiInfo> res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-
+        List<WgdCommiInfo> res=iWgdCommiInfoService.importCommiInfo(file,stringBuilder);
-        QueryWrapper<WgdCommiInfo> queryWrapper = new QueryWrapper<>();
+        if (stringBuilder.toString().length()>0){
-        queryWrapper.select(WgdCommiInfo.class, info -> !info.getColumn().equals("id"));
+            return Result.error("-1","",stringBuilder.toString());
-        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();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
+
     }
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java

@@ -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 {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdExReviseCost> res= ExcelImportUtilByWk.readExcelpublic(WgdExReviseCost.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-
+        List<WgdExReviseCost> res=iWgdExReviseCostService.importExReviseCost(file,stringBuilder);
-        QueryWrapper<WgdExReviseCost> queryWrapper = new QueryWrapper<>();
+        if (stringBuilder.toString().length()>0){
-        queryWrapper.select(WgdExReviseCost.class, info -> !info.getColumn().equals("id"));
+            return Result.error("-1","",stringBuilder.toString());
-        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();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java

@@ -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")
+    @PostMapping(value = "/importMeetCost")
-    public ResponseMessage<List<WgdMeetCost>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
+    public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-        List<WgdMeetCost> res= ExcelImportUtilByWk.readExcelpublic(WgdMeetCost.class,file);
+        StringBuilder stringBuilder=new StringBuilder();
-
+        List<WgdMeetCost> res=iWgdMeetCostService.importMeetCost(file,stringBuilder);
-        QueryWrapper<WgdMeetCost> queryWrapper = new QueryWrapper<>();
+        if (stringBuilder.toString().length()>0){
-        queryWrapper.select(WgdMeetCost.class, info -> !info.getColumn().equals("id"));
+            return Result.error("-1","",stringBuilder.toString());
-        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();
         }else {
-            return Result.error();
+            return Result.success(res);
         }
+
+
     }
 
     @GetMapping("getMeetCostById")

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;
+    }
 }

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml

@@ -83,7 +83,7 @@
             <if test="meeting != null and meeting != ''">
                 meeting = #{meeting},
             </if>
-            <if test="time != null and time != ''">
+            <if test="time != null ">
                 time = #{time},
             </if>
             <if test="place != null and place != ''">

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml

@@ -20,11 +20,11 @@
             <if test="name != null and name != ''">
                 and name like concat('%',#{name},'%')
             </if>
-            <if test="project_id != null and project_id != ''">
+            <if test="projectId != null and projectId != ''">
                 and project_id = #{projectId}
             </if>
-            <if test="project_name != null and project_name != ''">
+            <if test="projectName != null and projectName != ''">
-                and project_name = #{project_name}
+                and project_name = #{projectName}
             </if>
             <if test="type != null and type != ''">
                 and type = #{type}
@@ -32,11 +32,11 @@
             <if test="preside != null and preside != ''">
                 and preside = #{preside}
             </if>
-            <if test="data_start != null and data_start != ''">
+            <if test="dataStart != null and dataStart != ''">
-                and data_start = #{data_start}
+                and data_start = #{dataStart}
             </if>
-            <if test="data_implement != null and data_implement != ''">
+            <if test="dataImplement != null and dataImplement != ''">
-                and data_implement = #{data_implement}
+                and data_implement = #{dataImplement}
             </if>
             <if test="body != null and body != ''">
                 and body = #{body}
@@ -44,8 +44,8 @@
             <if test="drafting != null and drafting != ''">
                 and drafting = #{drafting}
             </if>
-            <if test="data_record != null and data_record != ''">
+            <if test="dataRecord != null and dataRecord != ''">
-                and data_record = #{data_record}
+                and data_record = #{dataRecord}
             </if>
             <if test="report != null and report != ''">
                 and report = #{report}
@@ -56,11 +56,11 @@
             <if test="celebrity != null and celebrity != ''">
                 and celebrity = #{celebrity}
             </if>
-            <if test="cost_marking != null and cost_marking != ''">
+            <if test="costMarking != null and costMarking != ''">
-                and cost_marking = #{cost_marking}
+                and cost_marking = #{costMarking}
             </if>
-            <if test="cost_other != null and cost_other != ''">
+            <if test="costOther != null and costOther != ''">
-                and cost_other = #{cost_other}
+                and cost_other = #{costOther}
             </if>
             <if test="revised != null and revised != ''">
                 and revised = #{revised}
@@ -110,11 +110,11 @@
             <if test="name != null and name != ''">
                 name = #{name},
             </if>
-            <if test="project_id != null and project_id != ''">
+            <if test="projectId != null and projectId != ''">
                 project_id = #{projectId},
             </if>
-            <if test="project_name != null and project_name != ''">
+            <if test="projectName != null and projectName != ''">
-                project_name = #{project_name},
+                project_name = #{projectName},
             </if>
             <if test="type != null and type != ''">
                 type = #{type},
@@ -122,11 +122,11 @@
             <if test="preside != null and preside != ''">
                 preside = #{preside},
             </if>
-            <if test="data_start != null and data_start != ''">
+            <if test="dataStart != null and dataStart != ''">
-                data_start = #{data_start},
+                data_start = #{dataStart},
             </if>
-            <if test="data_implement != null and data_implement != ''">
+            <if test="dataImplement != null and dataImplement != ''">
-                data_implement = #{data_implement},
+                data_implement = #{dataImplement},
             </if>
             <if test="body != null and body != ''">
                 body = #{body},
@@ -134,8 +134,8 @@
             <if test="drafting != null and drafting != ''">
                 drafting = #{drafting},
             </if>
-            <if test="data_record != null and data_record != ''">
+            <if test="dataRecord != null and dataRecord != ''">
-                data_record = #{data_record},
+                data_record = #{dataRecord},
             </if>
             <if test="report != null and report != ''">
                 report = #{report},
@@ -146,11 +146,11 @@
             <if test="celebrity != null and celebrity != ''">
                 celebrity = #{celebrity},
             </if>
-            <if test="cost_marking != null and cost_marking != ''">
+            <if test="costMarking != null and costMarking != ''">
-                cost_marking = #{cost_marking},
+                cost_marking = #{costMarking},
             </if>
-            <if test="cost_other != null and cost_other != ''">
+            <if test="costOther != null and costOther != ''">
-                cost_other = #{cost_other},
+                cost_other = #{costOther},
             </if>
             <if test="revised != null and revised != ''">
                 revised = #{revised},
@@ -183,10 +183,10 @@
             <if test="name != null and name != ''">
                 name,
             </if>
-            <if test="project_id != null and project_id != ''">
+            <if test="projectId != null and projectId != ''">
                 project_id,
             </if>
-            <if test="project_name != null and project_name != ''">
+            <if test="projectName != null and projectName != ''">
                 project_name,
             </if>
             <if test="type != null and type != ''">
@@ -195,10 +195,10 @@
             <if test="preside != null and preside != ''">
                 preside,
             </if>
-            <if test="data_start != null and data_start != ''">
+            <if test="dataStart != null and dataStart != ''">
                 data_start,
             </if>
-            <if test="data_implement != null and data_implement != ''">
+            <if test="dataImplement != null and dataImplement != ''">
                 data_implement,
             </if>
             <if test="body != null and body != ''">
@@ -207,7 +207,7 @@
             <if test="drafting != null and drafting != ''">
                 drafting,
             </if>
-            <if test="data_record != null and data_record != ''">
+            <if test="dataRecord != null and dataRecord != ''">
                 data_record,
             </if>
             <if test="report != null and report != ''">
@@ -219,10 +219,10 @@
             <if test="celebrity != null and celebrity != ''">
                 celebrity,
             </if>
-            <if test="cost_marking != null and cost_marking != ''">
+            <if test="costMarking != null and costMarking != ''">
                 cost_marking,
             </if>
-            <if test="cost_other != null and cost_other != ''">
+            <if test="costOther != null and costOther != ''">
                 cost_other,
             </if>
             <if test="revised != null and revised != ''">
@@ -253,11 +253,11 @@
             <if test="name != null and name != ''">
                 #{name},
             </if>
-            <if test="project_id != null and project_id != ''">
+            <if test="projectId != null and projectId != ''">
                 #{projectId},
             </if>
-            <if test="project_name != null and project_name != ''">
+            <if test="projectName != null and projectName != ''">
-                #{project_name},
+                #{projectName},
             </if>
             <if test="type != null and type != ''">
                 #{type},
@@ -265,11 +265,11 @@
             <if test="preside != null and preside != ''">
                 #{preside},
             </if>
-            <if test="data_start != null and data_start != ''">
+            <if test="dataStart != null and dataStart != ''">
-                #{data_start},
+                #{dataStart},
             </if>
-            <if test="data_implement != null and data_implement != ''">
+            <if test="dataImplement != null and dataImplement != ''">
-                #{data_implement},
+                #{dataImplement},
             </if>
             <if test="body != null and body != ''">
                 #{body},
@@ -277,8 +277,8 @@
             <if test="drafting != null and drafting != ''">
                 #{drafting},
             </if>
-            <if test="data_record != null and data_record != ''">
+            <if test="dataRecord != null and dataRecord != ''">
-                #{data_record},
+                #{dataRecord},
             </if>
             <if test="report != null and report != ''">
                 #{report},
@@ -289,11 +289,11 @@
             <if test="celebrity != null and celebrity != ''">
                 #{celebrity},
             </if>
-            <if test="cost_marking != null and cost_marking != ''">
+            <if test="costMarking != null and costMarking != ''">
-                #{cost_marking},
+                #{costMarking},
             </if>
-            <if test="cost_other != null and cost_other != ''">
+            <if test="costOther != null and costOther != ''">
-                #{cost_other},
+                #{costOther},
             </if>
             <if test="revised != null and revised != ''">
                 #{revised},