From 479e74ab6fbeb149516152fdd2b6f3db904007ec Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 14 Nov 2021 09:22:09 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E4=BC=81=E6=A0=87excel=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/ImportExcelDatas/comment/Analysis.java | 2 -- .../ImportExcelDatas/comment/PathMatcher.java | 16 +++++++++------- .../ImportExcelDatas/comment/StandMatcher.java | 10 +++++----- .../controller/ImportExcelController.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java index a9356585..b5b83639 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java @@ -14,10 +14,8 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.time.Year; import java.util.HashSet; import java.util.List; -import java.util.regex.Pattern; import java.util.stream.Collectors; @Component diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java index a046b6f5..caeecca1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java @@ -29,17 +29,19 @@ public class PathMatcher { for (Row row : sheet) { - - String latter = row.getCell(1).getStringCellValue().trim();//标准号 - String fileId=""; - if (row.getCell(10)!=null){ - fileId = row.getCell(10).getStringCellValue().trim();//文档id - }else { + if(row.getCell(1)==null || row.getCell(10)==null){ logger.info("+"); continue; } + String latter = row.getCell(1).getStringCellValue().trim();//标准号 + String fileId=""; + + fileId = row.getCell(10).getStringCellValue().trim();//文档id + + + StringBuilder builder = new StringBuilder(); builder.append(fileId) .append(latter); @@ -55,7 +57,7 @@ public class PathMatcher { } - File file = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件路径-国内库.xlsx"); + File file = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件路径-企标.xlsx"); FileOutputStream os = new FileOutputStream(file); workbook.write(os); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java index 041a0c47..bd613908 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java @@ -40,13 +40,13 @@ public class StandMatcher { String letter =convertCellValueToString(row.getCell(1));//标准号 - String publish = convertCellValueToString(row.getCell(3));//发布日期 + String publish = convertCellValueToString(row.getCell(4));//发布日期 - String impl= convertCellValueToString(row.getCell(4));//实施日期 + String impl= convertCellValueToString(row.getCell(5));//实施日期 - String state = convertCellValueToString(row.getCell(2));//状态 + String state = convertCellValueToString(row.getCell(3));//状态 - String replace= convertCellValueToString(row.getCell(5));//代替标准号 + String replace= convertCellValueToString(row.getCell(6));//代替标准号 @@ -72,7 +72,7 @@ public class StandMatcher { } - File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件id-国内库.xlsx"); + File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件id-企标.xlsx"); FileOutputStream os = new FileOutputStream(result); workbook.write(os); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index ab6ad83d..016a6797 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -163,7 +163,7 @@ public class ImportExcelController extends BaseController { } - @ApiOperation("根据文件id和标准匹配文件路径") + @ApiOperation("根据文件id和标准号匹配文件路径") @PostMapping("/matchingPath") public void matchingPath(MultipartFile targetExcel,MultipartFile attachExcel) throws IOException { From 6d80822d594f21b97fbfa6b1d0099cc00de7d281 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 15 Nov 2021 09:57:42 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IImportStandExcelService.java | 14 +++++ .../controller/IssueTrackController.java | 5 +- .../slrs/sarIssueTrack/entity/IssueTrack.java | 5 ++ .../service/IIssueTrackService.java | 3 +- .../service/impl/IssueTrackServiceImpl.java | 51 ++++++++++++------- 5 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/IImportStandExcelService.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/IImportStandExcelService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/IImportStandExcelService.java new file mode 100644 index 00000000..43fdad64 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/IImportStandExcelService.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.ImportExcelDatas.service; + +import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +public interface IImportStandExcelService { + + String importStandExcel(MultipartFile file,String standType) throws IOException; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java index d522496f..e8885f95 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java @@ -5,6 +5,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack; import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; import com.adc.da.slrs.sarIssueTrack.service.IIssueTrackService; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -42,8 +43,8 @@ public class IssueTrackController { @GetMapping @ApiOperation("查询重点标准跟踪清单") - public ResponseMessage> getIssueTrack(IssueTrackVo wrapper){ - List issueTrack = issueTrackService.getIssueTrack(wrapper); + public ResponseMessage> getIssueTrack(IssueTrackVo wrapper){ + IPage issueTrack = issueTrackService.getIssueTrack(wrapper); return Result.success(issueTrack); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java index 026892f5..db9d94e3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java @@ -37,5 +37,10 @@ public class IssueTrack { @TableField("del_flag") private String delFlag; + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer pageSize; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java index ffbf0b8c..54ad466c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarIssueTrack.service; import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack; import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; +import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; @@ -11,7 +12,7 @@ public interface IIssueTrackService { public boolean removeIssueTrack(List idList); - public List getIssueTrack(IssueTrackVo objVo); + public IPage getIssueTrack(IssueTrackVo objVo); public boolean updateIssueTrack(IssueTrack obj); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java index d9928e54..b1a8b700 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java @@ -6,7 +6,10 @@ import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; import com.adc.da.slrs.sarIssueTrack.service.IIssueTrackService; 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 java.util.ArrayList; @@ -14,6 +17,12 @@ import java.util.List; @Service public class IssueTrackServiceImpl extends ServiceImpl implements IIssueTrackService { + + + @Autowired + private IssueTrackDao issueTrackDao; + + @Override public boolean addIssueTrack(IssueTrack obj) { obj.setId(UUIDUtils.randomUUID20()); @@ -27,27 +36,33 @@ public class IssueTrackServiceImpl extends ServiceImpl getIssueTrack(IssueTrackVo objVo) { - List result=new ArrayList<>(); - if (objVo==null){ - result=this.list(); + public IPage getIssueTrack(IssueTrackVo objVo) { + + IPage trackPage = new Page<>(objVo.getPage(), objVo.getPageSize()); + + QueryWrapper wrapper = new QueryWrapper<>(); + + if (objVo.getPage()!=null && objVo.getPageSize()!=null){ + trackPage=new Page<>(objVo.getPage(),objVo.getPageSize()); }else { - QueryWrapper wrapper = new QueryWrapper<>(); - - if (objVo.getLawId()!=null){ - wrapper.like("law_id",objVo.getLawId()); - } - if (objVo.getLawName()!=null){ - wrapper.like("law_name",objVo.getLawName()); - } - if (objVo.getProductType()!=null){ - wrapper.like("product_type",objVo.getProductType()); - } - - result=list(wrapper); + Integer count = issueTrackDao.selectCount(wrapper); + trackPage=new Page<>(0,count,false); } - return result; + if (objVo.getLawId()!=null){ + wrapper.like("law_id",objVo.getLawId()); + } + if (objVo.getLawName()!=null){ + wrapper.like("law_name",objVo.getLawName()); + } + if (objVo.getProductType()!=null){ + wrapper.like("product_type",objVo.getProductType()); + } + + trackPage = issueTrackDao.selectPage(trackPage, wrapper); + + + return trackPage; } @Override From 3fee0547a4186297874ffc8c0e6f459adb2702d2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 15 Nov 2021 09:59:24 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=A0=87=E5=87=86excel=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImportExcelDatas/POIUtil/POIUtil.java | 81 +++++++++ .../ImportExcelDatas/comment/PathMatcher.java | 62 ++++--- .../comment/StandMatcher.java | 37 ++-- .../ImportExcelDatas/comment/Standard.java | 169 ++++++++++++++++++ .../controller/ImportExcelController.java | 14 +- .../service/ImportExcelService.java | 5 + .../service/impl/ImportExcelServiceImpl.java | 13 +- .../impl/ImportStandExcelServiceImpl.java | 112 ++++++++++++ .../adc/da/att/service/IAttFileEOService.java | 2 + .../service/impl/AttFileEOServiceImpl.java | 70 ++++++++ 10 files changed, 526 insertions(+), 39 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/POIUtil.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Standard.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportStandExcelServiceImpl.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/POIUtil.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/POIUtil.java new file mode 100644 index 00000000..922a3c88 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/POIUtil.java @@ -0,0 +1,81 @@ +package com.adc.da.slrs.ImportExcelDatas.POIUtil; + + +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.DateUtil; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Component +public class POIUtil { + + + //获取单元格各类型值，返回字符串类型 + public static String getCellValueByCell(Cell cell) { + //判断是否为null或空串 + if (cell==null || cell.toString().trim().equals("")) { + return ""; + } + String cellValue = ""; + CellType cellType = cell.getCellType(); + cell.getCellType(); + switch (cellType) { + case NUMERIC: // 数字 + short format = cell.getCellStyle().getDataFormat(); + if (DateUtil.isCellDateFormatted(cell)) { + SimpleDateFormat sdf = null; + //System.out.println("cell.getCellStyle().getDataFormat()="+cell.getCellStyle().getDataFormat()); + if (format == 20 || format == 32) { + sdf = new SimpleDateFormat("HH:mm"); + } else if (format == 14 || format == 31 || format == 57 || format == 58) { + // 处理自定义日期格式：m月d日(通过判断单元格的格式id解决，id的值是58) + sdf = new SimpleDateFormat("yyyy-MM-dd"); + double value = cell.getNumericCellValue(); + Date date = org.apache.poi.ss.usermodel.DateUtil + .getJavaDate(value); + cellValue = sdf.format(date); + }else {// 日期 + sdf = new SimpleDateFormat("yyyy-MM-dd"); + } + try { + cellValue = sdf.format(cell.getDateCellValue());// 日期 + } catch (Exception e) { + try { + throw new Exception("exception on get date data !".concat(e.toString())); + } catch (Exception e1) { + e1.printStackTrace(); + } + }finally{ + sdf = null; + } + } else { + BigDecimal bd = new BigDecimal(cell.getNumericCellValue()); + cellValue = bd.toPlainString();// 数值 这种用BigDecimal包装再获取plainString，可以防止获取到科学计数值 + } + break; + case STRING: // 字符串 + cellValue = cell.getStringCellValue(); + break; + case BOOLEAN: // Boolean + cellValue = cell.getBooleanCellValue()+"";; + break; + case FORMULA: // 公式 + cellValue = cell.getCellFormula(); + break; + case BLANK: // 空值 + cellValue = ""; + break; + case ERROR: // 故障 + cellValue = "ERROR VALUE"; + break; + default: + cellValue = "UNKNOW VALUE"; + break; + } + return cellValue; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java index caeecca1..2a34d582 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java @@ -1,10 +1,11 @@ package com.adc.da.slrs.ImportExcelDatas.comment; + +import com.alibaba.fastjson.JSON; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.poi.xssf.usermodel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; @@ -18,46 +19,64 @@ import java.util.HashMap; public class PathMatcher { private static final Logger logger = LoggerFactory.getLogger(PathMatcher.class); - public void run(MultipartFile target,MultipartFile attach) throws IOException { + + public void run(MultipartFile target, MultipartFile attach) throws IOException { InputStream inputStream = target.getInputStream(); XSSFWorkbook workbook = new XSSFWorkbook(inputStream); - XSSFSheet sheet = workbook.getSheetAt(0); + XSSFSheet mySheet = workbook.getSheetAt(0); HashMap fileMap = getFileMap(attach); - for (Row row : sheet) { - if(row.getCell(1)==null || row.getCell(10)==null){ + for (Row row : mySheet) { + if (row.getCell(1) == null || row.getCell(10) == null) { logger.info("+"); continue; } String latter = row.getCell(1).getStringCellValue().trim();//标准号 - String fileId=""; - fileId = row.getCell(10).getStringCellValue().trim();//文档id + String[] fileIdArray = row.getCell(10).getStringCellValue().trim().split(",");//文档id + + HashMap idMapPath = new HashMap<>(); //文件id和路径的键值对 - StringBuilder builder = new StringBuilder(); - builder.append(fileId) - .append(latter); - if (fileMap.containsKey(builder.toString())){ - Cell cell = row.createCell(9); - cell.setCellType(CellType.STRING); - cell.setCellValue(fileMap.get(builder.toString())); - logger.info("*"); - }else { - logger.info("-"); + + for (String fileId : fileIdArray) { //遍历文件id + + StringBuilder builder = new StringBuilder(); + builder.append(fileId) + .append(latter);//拼接文件id和标准号 + + + if (!fileMap.containsKey(builder.toString())) { + logger.info("-"); + continue; + }else { + Cell cell = row.createCell(9); + + + idMapPath.put(fileId,fileMap.get(builder.toString())); + String json = JSON.toJSONString(idMapPath); + + cell.setCellType(CellType.STRING); + cell.setCellValue(json); + logger.info("*"); + } } + + + + } - File file = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件路径-企标.xlsx"); + File file = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件路径-国内-多个路径.xlsx"); FileOutputStream os = new FileOutputStream(file); workbook.write(os); @@ -65,8 +84,7 @@ public class PathMatcher { } - - private HashMap getFileMap(MultipartFile excel) throws IOException { + private HashMap getFileMap(MultipartFile excel) throws IOException { InputStream inputStream = excel.getInputStream(); @@ -88,7 +106,7 @@ public class PathMatcher { String path = strArray[3]; - resultMap.put(builder.toString(),path); + resultMap.put(builder.toString(), path); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java index bd613908..b6be69cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java @@ -38,16 +38,23 @@ public class StandMatcher { for (Row row : sheet) { + /** + * 企标 + */ +// String letter =convertCellValueToString(row.getCell(1));//标准号 +// String publish = convertCellValueToString(row.getCell(4));//发布日期 +// String impl= convertCellValueToString(row.getCell(5));//实施日期 +// String state = convertCellValueToString(row.getCell(3));//状态 +// String replace= convertCellValueToString(row.getCell(6));//代替标准号 + + /** + * 国内 + */ String letter =convertCellValueToString(row.getCell(1));//标准号 - - String publish = convertCellValueToString(row.getCell(4));//发布日期 - - String impl= convertCellValueToString(row.getCell(5));//实施日期 - - String state = convertCellValueToString(row.getCell(3));//状态 - - String replace= convertCellValueToString(row.getCell(6));//代替标准号 - + String publish = convertCellValueToString(row.getCell(3));//发布日期 + String impl= convertCellValueToString(row.getCell(4));//实施日期 + String state = convertCellValueToString(row.getCell(2));//状态 + String replace= convertCellValueToString(row.getCell(5));//代替标准号 @@ -72,7 +79,7 @@ public class StandMatcher { } - File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件id-企标.xlsx"); + File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件id-国内-多个文件id.xlsx"); FileOutputStream os = new FileOutputStream(result); workbook.write(os); } @@ -115,7 +122,15 @@ public class StandMatcher { if (row.getCell(7).getCellType()== NUMERIC){ String s = row.getCell(7).toString(); String fileId =s.substring(0,s.length()-2);//文件id - resultSet.put(strBuilder.toString(),fileId); + String standStr = strBuilder.toString(); + if(resultSet.containsKey(standStr)){ + String s1 = resultSet.get(standStr); + + resultSet.replace(standStr,s1+","+fileId); + }else { + resultSet.put(standStr,fileId); + + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Standard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Standard.java new file mode 100644 index 00000000..5403054b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Standard.java @@ -0,0 +1,169 @@ +package com.adc.da.slrs.ImportExcelDatas.comment; + +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.slrs.ImportExcelDatas.POIUtil.POIUtil; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.utils.util.InitStandAttrUtil; +import com.alibaba.fastjson.JSON; +import com.google.gson.Gson; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.File; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +@Component +public class Standard { + + + @Autowired + private IAttFileEOService attFileEOService; + + + + private static final Logger logger = LoggerFactory.getLogger(Standard.class); + Map standAttrMap = new TreeMap<>(); + private String standType=""; + + + + Standard(){ + /** + * 初始化国内外标准属性字段 + */ + List listStandField = InitStandAttrUtil.queryFieldList; + listStandField.forEach(item ->{ + this.standAttrMap.put(item,""); + }); + } + + + + + public void setStandType(String standType) { + + if (!"INLAND,FOREIGN".contains(standType)){ + logger.error("标准类别错误"); + }else { + this.standType = standType; + } + } + + + + + + public SarStandardsInfo getStandardsInfo(Row row){ + + + SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); + + + if ("".equals(standType)){ + logger.error("未设置标准类型"); + }else { + sarStandardsInfo.setStandType(standType); + } + + + sarStandardsInfo.setValidFlag("0"); + Map fieldMap = standAttrMap;//标准字段初化 + for (int i=0;i<10;i++){ + Cell cell = row.getCell(i); + String value = POIUtil.getCellValueByCell(cell); + switch (i){ + case 0://标准名称 + sarStandardsInfo.setStandName(value); + break; + case 2://标准状态 + //TODO 标准状态转换为代码 + switch (value){ + case "有效": + value="vsaga7nwub"; + break; + case "作废": + value="chblaarg77"; + break; + case "参考": + value="-"; + break; + case "0": + value="-"; + break; + default:value="-"; + } + sarStandardsInfo.setTextStatus(value); + break; + case 3://发布日期 + //日期格式转换 1970/1/1 时发布日期为空 + if ("1970/1/1".equals(value.trim())){ + value=""; + } + sarStandardsInfo.setIssueTime(value); + break; + case 4://实施日期 + fieldMap.put("SSRQ", value); + break; + case 5://代替标准号 + fieldMap.put("DTBJH", value); + break; + case 6://标准类别 + sarStandardsInfo.setStandSort(value); + break; + case 7://标准号 + sarStandardsInfo.setStandNumber(value); + break; + case 8://标准年份 + sarStandardsInfo.setStandYear(value); + break; + case 9://附件路径 ->上传 + HashMap pathMap = JSON.parseObject(value, HashMap.class); + if (pathMap!=null){ + Cell standCodeCell = row.getCell(1); + String standCode = POIUtil.getCellValueByCell(standCodeCell); + + StringBuilder fileNameBuilder = new StringBuilder(); + fileNameBuilder.append(standCode) //标准号 + .append(sarStandardsInfo.getStandName());//标准名称 + AttFileVo fileInfo = importFile(pathMap,fileNameBuilder.toString());//上传文件 + fieldMap.put("FBGBJBD", fileInfo.getAttId()); + } + break; + } + } + + Gson gson = new Gson(); + String attrInfoJson = gson.toJson(fieldMap); + sarStandardsInfo.setSarStandAttrEOStr(attrInfoJson);//新增修改时属性表信息 + + return sarStandardsInfo; + } + + + private AttFileVo importFile(HashMap pathMap,String customName){ + String realPath = ""; + + for(String path: pathMap.values()) { + String filePath[] = path.split("/"); + for (int i = 3; i < filePath.length; i++) { + realPath = realPath + "/" + filePath[i]; + + } + break; + } + + File file = new File("/data/from12/Attach_swf_bak" + realPath); + + + return attFileEOService.insertFileInfo(file,customName); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index 016a6797..e37d449e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -4,6 +4,7 @@ import com.adc.da.base.web.BaseController; import com.adc.da.common.ReadExcel; import com.adc.da.slrs.ImportExcelDatas.comment.*; import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import com.adc.da.slrs.ImportExcelDatas.service.IImportStandExcelService; import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService; import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.util.utils.IOUtils; @@ -155,7 +156,7 @@ public class ImportExcelController extends BaseController { - @ApiOperation("匹配文件id") + @ApiOperation("匹配文件id(多个id)") @PostMapping("/matching") public void matching(MultipartFile targetExcel,MultipartFile attachExcel) throws IOException { StandMatcher standMatcher = new StandMatcher(); @@ -171,4 +172,15 @@ public class ImportExcelController extends BaseController { pathMatcher.run(targetExcel,attachExcel); } + + @Autowired + private IImportStandExcelService iImportStandExcelService; + + @ApiOperation("根据分解后的excel表 导入标准数据和附件") + @PostMapping("importStandFormExcel") + public void importStandFormExcel(MultipartFile targetExcel,String standType) throws IOException { + iImportStandExcelService.importStandExcel(targetExcel,standType); + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java index 9513517b..36f41c34 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java @@ -18,4 +18,9 @@ public interface ImportExcelService extends IService { public String isExist(MultipartFile exclFile); + + + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java index 6ff028c3..0ca0dff9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -324,11 +324,14 @@ public class ImportExcelServiceImpl extends ServiceImpl isExist = dicTypeEOService.getTypeIdByDicIdAndTypeName("JKSADFH564S", null, null, null); isExist.forEach(item->{ sarSort.add(item.getDicTypeCode()); - }); + });//标准类别集合 error = importListMap.get("error"); + /** + * 计数 + */ AtomicInteger QYBZcount= new AtomicInteger(); AtomicInteger QYBZcountUpdate= new AtomicInteger(); AtomicInteger HWBZcount= new AtomicInteger(); @@ -350,7 +353,7 @@ public class ImportExcelServiceImpl extends ServiceImpl { + importListMap.get("HWBZ").forEach(item -> { if (true ) { String standID = UUIDUtils.randomUUID20(); @@ -409,14 +412,14 @@ public class ImportExcelServiceImpl extends ServiceImpl { + importListMap.get("GNBZ").forEach(item -> { if (true) { @@ -472,7 +475,7 @@ public class ImportExcelServiceImpl extends ServiceImpl error = new ArrayList<>(); + + private List fileError = new ArrayList<>(); + + + @Async + @Override + public String importStandExcel(MultipartFile file,String standType) throws IOException { + + AtomicInteger countUpdate= new AtomicInteger();//更新 数量 + AtomicInteger countInsert= new AtomicInteger();//新增 数量 + + InputStream inputStream = file.getInputStream(); + XSSFWorkbook workbook = new XSSFWorkbook(inputStream); + XSSFSheet sheet = workbook.getSheetAt(0); + + standard.setStandType(standType); + + int lastRowNum = sheet.getLastRowNum(); + + for (int i = 1; i < lastRowNum; i++) { + XSSFRow row = sheet.getRow(i); + SarStandardsInfo standardsInfo = standard.getStandardsInfo(row); + + QueryWrapper standSaveWrapper = new QueryWrapper<>(); + standSaveWrapper + .eq("STAND_SORT", standardsInfo.getStandSort()) + .eq("STAND_NUMBER", standardsInfo.getStandNumber()) + .eq("STAND_YEAR", standardsInfo.getStandYear()); + + + SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper); + if (one != null) { + + + standardsInfo.setId(one.getId()); + try { + sarStandardsInfoService.updateSarStandardsInfo(standardsInfo); + countUpdate.getAndIncrement(); + logger.info("执行更新"+countUpdate+"条数据"); + + } catch (Exception e) { + e.printStackTrace(); + } + + + } else { + try { + sarStandardsInfoService.createSarStandardsInfo(standardsInfo); + countInsert.getAndIncrement(); + logger.info("执行新增"+countInsert+"条数据"); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + return "success"; + + } + + + + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java index 952fdc7f..79db58b3 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -22,4 +22,6 @@ public interface IAttFileEOService extends IService { public String saveFileAttId(File file); + public AttFileVo insertFileInfo(File file,String fileName); + } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index e81fdfff..554490a5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -358,4 +358,74 @@ public class AttFileEOServiceImpl extends ServiceImpl i } + + /** + * 保存文件并返回文件ID + * + * @param file + */ + @Transactional(rollbackFor = Exception.class) + public AttFileVo insertFileInfo(File file,String customFileName) { + /** + * 1、首先生成文件保存的主键ID + * 2、根据文件ID生成随机路径 + * 3、生成文件名 + * 3、保存文件 + * 4、获取文件相关信息 + * 5、判断当前表是否有存在，如果存在则执行insert语句 如果不存在则创建表结构 + * 5、保存入库并返回主键ID + */ + AttFileVo attFileVo = new AttFileVo(); + String fileId = UUIDUtils.randomUUID20(); + try { + String uuidPath = UUIDUtils.getUUIDPath(fileId); + + String FileSavePath = filePath + uuidPath + "/"; + File dir = new File(FileSavePath); + if (!dir.exists()) { + dir.mkdirs(); + } + + String fileName = file.getName(); + String fileSuffix = fileName.substring(fileName.lastIndexOf(".")+1, fileName.length()); + + String newFileName = fileId +"."+ fileSuffix; + String oldName=customFileName+"."+fileSuffix; + + + + File saveFile = new File(FileSavePath + newFileName); + FileUtils.copyFile(file,saveFile); + //开始存储文件信息 + String tableName = UUIDUtils.getAttTable(); + int existTable = this.baseMapper.existTable(tableName); + if (existTable == 0) { + this.baseMapper.creatTableInfo(tableName); + } + fileId = tableName + "_" + fileId; + AttFileEO attFileEO = new AttFileEO(); + attFileEO.setTableName(tableName); + attFileEO.setId(fileId); + attFileEO.setOldFileName(customFileName); + attFileEO.setFileSuffix(fileSuffix); + attFileEO.setFilePath(uuidPath); + attFileEO.setFileName(oldName); + attFileEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + attFileEO.setCreationTime(new Date()); + attFileEO.setModifyTime(new Date()); + this.baseMapper.insertData(attFileEO); + attFileVo.setId(fileId); + attFileVo.setFileName(newFileName); + attFileVo.setFilePath(uuidPath); + attFileVo.setFileSuffix(fileSuffix); + attFileVo.setOldFileName(oldName); + } catch (IOException e) { + log.error(e.getMessage(),e); + } catch (Exception e) { + log.error(e.getMessage(),e); + } + return attFileVo; + } + + } From 690504bdddf5b29ce1f8a19fe0a971ae26911fd1 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 15 Nov 2021 10:01:54 +0800 Subject: [PATCH 04/18] =?UTF-8?q?zcr:=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 73 +++ .../esRevisePlan/dao/EsRevisePlanDao.java | 26 + .../esRevisePlan/entity/EsRevisePlan.java | 59 +++ .../service/IEsRevisePlanService.java | 25 + .../service/impl/EsRevisePlanServiceImpl.java | 63 +++ .../controller/SapMeetingController.java | 4 +- .../controller/WgdAssocCostController.java | 66 +++ .../controller/WgdAssocInfoController.java | 65 +++ .../controller/WgdCommiInfoController.java | 65 +++ .../controller/WgdExReviseCostController.java | 65 +++ .../controller/WgdMeetCostController.java | 65 +++ .../slrs/wgdCensusZ/dao/WgdAssocCostDao.java | 27 ++ .../slrs/wgdCensusZ/dao/WgdAssocInfoDao.java | 27 ++ .../slrs/wgdCensusZ/dao/WgdCommiInfoDao.java | 27 ++ .../wgdCensusZ/dao/WgdExReviseCostDao.java | 27 ++ .../slrs/wgdCensusZ/dao/WgdMeetCostDao.java | 27 ++ .../slrs/wgdCensusZ/entity/WgdAssocCost.java | 48 ++ .../slrs/wgdCensusZ/entity/WgdAssocInfo.java | 144 ++++++ .../slrs/wgdCensusZ/entity/WgdCommiInfo.java | 76 +++ .../wgdCensusZ/entity/WgdExReviseCost.java | 42 ++ .../slrs/wgdCensusZ/entity/WgdMeetCost.java | 49 ++ .../service/IWgdAssocCostService.java | 26 + .../service/IWgdAssocInfoService.java | 25 + .../service/IWgdCommiInfoService.java | 26 + .../service/IWgdExReviseCostService.java | 26 + .../service/IWgdMeetCostService.java | 26 + .../service/impl/WgdAssocCostServiceImpl.java | 64 +++ .../service/impl/WgdAssocInfoServiceImpl.java | 62 +++ .../service/impl/WgdCommiInfoServiceImpl.java | 65 +++ .../impl/WgdExReviseCostServiceImpl.java | 64 +++ .../service/impl/WgdMeetCostServiceImpl.java | 63 +++ .../esRevisePlan/EsRevisePlanMapper.xml | 195 ++++++++ .../mapper/wgdCensusZ/WgdAssocCostMapper.xml | 148 ++++++ .../mapper/wgdCensusZ/WgdAssocInfoMapper.xml | 456 ++++++++++++++++++ .../mapper/wgdCensusZ/WgdCommiInfoMapper.xml | 36 ++ .../wgdCensusZ/WgdExReviseCostMapper.xml | 35 ++ .../mapper/wgdCensusZ/WgdMeetCostMapper.xml | 36 ++ 37 files changed, 2421 insertions(+), 2 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java new file mode 100644 index 00000000..e179e933 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -0,0 +1,73 @@ +package com.adc.da.slrs.esRevisePlan.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 企标制修订计划 前端控制器 + *

+* +* @author zcr +* @since 2021-11-14 +*/ +@RestController +@Api(description = "|EsRevisePlan|") +@RequestMapping("api/esRevisePlan/es-revise-plan") +public class EsRevisePlanController extends BaseController { + + @Autowired + IEsRevisePlanService iEsRevisePlanService; + + @ApiOperation(value = "获取所有企标计划") + @GetMapping("getAllPlans") + public ResponseMessage getAllPlans(){ + return Result.success(iEsRevisePlanService.getAllPlans()); + } + + @ApiOperation(value = "多条件查询企标计划") + @PostMapping("queryAllPlans") + public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.queryAllPlans(esRevisePlan)); + } + + @ApiOperation(value = "获取单个企标计划详情") + @GetMapping("getPlanInfo") + public ResponseMessage getPlanInfo(String id){ + return Result.success(iEsRevisePlanService.getOnePlan(id)); + } + + @ApiOperation(value = "编辑企标计划") + @PostMapping("modPlan") + public ResponseMessage modPlan(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); + } + + @ApiOperation(value = "添加企标计划") + @PostMapping("addPlan") + public ResponseMessage addPlan(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); + } + + @ApiOperation(value = "删除单个企标计划") + @GetMapping("delPlan") + public ResponseMessage delPlan(String id){ + return Result.success(iEsRevisePlanService.delPlan(id)); + } + + @ApiOperation(value = "批量删除企标计划") + @GetMapping("delPlans") + public ResponseMessage delPlans(String ids){ + return Result.success(iEsRevisePlanService.delPlans(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java new file mode 100644 index 00000000..fd735200 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.esRevisePlan.dao; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 企标制修订计划 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +public interface EsRevisePlanDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(EsRevisePlan esRevisePlan);//多条件查询 + EsRevisePlan selectOne(String id);//查询详情 + + int updateOne(EsRevisePlan esRevisePlan);//编辑 + int insertOne(EsRevisePlan esRevisePlan);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java new file mode 100644 index 00000000..5f2b2a39 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -0,0 +1,59 @@ +package com.adc.da.slrs.esRevisePlan.entity; + +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + + +/** + *

+ * 企标制修订计划 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="EsRevisePlan对象", description="企标制修订计划") +public class EsRevisePlan{ + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "企标名称") + private String esName; + + @ApiModelProperty(value = "计划状态") + private String planStatus; + + @ApiModelProperty(value = "制修订状态") + private String reviseStatus; + + @ApiModelProperty(value = "起草人") + private String drafter; + + @ApiModelProperty(value = "评审责任人") + private String resPerson; + + @ApiModelProperty(value = "工作组组长") + private String wgLeader; + + @ApiModelProperty(value = "计划标准初稿完成时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date draftTime; + + @ApiModelProperty(value = "计划标准发布时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date releaseTime; + + @ApiModelProperty(value = "起草责任单位") + private String unit; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java new file mode 100644 index 00000000..bf8c6239 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.esRevisePlan.service; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 企标制修订计划 服务类 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +public interface IEsRevisePlanService extends IService { + List getAllPlans();//查询所有 + List queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询 + EsRevisePlan getOnePlan(String id);//查询详情 + + int modPlan(EsRevisePlan esRevisePlan);//编辑 + int addPlan(EsRevisePlan esRevisePlan);//插入 + int delPlan(String id);//删除 + int delPlans(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java new file mode 100644 index 00000000..31942a44 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -0,0 +1,63 @@ +package com.adc.da.slrs.esRevisePlan.service.impl; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 企标制修订计划 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +@Service +public class EsRevisePlanServiceImpl extends ServiceImpl implements IEsRevisePlanService { + + @Autowired + EsRevisePlanDao esRevisePlanDao; + + @Override + public List getAllPlans() { + return esRevisePlanDao.selectAll(); + } + + @Override + public List queryAllPlans(EsRevisePlan esRevisePlan) { + return esRevisePlanDao.queryAll(esRevisePlan); + } + + @Override + public EsRevisePlan getOnePlan(String id) { + return esRevisePlanDao.selectOne(id); + } + + @Override + public int modPlan(EsRevisePlan esRevisePlan) { + return esRevisePlanDao.updateOne(esRevisePlan); + } + + @Override + public int addPlan(EsRevisePlan esRevisePlan) { + esRevisePlan.setId(UUIDUtils.randomUUID(32)); + return esRevisePlanDao.insertOne(esRevisePlan); + } + + @Override + public int delPlan(String id) { + return esRevisePlanDao.deleteOne(id); + } + + @Override + public int delPlans(String ids) { + String[] str = ids.split(","); + return esRevisePlanDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java index 3d5997dc..7ec0369e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java @@ -55,13 +55,13 @@ public class SapMeetingController extends BaseController { return sapMeetingService.getMeetingsByMonth(date, type); } - @ApiOperation(value = "获取当天") + @ApiOperation(value = "获取当天列表") @GetMapping("/getMeetingsByDate") public List getMeetingsByDate(@DateTimeFormat(pattern = "yyyy-MM-dd") Date date,int type){ return sapMeetingService.getMeetingsByDate(date,type); } - @ApiOperation(value = "插入") + @ApiOperation(value = "插入会议") @PostMapping("/addMeeting") public int addMeeting(@RequestBody SapMeeting sapMeeting){ return sapMeetingService.addMeeting(sapMeeting); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java new file mode 100644 index 00000000..2a4cae2c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java @@ -0,0 +1,66 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService; +import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 协会费用信息统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdAssocCost|") +@RequestMapping("api/wgdCensusZ/wgd-assoc-cost") +public class WgdAssocCostController extends BaseController { + + @Autowired + IWgdAssocCostService iWgdAssocCostService; + + @GetMapping("getAllAssocCosts") + public ResponseMessage getAllWgdAssocCosts(){//查询所有 + return Result.success(iWgdAssocCostService.getAllWgdAssocCosts()); + } + + @PostMapping("queryAllAssocCosts") + public ResponseMessage queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询 + return Result.success(iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost)); + } + + @GetMapping("getAssocCostById") + public ResponseMessage getWgdAssocCostById(String id) {//查询详情 + return Result.success(iWgdAssocCostService.getWgdAssocCostById(id)); + } + + @PostMapping("modAssocCost") + ResponseMessage updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑 + return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost)); + } + + @PostMapping("addAssocCost") + ResponseMessage insertWgdAssocCost(WgdAssocCost wgdAssocCost) {//插入 + return Result.success(iWgdAssocCostService.insertWgdAssocCost(wgdAssocCost)); + } + + @GetMapping("delAssocCost") + ResponseMessage deleteWgdAssocCost(String id){//删除 + return Result.success(iWgdAssocCostService.deleteWgdAssocCost(id)); + } + + @GetMapping("delAssocCosts") + ResponseMessage deleteWgdAssocCosts(String ids){//批量删除 + return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java new file mode 100644 index 00000000..2a3b53e4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 协会信息数据统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdAssocInfo|") +@RequestMapping("api/wgdCensusZ/wgd-assoc-info") +public class WgdAssocInfoController extends BaseController { + @Autowired + IWgdAssocInfoService iWgdAssocInfoService; + + @GetMapping("getAllAssocInfos") + public List getAllWgdAssocInfos(){//查询所有 + return iWgdAssocInfoService.getAllWgdAssocInfos(); + } + + @PostMapping("queryAllAssocInfos") + public List queryAllWgdAssocInfos(WgdAssocInfo WgdAssocInfo){//多条件查询 + return iWgdAssocInfoService.queryAllWgdAssocInfos(WgdAssocInfo); + } + + @GetMapping("getAssocInfoById") + public WgdAssocInfo getWgdAssocInfoById(String id) {//查询详情 + return iWgdAssocInfoService.getWgdAssocInfoById(id); + } + + @PostMapping("modAssocInfo") + int updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑 + return iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo); + } + + @PostMapping("addAssocInfo") + int insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入 + return iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo); + } + + @GetMapping("delAssocInfo") + int deleteWgdAssocInfo(String id){//删除 + return iWgdAssocInfoService.deleteWgdAssocInfo(id); + } + + @GetMapping("delAssocInfos") + int deleteWgdAssocInfos(String ids){//批量删除 + return iWgdAssocInfoService.deleteWgdAssocInfos(ids); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java new file mode 100644 index 00000000..a1440258 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 委员信息数据统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdCommiInfo|") +@RequestMapping("api/wgdCensusZ/wgd-commi-info") +public class WgdCommiInfoController extends BaseController { + @Autowired + IWgdCommiInfoService iWgdCommiInfoService; + + @GetMapping("getAllCommiInfos") + public List getAllWgdCommiInfos(){//查询所有 + return iWgdCommiInfoService.getAllWgdCommiInfos(); + } + + @PostMapping("queryAllCommiInfos") + public List queryAllWgdCommiInfos(WgdCommiInfo WgdCommiInfo){//多条件查询 + return iWgdCommiInfoService.queryAllWgdCommiInfos(WgdCommiInfo); + } + + @GetMapping("getCommiInfoById") + public WgdCommiInfo getWgdCommiInfoById(String id) {//查询详情 + return iWgdCommiInfoService.getWgdCommiInfoById(id); + } + + @PostMapping("modCommiInfo") + int updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑 + return iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo); + } + + @PostMapping("addCommiInfo") + int insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入 + return iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo); + } + + @GetMapping("delCommiInfo") + int deleteWgdCommiInfo(String id){//删除 + return iWgdCommiInfoService.deleteWgdCommiInfo(id); + } + + @GetMapping("delCommiInfos") + int deleteWgdCommiInfos(String ids){//批量删除 + return iWgdCommiInfoService.deleteWgdCommiInfos(ids); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java new file mode 100644 index 00000000..423f5c7b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; +import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 参与外部标准制修订费用统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdExReviseCost|") +@RequestMapping("api/wgdCensusZ/wgd-ex-revise-cost") +public class WgdExReviseCostController extends BaseController { + @Autowired + IWgdExReviseCostService iWgdExReviseCostService; + + @GetMapping("getAllExReviseCosts") + public List getAllWgdExReviseCosts(){//查询所有 + return iWgdExReviseCostService.getAllWgdExReviseCosts(); + } + + @PostMapping("queryAllExReviseCosts") + public List queryAllWgdExReviseCosts(WgdExReviseCost WgdExReviseCost){//多条件查询 + return iWgdExReviseCostService.queryAllWgdExReviseCosts(WgdExReviseCost); + } + + @GetMapping("getExReviseCostById") + public WgdExReviseCost getWgdExReviseCostById(String id) {//查询详情 + return iWgdExReviseCostService.getWgdExReviseCostById(id); + } + + @PostMapping("modExReviseCost") + int updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑 + return iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost); + } + + @PostMapping("addExReviseCost") + int insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入 + return iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost); + } + + @GetMapping("delExReviseCost") + int deleteWgdExReviseCost(String id){//删除 + return iWgdExReviseCostService.deleteWgdExReviseCost(id); + } + + @GetMapping("delExReviseCosts") + int deleteWgdExReviseCosts(String ids){//批量删除 + return iWgdExReviseCostService.deleteWgdExReviseCosts(ids); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java new file mode 100644 index 00000000..595b993a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 参会费用信息统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdMeetCost|") +@RequestMapping("api/wgdCensusZ/wgd-meet-cost") +public class WgdMeetCostController extends BaseController { + @Autowired + IWgdMeetCostService iWgdMeetCostService; + + @GetMapping("getAllMeetCosts") + public List getAllWgdMeetCosts(){//查询所有 + return iWgdMeetCostService.getAllWgdMeetCosts(); + } + + @PostMapping("queryAllMeetCosts") + public List queryAllWgdMeetCosts(WgdMeetCost WgdMeetCost){//多条件查询 + return iWgdMeetCostService.queryAllWgdMeetCosts(WgdMeetCost); + } + + @GetMapping("getMeetCostById") + public WgdMeetCost getWgdMeetCostById(String id) {//查询详情 + return iWgdMeetCostService.getWgdMeetCostById(id); + } + + @PostMapping("modMeetCost") + int updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑 + return iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost); + } + + @PostMapping("addMeetCost") + int insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入 + return iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost); + } + + @GetMapping("delMeetCost") + int deleteWgdMeetCost(String id){//删除 + return iWgdMeetCostService.deleteWgdMeetCost(id); + } + + @GetMapping("delMeetCosts") + int deleteWgdMeetCosts(String ids){//批量删除 + return iWgdMeetCostService.deleteWgdMeetCosts(ids); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java new file mode 100644 index 00000000..e5f25c50 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 协会费用信息统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdAssocCostDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdAssocCost wgdAssocCost);//多条件查询 + WgdAssocCost selectOne(String id);//查询详情 + + int updateOne(WgdAssocCost wgdAssocCost);//编辑 + int insertOne(WgdAssocCost wgdAssocCost);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java new file mode 100644 index 00000000..1630539b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 协会信息数据统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdAssocInfoDao extends BaseMapper { + + List selectAll();//查询所有 + List queryAll(WgdAssocInfo wgdAssocInfo);//多条件查询 + WgdAssocInfo selectOne(String id);//查询详情 + + int updateOne(WgdAssocInfo wgdAssocInfo);//编辑 + int insertOne(WgdAssocInfo wgdAssocInfo);//插入 + int deleteOne(String id);//删除 + int deleteBatch();//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java new file mode 100644 index 00000000..d8833d51 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 委员信息数据统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdCommiInfoDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdCommiInfo wgdCommiInfo);//多条件查询 + WgdCommiInfo selectOne(String id);//查询详情 + + int updateOne(WgdCommiInfo wgdCommiInfo);//编辑 + int insertOne(WgdCommiInfo wgdCommiInfo);//插入 + int deleteOne(String id);//删除 + int deleteBatch();//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java new file mode 100644 index 00000000..11ff1eb4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 参与外部标准制修订费用统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdExReviseCostDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdExReviseCost wgdExReviseCost);//多条件查询 + WgdExReviseCost selectOne(String id);//查询详情 + + int updateOne(WgdExReviseCost wgdExReviseCost);//编辑 + int insertOne(WgdExReviseCost wgdExReviseCost);//插入 + int deleteOne(String id);//删除 + int deleteBatch();//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java new file mode 100644 index 00000000..a8b7f934 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 参会费用信息统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdMeetCostDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdMeetCost wgdMeetCost);//多条件查询 + WgdMeetCost selectOne(String id);//查询详情 + + int updateOne(WgdMeetCost wgdMeetCost);//编辑 + int insertOne(WgdMeetCost wgdMeetCost);//插入 + int deleteOne(String id);//删除 + int deleteBatch();//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java new file mode 100644 index 00000000..923aa253 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java @@ -0,0 +1,48 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

+ * 协会费用信息统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdAssocCost对象", description="协会费用信息统计") +public class WgdAssocCost { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会费标准") + private String payStandard; + + @ApiModelProperty(value = "实际发生") + private String payReality; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + @ApiModelProperty(value = "每年缴费情况") + private String annualPayment; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java new file mode 100644 index 00000000..7cf4c87c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java @@ -0,0 +1,144 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * 协会信息数据统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计") +public class WgdAssocInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会员角色") + private String role; + + @ApiModelProperty(value = "参与人") + private String attend; + + @ApiModelProperty(value = "标准") + private String standard; + + @ApiModelProperty(value = "标准负责人") + private String charge; + + @ApiModelProperty(value = "责任领导") + private String leader; + + @ApiModelProperty(value = "初始入会时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date iniTime; + + @ApiModelProperty(value = "本届入会时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date curTime; + + @ApiModelProperty(value = "费用标准") + private String costStandard; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + @ApiModelProperty(value = "上次缴纳时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lastPayTime; + + @ApiModelProperty(value = "缴费年限") + private String payPeriod; + + @ApiModelProperty(value = "经办人") + private String handler; + + @ApiModelProperty(value = "部门") + private String department; + + @ApiModelProperty(value = "协会性质") + private String asProper; + + @ApiModelProperty(value = "协会状态") + private String asStatus; + + @ApiModelProperty(value = "协会联络人") + private String asContact; + + @ApiModelProperty(value = "协会联络人电话") + private String tel; + + @ApiModelProperty(value = "协会联络人邮箱") + private String mail; + + @ApiModelProperty(value = "2017缴费") + private String p17; + + @ApiModelProperty(value = "2018缴费") + private String p18; + + @ApiModelProperty(value = "2019缴费") + private String p19; + + @ApiModelProperty(value = "2020缴费") + private String p20; + + @ApiModelProperty(value = "2021缴费") + private String p21; + + @ApiModelProperty(value = "2022缴费") + private String p22; + + @ApiModelProperty(value = "2023缴费") + private String p23; + + @ApiModelProperty(value = "2024缴费") + private String p24; + + @ApiModelProperty(value = "2025缴费") + private String p25; + + @ApiModelProperty(value = "2026缴费") + private String p26; + + @ApiModelProperty(value = "2027缴费") + private String p27; + + @ApiModelProperty(value = "2028缴费") + private String p28; + + @ApiModelProperty(value = "2029缴费") + private String p29; + + @ApiModelProperty(value = "2030缴费") + private String p30; + + @ApiModelProperty(value = "2031缴费") + private String p31; + + @ApiModelProperty(value = "2032缴费") + private String p32; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java new file mode 100644 index 00000000..f8d4bd6c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java @@ -0,0 +1,76 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * 委员信息数据统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计") +public class WgdCommiInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "提报单位名称") + private String unit; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会员角色") + private String role; + + @ApiModelProperty(value = "参与人") + private String attend; + + @ApiModelProperty(value = "本届入会时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date curTime; + + @ApiModelProperty(value = "职务") + private String job; + + @ApiModelProperty(value = "所在部门") + private String department; + + @ApiModelProperty(value = "联系方式") + private String tel; + + @ApiModelProperty(value = "任期") + private String term; + + @ApiModelProperty(value = "证书") + private String certificate; + + @ApiModelProperty(value = "账号") + private String account; + + @ApiModelProperty(value = "密码") + private String password; + + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java new file mode 100644 index 00000000..56af460e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java @@ -0,0 +1,42 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

+ * 参与外部标准制修订费用统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计") +public class WgdExReviseCost { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "类型") + private String type; + + @ApiModelProperty(value = "项目编号") + private String proId; + + @ApiModelProperty(value = "项目名称") + private String proName; + + @ApiModelProperty(value = "费用列支项") + private String costOutlay; + + @ApiModelProperty(value = "费用支出") + private String cost; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java new file mode 100644 index 00000000..9c6fbff3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java @@ -0,0 +1,49 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * 参会费用信息统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdMeetCost对象", description="参会费用信息统计") +public class WgdMeetCost { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "主办单位") + private String unit; + + @ApiModelProperty(value = "会议名称") + private String meetName; + + @ApiModelProperty(value = "会议时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date meetTime; + + @ApiModelProperty(value = "会费标准") + private String payStandard; + + @ApiModelProperty(value = "实际发生") + private String payReality; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java new file mode 100644 index 00000000..323fe734 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java @@ -0,0 +1,26 @@ +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.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 协会费用信息统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdAssocCostService extends IService { + List getAllWgdAssocCosts();//查询所有 + List queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost);//多条件查询 + WgdAssocCost getWgdAssocCostById(String id);//查询详情 + + int updateWgdAssocCost(WgdAssocCost wgdAssocCost);//编辑 + int insertWgdAssocCost(WgdAssocCost wgdAssocCost);//插入 + int deleteWgdAssocCost(String id);//删除 + int deleteWgdAssocCosts(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java new file mode 100644 index 00000000..e6d18c29 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusZ.service; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 协会信息数据统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdAssocInfoService extends IService { + List getAllWgdAssocInfos();//查询所有 + List queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo);//多条件查询 + WgdAssocInfo getWgdAssocInfoById(String id);//查询详情 + + int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//编辑 + int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//插入 + int deleteWgdAssocInfo(String id);//删除 + int deleteWgdAssocInfos(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java new file mode 100644 index 00000000..292efa56 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusZ.service; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 委员信息数据统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdCommiInfoService extends IService { + List getAllWgdCommiInfos();//查询所有 + List queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo);//多条件查询 + WgdCommiInfo getWgdCommiInfoById(String id);//查询详情 + + int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo);//编辑 + int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo);//插入 + int deleteWgdCommiInfo(String id);//删除 + int deleteWgdCommiInfos(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java new file mode 100644 index 00000000..14e3ba95 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java @@ -0,0 +1,26 @@ +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 java.util.List; + +/** + *

+ * 参与外部标准制修订费用统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdExReviseCostService extends IService { + List getAllWgdExReviseCosts();//查询所有 + List queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost);//多条件查询 + WgdExReviseCost getWgdExReviseCostById(String id);//查询详情 + + int updateWgdExReviseCost(WgdExReviseCost wgdExReviseCost);//编辑 + int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost);//插入 + int deleteWgdExReviseCost(String id);//删除 + int deleteWgdExReviseCosts(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java new file mode 100644 index 00000000..908def81 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusZ.service; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 参会费用信息统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdMeetCostService extends IService { + List getAllWgdMeetCosts();//查询所有 + List queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost);//多条件查询 + WgdMeetCost getWgdMeetCostById(String id);//查询详情 + + int updateWgdMeetCost(WgdMeetCost wgdMeetCost);//编辑 + int insertWgdMeetCost(WgdMeetCost wgdMeetCost);//插入 + int deleteWgdMeetCost(String id);//删除 + int deleteWgdMeetCosts(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java new file mode 100644 index 00000000..54fe553c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java @@ -0,0 +1,64 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + *

+ * 协会费用信息统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdAssocCostServiceImpl extends ServiceImpl implements IWgdAssocCostService { + + @Autowired + WgdAssocCostDao wgdAssocCostDao; + + @Override + public List getAllWgdAssocCosts() { + return wgdAssocCostDao.selectAll(); + } + + @Override + public List queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost) { + return wgdAssocCostDao.queryAll(wgdAssocCost); + } + + @Override + public WgdAssocCost getWgdAssocCostById(String id) { + return wgdAssocCostDao.selectOne(id); + } + + @Override + public int updateWgdAssocCost(WgdAssocCost wgdAssocCost) { + return wgdAssocCostDao.updateOne(wgdAssocCost); + } + + @Override + public int insertWgdAssocCost(WgdAssocCost wgdAssocCost) { + wgdAssocCost.setId(UUIDUtils.randomUUID(32)); + return wgdAssocCostDao.insertOne(wgdAssocCost); + } + + @Override + public int deleteWgdAssocCost(String id) { + return wgdAssocCostDao.deleteOne(id); + } + + @Override + public int deleteWgdAssocCosts(String ids) { + String[] str = ids.split(","); + return wgdAssocCostDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java new file mode 100644 index 00000000..b4c2e382 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +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.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 协会信息数据统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdAssocInfoServiceImpl extends ServiceImpl implements IWgdAssocInfoService { + + @Autowired + WgdAssocInfoDao wgdAssocInfoDao; + + @Override + public List getAllWgdAssocInfos() { + return wgdAssocInfoDao.selectAll(); + } + + @Override + public List queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo) { + return wgdAssocInfoDao.queryAll(wgdAssocInfo); + } + + @Override + public WgdAssocInfo getWgdAssocInfoById(String id) { + return wgdAssocInfoDao.selectById(id); + } + + @Override + public int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo) { + return wgdAssocInfoDao.updateOne(wgdAssocInfo); + } + + @Override + public int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo) { + wgdAssocInfo.setId(UUIDUtils.randomUUID(32)); + return wgdAssocInfoDao.insertOne(wgdAssocInfo); + } + + @Override + public int deleteWgdAssocInfo(String id) { + return wgdAssocInfoDao.deleteOne(id); + } + + @Override + public int deleteWgdAssocInfos(String ids) { + return wgdAssocInfoDao.deleteBatch(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java new file mode 100644 index 00000000..3c1a8059 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +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.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 委员信息数据统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdCommiInfoServiceImpl extends ServiceImpl implements IWgdCommiInfoService { + + @Autowired + WgdCommiInfoDao wgdCommiInfoDao; + + + @Override + public List getAllWgdCommiInfos() { + return wgdCommiInfoDao.selectAll(); + } + + @Override + public List queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo) { + return wgdCommiInfoDao.queryAll(wgdCommiInfo); + } + + @Override + public WgdCommiInfo getWgdCommiInfoById(String id) { + return wgdCommiInfoDao.selectById(id); + } + + @Override + public int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo) { + return wgdCommiInfoDao.updateOne(wgdCommiInfo); + } + + @Override + public int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo) { + wgdCommiInfo.setId(UUIDUtils.randomUUID(32)); + wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword())); + return wgdCommiInfoDao.insertOne(wgdCommiInfo); + } + + @Override + public int deleteWgdCommiInfo(String id) { + return wgdCommiInfoDao.deleteOne(id); + } + + @Override + public int deleteWgdCommiInfos(String ids) { + return wgdCommiInfoDao.deleteBatch(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java new file mode 100644 index 00000000..adc1198f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java @@ -0,0 +1,64 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +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.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 参与外部标准制修订费用统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdExReviseCostServiceImpl extends ServiceImpl implements IWgdExReviseCostService { + + @Autowired + WgdExReviseCostDao wgdExReviseCostDao; + + + @Override + public List getAllWgdExReviseCosts() { + return wgdExReviseCostDao.selectAll(); + } + + @Override + public List queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost) { + return wgdExReviseCostDao.queryAll(wgdExReviseCost); + } + + @Override + public WgdExReviseCost getWgdExReviseCostById(String id) { + return wgdExReviseCostDao.selectById(id); + } + + @Override + public int updateWgdExReviseCost(WgdExReviseCost wgdExReviseCost) { + return wgdExReviseCostDao.updateOne(wgdExReviseCost); + } + + @Override + public int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost) { + wgdExReviseCost.setId(UUIDUtils.randomUUID(32)); + return wgdExReviseCostDao.insertOne(wgdExReviseCost); + } + + @Override + public int deleteWgdExReviseCost(String id) { + return wgdExReviseCostDao.deleteOne(id); + } + + @Override + public int deleteWgdExReviseCosts(String ids) { + return wgdExReviseCostDao.deleteBatch(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java new file mode 100644 index 00000000..ee98a8d0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java @@ -0,0 +1,63 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +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.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 参会费用信息统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdMeetCostServiceImpl extends ServiceImpl implements IWgdMeetCostService { + + @Autowired + WgdMeetCostDao wgdMeetCostDao; + + @Override + public List getAllWgdMeetCosts() { + return wgdMeetCostDao.selectAll(); + } + + @Override + public List queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost) { + return wgdMeetCostDao.queryAll(wgdMeetCost); + } + + @Override + public WgdMeetCost getWgdMeetCostById(String id) { + return wgdMeetCostDao.selectById(id); + } + + @Override + public int updateWgdMeetCost(WgdMeetCost wgdMeetCost) { + return wgdMeetCostDao.updateOne(wgdMeetCost); + } + + @Override + public int insertWgdMeetCost(WgdMeetCost wgdMeetCost) { + wgdMeetCost.setId(UUIDUtils.randomUUID(32)); + return wgdMeetCostDao.insertOne(wgdMeetCost); + } + + @Override + public int deleteWgdMeetCost(String id) { + return wgdMeetCostDao.deleteOne(id); + } + + @Override + public int deleteWgdMeetCosts(String ids) { + return wgdMeetCostDao.deleteBatch(); + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml new file mode 100644 index 00000000..6cea67c4 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -0,0 +1,195 @@ + + + + + + id, + es_name, + plan_status, + revise_status, + drafter, + res_person, + wg_leader, + draft_time, + release_time, + unit + + + + + + + + + + + + + + + + + + and id = #{id} + + + and es_name like concat('%',#{esName},'%') + + + and plan_status = #{planStatus} + + + and revise_status = #{reviseStatus} + + + and drafter = #{drafter} + + + and res_person = #{resPerson} + + + and wg_leader = #{wgLeader} + + + and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d') + + + and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') + + + and unit like concat('%',#{unit},'%') + + + + + + + + + + + + update es_revise_plan + + + id = #{id}, + + + es_name = #{esName}, + + + plan_status = #{planStatus}, + + + revise_status = #{reviseStatus}, + + + drafter = #{drafter}, + + + res_person = #{resPerson}, + + + wg_leader = #{wgLeader}, + + + draft_time = #{draftTime}, + + + release_time = #{releaseTime}, + + + unit = #{unit}, + + + where id = #{id} + + + + insert into es_revise_plan + + + id, + + + es_name, + + + plan_status, + + + revise_status, + + + drafter, + + + res_person, + + + wg_leader, + + + draft_time, + + + release_time, + + + unit, + + + values + + + #{id}, + + + #{esName}, + + + #{planStatus}, + + + #{reviseStatus}, + + + #{drafter}, + + + #{resPerson}, + + + #{wgLeader}, + + + #{draftTime}, + + + #{releaseTime}, + + + #{unit}, + + + + + + delete from es_revise_plan where id = #{id} + + + + delete from es_revise_plan where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml new file mode 100644 index 00000000..aa3a16da --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml @@ -0,0 +1,148 @@ + + + + + + + id,sc_name,ssc_name,wg_name,pay_standard,pay_reality,cost_outlay,annual_payment + + + + + + and id = #{id} + + + and sc_name like concat('%',#{scName},'%') + + + and ssc_name like concat('%',#{sscName},'%') + + + and wg_name like concat('%',#{wgName},'%') + + + and pay_standard = #{payStandard} + + + and pay_reality = #{payReality} + + + and cost_outlay = #{costOutlay} + + + and annual_payment = #{annualPayment} + + + + + + + + + + + + update wgd_assoc_cost + + + sc_name = #{scName}, + + + ssc_name = #{sscName}, + + + wg_name = #{wgName}, + + + pay_standard = #{payStandard}, + + + pay_reality = #{payReality}, + + + cost_outlay = #{costOutlay}, + + + annual_payment = #{annualPayment}, + + + where id = #{id} + + + + insert into wgd_assoc_cost + + + id, + + + sc_name, + + + ssc_name, + + + wg_name, + + + pay_standard, + + + pay_reality, + + + cost_outlay, + + + annual_payment, + + + values + + + #{id}, + + + #{scName}, + + + #{sscName}, + + + #{wgName}, + + + #{payStandard}, + + + #{payReality}, + + + #{costOutlay}, + + + #{annualPayment}, + + + + + + delete from wgd_assoc_cost where id = #{id} + + + + delete from wgd_assoc_cost where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml new file mode 100644 index 00000000..4cd1b820 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml @@ -0,0 +1,456 @@ + + + + + + id,sc_name,ssc_name,wg_name,role,attend,standard,charge,leader,ini_time, + cur_time,cost_standard,cost_outlay,last_pay_time,pay_period,handler, + department,as_proper,as_status,as_contact,tel,mail, + p17,p18,p19,p20,p21,p22,p23,p34,p25,p26,p27,p28,p29,p30,p31,p32 + + + + + and id = #{id} + + + and sc_name like concat('%',#{scName},'%') + + + and ssc_name like concat('%',#{sscName},'%') + + + and wg_name like concat('%',#{wgName},'%') + + + and role = #{role} + + + and attend = #{attend} + + + and standard = #{standard} + + + and charge = #{charge} + + + and leader = #{leader} + + + and ini_time = #{iniTime} + + + and cur_time = #{curTime} + + + and cost_standard = #{costStandard} + + + and cost_outlay = #{costOutlay} + + + and last_pay_time = #{lastPayTime} + + + and pay_period = #{payPeriod} + + + and handler = #{handler} + + + and department = #{department} + + + and as_proper = #{asProper} + + + and as_status = #{asStatus} + + + and as_contact = #{asContact} + + + and tel = #{tel} + + + and mail = #{mail} + + + + + + + + + update wgd_assoc_info + + + sc_name = #{scName}, + + + ssc_name = #{sscName}, + + + wg_name = #{wgName}, + + + role = #{role}, + + + attend = #{attend}, + + + standard = #{standard}, + + + charge = #{charge}, + + + leader = #{leader}, + + + ini_time = #{iniTime}, + + + cur_time = #{curTime}, + + + cost_standard = #{costStandard}, + + + cost_outlay = #{costOutlay}, + + + last_pay_time = #{lastPayTime}, + + + pay_period = #{payPeriod}, + + + handler = #{handler}, + + + department = #{department}, + + + as_proper = #{asProper}, + + + as_status = #{asStatus}, + + + as_contact = #{asContact}, + + + tel = #{tel}, + + + mail = #{mail}, + + + p17 = #{p17}, + + + p18 = #{p18}, + + + p19 = #{p19}, + + + p20 = #{p20}, + + + p21 = #{p21}, + + + p22 = #{p22}, + + + p23 = #{p23}, + + + p24 = #{p24}, + + + p25 = #{p25}, + + + p26 = #{p26}, + + + p27 = #{p27}, + + + p28 = #{p28}, + + + p29 = #{p29}, + + + p30 = #{p30}, + + + p31 = #{p31}, + + + p32 = #{p32}, + + + where id = #{id} + + + insert into wgd_assoc_info + + + id, + + + sc_name, + + + ssc_name, + + + wg_name, + + + role, + + + attend, + + + standard, + + + charge, + + + leader, + + + ini_time, + + + cur_time, + + + cost_standard, + + + cost_outlay, + + + last_pay_time, + + + pay_period, + + + handler, + + + department, + + + as_proper, + + + as_status, + + + as_contact, + + + tel, + + + mail, + + + p17, + + + p18, + + + p19, + + + p20, + + + p21, + + + p22, + + + p23, + + + p24, + + + p25, + + + p26, + + + p27, + + + p28, + + + p29, + + + p30, + + + p31, + + + p32, + + + values + + + #{id}, + + + #{scName}, + + + #{sscName}, + + + #{wgName}, + + + #{role}, + + + #{attend}, + + + #{standard}, + + + #{charge}, + + + #{leader}, + + + #{iniTime}, + + + #{curTime}, + + + #{costStandard}, + + + #{costOutlay}, + + + #{lastPayTime}, + + + #{payPeriod}, + + + #{handler}, + + + #{department}, + + + #{asProper}, + + + #{asStatus}, + + + #{asContact}, + + + #{tel}, + + + #{mail}, + + + #{p17}, + + + #{p18}, + + + #{p19}, + + + #{p20}, + + + #{p21}, + + + #{p22}, + + + #{p23}, + + + #{p24}, + + + #{p25}, + + + #{p26}, + + + #{p27}, + + + #{p28}, + + + #{p29}, + + + #{p30}, + + + #{p31}, + + + #{p32}, + + + + + delete from wgd_assoc_info where id = #{id} + + + delete from wgd_assoc_info where id in + + #{id} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml new file mode 100644 index 00000000..9b574587 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml @@ -0,0 +1,36 @@ + + + + + + id,unit,sc_name,ssc_name,wg_name,role,attend,cur_time,job,department, + tel,term,certificate,account,password,remark + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml new file mode 100644 index 00000000..911262e9 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml @@ -0,0 +1,35 @@ + + + + + + id,type,pro_id,pro_name,cost_outlay,cost + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml new file mode 100644 index 00000000..5a7b9b68 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml @@ -0,0 +1,36 @@ + + + + + + id,unit,meet_name,meet_time,pay_standard,pay_reality,cost_outlay + + + + + + + + + + + + + + + + + + + + + + From a15f3f4934edae700ded5bb6bb79097250423e96 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 15 Nov 2021 13:36:58 +0800 Subject: [PATCH 05/18] ~ --- .../controller/WgdCgfyController.java | 66 +++++++++++++ .../controller/WgdFyfyController.java | 65 +++++++++++++ .../controller/WgdSrbController.java | 65 +++++++++++++ .../controller/WgdWbtjController.java | 65 +++++++++++++ .../controller/WgdWbxdController.java | 65 +++++++++++++ .../controller/WgdZcbController.java | 65 +++++++++++++ .../da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java | 25 +++++ .../da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java | 25 +++++ .../da/slrs/wgdCensusLeo/dao/WgdSrbDao.java | 25 +++++ .../da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java | 25 +++++ .../da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java | 25 +++++ .../da/slrs/wgdCensusLeo/dao/WgdZcbDao.java | 25 +++++ .../da/slrs/wgdCensusLeo/entity/WgdCgfy.java | 46 +++++++++ .../da/slrs/wgdCensusLeo/entity/WgdFyfy.java | 52 +++++++++++ .../da/slrs/wgdCensusLeo/entity/WgdSrb.java | 45 +++++++++ .../da/slrs/wgdCensusLeo/entity/WgdWbtj.java | 70 ++++++++++++++ .../da/slrs/wgdCensusLeo/entity/WgdWbxd.java | 93 +++++++++++++++++++ .../da/slrs/wgdCensusLeo/entity/WgdZcb.java | 42 +++++++++ .../wgdCensusLeo/service/IWgdCgfyService.java | 37 ++++++++ .../wgdCensusLeo/service/IWgdFyfyService.java | 35 +++++++ .../wgdCensusLeo/service/IWgdSrbService.java | 35 +++++++ .../wgdCensusLeo/service/IWgdWbtjService.java | 35 +++++++ .../wgdCensusLeo/service/IWgdWbxdService.java | 35 +++++++ .../wgdCensusLeo/service/IWgdZcbService.java | 35 +++++++ .../service/impl/WgdCgfyServiceImpl.java | 63 +++++++++++++ .../service/impl/WgdFyfyServiceImpl.java | 62 +++++++++++++ .../service/impl/WgdSrbServiceImpl.java | 61 ++++++++++++ .../service/impl/WgdWbtjServiceImpl.java | 62 +++++++++++++ .../service/impl/WgdWbxdServiceImpl.java | 62 +++++++++++++ .../service/impl/WgdZcbServiceImpl.java | 62 +++++++++++++ .../mapper/wgdCensusLeo/WgdCgfyMapper.xml | 5 + .../mapper/wgdCensusLeo/WgdFyfyMapper.xml | 5 + .../mapper/wgdCensusLeo/WgdSrbMapper.xml | 5 + .../mapper/wgdCensusLeo/WgdWbtjMapper.xml | 5 + .../mapper/wgdCensusLeo/WgdWbxdMapper.xml | 5 + .../mapper/wgdCensusLeo/WgdZcbMapper.xml | 5 + 36 files changed, 1503 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java new file mode 100644 index 00000000..a15c77d7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java @@ -0,0 +1,66 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** +*

+ * 采购费用信息统计 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdCgfy|") +@RequestMapping("/wgdCensusLeo/wgd-cgfy") +public class WgdCgfyController extends BaseController { + + @Autowired + IWgdCgfyService iWgdCgfyService; + + @GetMapping("getAllCgfy") + public ResponseMessage getAllWgdCgfy(){//查询所有 + return Result.success(iWgdCgfyService.getAllWgdCgfy()); + } + + @PostMapping("queryAllCgfy") + public ResponseMessage queryAllWgdCgfy(WgdCgfy wgdCgfy){//多条件查询 + return Result.success(iWgdCgfyService.queryAllWgdCgfy(wgdCgfy)); + } + + @GetMapping("getCgfyById") + public ResponseMessage getWgdCgfyById(String id) {//查询详情 + return Result.success(iWgdCgfyService.getWgdCgfyById(id)); + } + + @PostMapping("modCgfy") + ResponseMessage updateWgdCgfy(WgdCgfy wgdCgfy) {//编辑 + return Result.success(iWgdCgfyService.updateWgdCgfy(wgdCgfy)); + } + + @PostMapping("addCgfy") + ResponseMessage insertWgdCgfy(WgdCgfy wgdCgfy) {//插入 + return Result.success(iWgdCgfyService.insertWgdCgfy(wgdCgfy)); + } + + @GetMapping("delCgfy") + ResponseMessage deleteWgdCgfy(String id){//删除 + return Result.success(iWgdCgfyService.deleteWgdCgfy(id)); + } + + @GetMapping("delCgfys") + ResponseMessage deleteWgdCgfys(String ids){//批量删除 + return Result.success(iWgdCgfyService.deleteWgdCgfy(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java new file mode 100644 index 00000000..eeefef57 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 翻译费用信息统计 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdFyfy|") +@RequestMapping("/wgdCensusLeo/wgd-fyfy") +public class WgdFyfyController extends BaseController { + @Autowired + IWgdFyfyService iWgdFyfyService; + + @GetMapping("getAllFyfy") + public ResponseMessage getAllWgdFyfy(){//查询所有 + return Result.success(iWgdFyfyService.getAllWgdFyfy()); + } + + @PostMapping("queryAllFyfy") + public ResponseMessage queryAllWgdCgfy(WgdFyfy wgdFyfy){//多条件查询 + return Result.success(iWgdFyfyService.queryAllWgdFyfy(wgdFyfy)); + } + + @GetMapping("getFyfyById") + public ResponseMessage getWgdFyfyById(String id) {//查询详情 + return Result.success(iWgdFyfyService.getWgdFyfyById(id)); + } + + @PostMapping("modFyfy") + ResponseMessage updateWgdFyfy(WgdFyfy wgdFyfy) {//编辑 + return Result.success(iWgdFyfyService.updateWgdFyfy(wgdFyfy)); + } + + @PostMapping("addFyfy") + ResponseMessage insertWgdFyfy(WgdFyfy wgdFyfy) {//插入 + return Result.success(iWgdFyfyService.insertWgdFyfy(wgdFyfy)); + } + + @GetMapping("delFyfy") + ResponseMessage deleteWgdFyfy(String id){//删除 + return Result.success(iWgdFyfyService.deleteWgdFyfy(id)); + } + + @GetMapping("delFyfys") + ResponseMessage deleteWgdFyfys(String ids){//批量删除 + return Result.success(iWgdFyfyService.deleteWgdFyfy(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java new file mode 100644 index 00000000..5b432de3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 标准制修订补助资金收支统计收入表 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdSrb|") +@RequestMapping("/wgdCensusLeo/wgd-srb") +public class WgdSrbController extends BaseController { + @Autowired + IWgdSrbService iWgdSrbService; + + @GetMapping("getAllSrb") + public ResponseMessage getAllWgdSrb(){//查询所有 + return Result.success(iWgdSrbService.getAllWgdSrb()); + } + + @PostMapping("queryAllSrb") + public ResponseMessage queryAllWgdSrb(WgdSrb wgdSrb){//多条件查询 + return Result.success(iWgdSrbService.queryAllWgdSrb(wgdSrb)); + } + + @GetMapping("getSrbById") + public ResponseMessage getWgdSrbById(String id) {//查询详情 + return Result.success(iWgdSrbService.getWgdSrbById(id)); + } + + @PostMapping("modSrb") + ResponseMessage updateWgdSrb(WgdSrb wgdSrb) {//编辑 + return Result.success(iWgdSrbService.updateWgdSrb(wgdSrb)); + } + + @PostMapping("addSrb") + ResponseMessage insertWgdSrb(WgdSrb wgdSrb) {//插入 + return Result.success(iWgdSrbService.insertWgdSrb(wgdSrb)); + } + + @GetMapping("delSrb") + ResponseMessage deleteWgdSrb(String id){//删除 + return Result.success(iWgdSrbService.deleteWgdSrb(id)); + } + + @GetMapping("delSrbs") + ResponseMessage deleteWgdSrbs(String ids){//批量删除 + return Result.success(iWgdSrbService.deleteWgdSrb(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java new file mode 100644 index 00000000..d8709374 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 参与外部协会会议统计 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdWbtj|") +@RequestMapping("/wgdCensusLeo/wgd-wbtj") +public class WgdWbtjController extends BaseController { + @Autowired + IWgdWbtjService iWgdWbtjService; + + @GetMapping("getAllWbtj") + public ResponseMessage getAllWgdWbtj(){//查询所有 + return Result.success(iWgdWbtjService.getAllWgdWbtj()); + } + + @PostMapping("queryAllWbtj") + public ResponseMessage queryAllWgdWbtj(WgdWbtj wgdWbtj){//多条件查询 + return Result.success(iWgdWbtjService.queryAllWgdWbtj(wgdWbtj)); + } + + @GetMapping("getWbtjById") + public ResponseMessage getWgdWbtjById(String id) {//查询详情 + return Result.success(iWgdWbtjService.getWgdWbtjById(id)); + } + + @PostMapping("modWbtj") + ResponseMessage updateWgdWbtj(WgdWbtj wgdWbtj) {//编辑 + return Result.success(iWgdWbtjService.updateWgdWbtj(wgdWbtj)); + } + + @PostMapping("addWbtj") + ResponseMessage insertWgdWbtj(WgdWbtj wgdWbtj) {//插入 + return Result.success(iWgdWbtjService.insertWgdWbtj(wgdWbtj)); + } + + @GetMapping("delWbtj") + ResponseMessage deleteWgdWbtj(String id){//删除 + return Result.success(iWgdWbtjService.deleteWgdWbtj(id)); + } + + @GetMapping("delWbtjs") + ResponseMessage deleteWgdWbtjs(String ids){//批量删除 + return Result.success(iWgdWbtjService.deleteWgdWbtj(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java new file mode 100644 index 00000000..799d66b7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 参与外部标准制修订信息统计 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdWbxd|") +@RequestMapping("/wgdCensusLeo/wgd-wbxd") +public class WgdWbxdController extends BaseController { + @Autowired + IWgdWbxdService iWgdWbxdService; + + @GetMapping("getAllWbxd") + public ResponseMessage getAllWgdWbxd(){//查询所有 + return Result.success(iWgdWbxdService.getAllWgdWbxd()); + } + + @PostMapping("queryAllWbxd") + public ResponseMessage queryAllWgdWbxd(WgdWbxd wgdWbxd){//多条件查询 + return Result.success(iWgdWbxdService.queryAllWgdWbxd(wgdWbxd)); + } + + @GetMapping("getWbxdById") + public ResponseMessage getWgdWbxdById(String id) {//查询详情 + return Result.success(iWgdWbxdService.getWgdWbxdById(id)); + } + + @PostMapping("modWbxd") + ResponseMessage updateWgdWbxd(WgdWbxd wgdWbxd) {//编辑 + return Result.success(iWgdWbxdService.updateWgdWbxd(wgdWbxd)); + } + + @PostMapping("addWbxd") + ResponseMessage insertWgdWbxd(WgdWbxd wgdWbxd) {//插入 + return Result.success(iWgdWbxdService.insertWgdWbxd(wgdWbxd)); + } + + @GetMapping("delWbxd") + ResponseMessage deleteWgdWbxd(String id){//删除 + return Result.success(iWgdWbxdService.deleteWgdWbxd(id)); + } + + @GetMapping("delWbxds") + ResponseMessage deleteWgdWbxds(String ids){//批量删除 + return Result.success(iWgdWbxdService.deleteWgdWbxd(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java new file mode 100644 index 00000000..3eb648b7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 标准制修订补助资金收支统计支出表 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdZcb|") +@RequestMapping("/wgdCensusLeo/wgd-zcb") +public class WgdZcbController extends BaseController { + @Autowired + IWgdZcbService iWgdZcbService; + + @GetMapping("getAllZcb") + public ResponseMessage getAllWgdZcb(){//查询所有 + return Result.success(iWgdZcbService.getAllWgdZcb()); + } + + @PostMapping("queryAllZcb") + public ResponseMessage queryAllWgdZcb(WgdZcb wgdZcb){//多条件查询 + return Result.success(iWgdZcbService.queryAllWgdZcb(wgdZcb)); + } + + @GetMapping("getZcbById") + public ResponseMessage getWgdZcbById(String id) {//查询详情 + return Result.success(iWgdZcbService.getWgdZcbById(id)); + } + + @PostMapping("modZcb") + ResponseMessage updateWgdZcb(WgdZcb wgdZcb) {//编辑 + return Result.success(iWgdZcbService.updateWgdZcb(wgdZcb)); + } + + @PostMapping("addZcb") + ResponseMessage insertWgdZcb(WgdZcb wgdZcb) {//插入 + return Result.success(iWgdZcbService.insertWgdZcb(wgdZcb)); + } + + @GetMapping("delZcb") + ResponseMessage deleteWgdZcb(String id){//删除 + return Result.success(iWgdZcbService.deleteWgdZcb(id)); + } + + @GetMapping("delZcbs") + ResponseMessage deleteWgdZcbs(String ids){//批量删除 + return Result.success(iWgdZcbService.deleteWgdZcb(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java new file mode 100644 index 00000000..f42f56f8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 采购费用信息统计 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdCgfyDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdCgfy wgdCgfy);//多条件查询 + WgdCgfy selectOne(String id);//查询详情 + + int updateOne(WgdCgfy wgdCgfy);//编辑 + int insertOne(WgdCgfy wgdCgfy);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java new file mode 100644 index 00000000..3be601a5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 翻译费用信息统计 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdFyfyDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdFyfy wgdFyfy);//多条件查询 + WgdFyfy selectOne(String id);//查询详情 + + int updateOne(WgdFyfy wgdFyfy);//编辑 + int insertOne(WgdFyfy wgdFyfy);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java new file mode 100644 index 00000000..e219f5cb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计收入表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdSrbDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdSrb wgdSrb);//多条件查询 + WgdSrb selectOne(String id);//查询详情 + + int updateOne(WgdSrb wgdSrb);//编辑 + int insertOne(WgdSrb wgdSrb);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java new file mode 100644 index 00000000..64821346 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 参与外部协会会议统计 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdWbtjDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdWbtj wgdWbtj);//多条件查询 + WgdWbtj selectOne(String id);//查询详情 + + int updateOne(WgdWbtj wgdWbtj);//编辑 + int insertOne(WgdWbtj wgdWbtj);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java new file mode 100644 index 00000000..686defcc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 参与外部标准制修订信息统计 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdWbxdDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdWbxd wgdWbxd);//多条件查询 + WgdWbxd selectOne(String id);//查询详情 + + int updateOne(WgdWbxd wgdWbxd);//编辑 + int insertOne(WgdWbxd wgdWbxd);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java new file mode 100644 index 00000000..00c8df4e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计支出表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdZcbDao extends BaseMapper { + List selectAll();//查询所有 + List queryAll(WgdZcb wgdZcb);//多条件查询 + WgdZcb selectOne(String id);//查询详情 + + int updateOne(WgdZcb wgdZcb);//编辑 + int insertOne(WgdZcb wgdZcb);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java new file mode 100644 index 00000000..a71fc8a7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java @@ -0,0 +1,46 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 采购费用信息统计 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdCgfy对象", description="采购费用信息统计") +public class WgdCgfy extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "标准类型") + private String type; + + @ApiModelProperty(value = "标准代号") + private String number; + + @ApiModelProperty(value = "标准名称") + private String name; + + @ApiModelProperty(value = "页数") + private String pages; + + @ApiModelProperty(value = "费用") + private String cost; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java new file mode 100644 index 00000000..66116ea1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java @@ -0,0 +1,52 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 翻译费用信息统计 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdFyfy对象", description="翻译费用信息统计") +public class WgdFyfy extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "标准类型") + private String type; + + @ApiModelProperty(value = "标准代号") + private String number; + + @ApiModelProperty(value = "标准名称") + private String name; + + @ApiModelProperty(value = "翻译类型") + private String translation; + + @ApiModelProperty(value = "页数") + private String pages; + + @ApiModelProperty(value = "费用") + private String cost; + + @ApiModelProperty(value = "翻译完成时间") + private String time; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java new file mode 100644 index 00000000..250f0954 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java @@ -0,0 +1,45 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 标准制修订补助资金收支统计收入表 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表") +public class WgdSrb extends BaseEntity { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "标准名称") + private String name; + + @ApiModelProperty(value = "标准编号") + private String number; + + @ApiModelProperty(value = "补助来源") + private String source; + + @ApiModelProperty(value = "补助金额") + private String money; + + @ApiModelProperty(value = "入账时间") + private String data; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java new file mode 100644 index 00000000..27f7d004 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java @@ -0,0 +1,70 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 参与外部协会会议统计 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计") +public class WgdWbtj extends BaseEntity { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "主办单位") + private String host; + + @ApiModelProperty(value = "会议名称") + private String meeting; + + @ApiModelProperty(value = "会议时间") + private String time; + + @ApiModelProperty(value = "会议地点") + private String place; + + @ApiModelProperty(value = "会费标准") + private String contributions; + + @ApiModelProperty(value = "会费实际发生") + private String occurs; + + @ApiModelProperty(value = "费用列支") + private String expenses; + + @ApiModelProperty(value = "参会人员") + private String user; + + @ApiModelProperty(value = "主管领导") + private String leadership; + + @ApiModelProperty(value = "参会单位") + private String participants; + + @ApiModelProperty(value = "会议资料") + private String information; + + @ApiModelProperty(value = "会议录音") + private String recording; + + @ApiModelProperty(value = "主要议题") + @TableField("Issues") + private String Issues; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java new file mode 100644 index 00000000..0ec6e035 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java @@ -0,0 +1,93 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 参与外部标准制修订信息统计 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计") +public class WgdWbxd extends BaseEntity { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "所处阶段") + private String stage; + + @ApiModelProperty(value = "标准号") + private String number; + + @ApiModelProperty(value = "标准名称") + private String name; + + @ApiModelProperty(value = "项目代号") + private String projectId; + + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "标准类型") + private String type; + + @ApiModelProperty(value = "主持或参与") + private String preside; + + @ApiModelProperty(value = "发布日期") + private String dataStart; + + @ApiModelProperty(value = "实施日期") + private String dataImplement; + + @ApiModelProperty(value = "颁布机构") + private String body; + + @ApiModelProperty(value = "牵头起草单位") + private String drafting; + + @ApiModelProperty(value = "备案时间") + private String dataRecord; + + @ApiModelProperty(value = "提报单位名称") + private String report; + + @ApiModelProperty(value = "参与人") + private String participants; + + @ApiModelProperty(value = "署名人") + private String celebrity; + + @ApiModelProperty(value = "制标费用") + private String costMarking; + + @ApiModelProperty(value = "其他费用") + private String costOther; + + @ApiModelProperty(value = "标准制/修订") + private String revised; + + @ApiModelProperty(value = "获奖情况") + private String status; + + @ApiModelProperty(value = "署名排序") + private String signature; + + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java new file mode 100644 index 00000000..ce6bc7eb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -0,0 +1,42 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 标准制修订补助资金收支统计支出表 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表") +public class WgdZcb extends BaseEntity { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "项目名称") + private String name; + + @ApiModelProperty(value = "支出金额") + private String money; + + @ApiModelProperty(value = "用途") + private String use; + + @ApiModelProperty(value = "详细附件") + private String annex; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java new file mode 100644 index 00000000..f0e8fa75 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java @@ -0,0 +1,37 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 采购费用信息统计 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdCgfyService extends IService { + + Object getAllWgdCgfy(); + + Object queryAllWgdCgfy(WgdCgfy wgdCgfy); + + List queryAllWgdAssocCosts(WgdCgfy wgdAssocCost); + + List getAllWgdCgfys(); + + List queryAllWgdCgfys(WgdCgfy wgdCgfy); + + Object getWgdCgfyById(String id); + + int updateWgdCgfy(WgdCgfy wgdCgfy); + + int insertWgdCgfy(WgdCgfy wgdCgfy); + + int deleteWgdCgfy(String id); + + int deleteWgdCgfys(String ids); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java new file mode 100644 index 00000000..1bef9456 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 翻译费用信息统计 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdFyfyService extends IService { + + Object getAllWgdFyfy(); + + Object queryAllWgdFyfy(WgdFyfy wgdFyfy); + + List getAllWgdFyfys(); + + List queryAllWgdFyfys(WgdFyfy wgdFyfy); + + Object getWgdFyfyById(String id); + + int updateWgdFyfy(WgdFyfy wgdFyfy); + + int insertWgdFyfy(WgdFyfy wgdFyfy); + + int deleteWgdFyfy(String id); + + int deleteWgdFyfys(String ids); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java new file mode 100644 index 00000000..32cf2f3e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计收入表 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdSrbService extends IService { + + Object getAllWgdSrb(); + + Object queryAllWgdSrb(WgdSrb wgdSrb); + + List getAllWgdSrbs(); + + List queryAllWgdSrbs(WgdSrb wgdSrb); + + Object getWgdSrbById(String id); + + int updateWgdSrb(WgdSrb wgdSrb); + + int insertWgdSrb(WgdSrb wgdSrb); + + int deleteWgdSrb(String id); + + int deleteWgdSrbs(String ids); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java new file mode 100644 index 00000000..a4953148 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 参与外部协会会议统计 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdWbtjService extends IService { + + Object getAllWgdWbtj(); + + Object queryAllWgdWbtj(WgdWbtj wgdWbtj); + + List getAllWgdWbtjs(); + + List queryAllWgdWbtjs(WgdWbtj wgdWbtj); + + Object getWgdWbtjById(String id); + + int updateWgdWbtj(WgdWbtj wgdWbtj); + + int insertWgdWbtj(WgdWbtj wgdWbtj); + + int deleteWgdWbtj(String id); + + int deleteWgdWbtjs(String ids); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java new file mode 100644 index 00000000..cc532b28 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 参与外部标准制修订信息统计 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdWbxdService extends IService { + + Object getAllWgdWbxd(); + + Object queryAllWgdWbxd(WgdWbxd wgdWbxd); + + List getAllWgdWbxds(); + + List queryAllWgdWbxds(WgdWbxd wgdWbxd); + + Object getWgdWbxdById(String id); + + int updateWgdWbxd(WgdWbxd wgdWbxd); + + int insertWgdWbxd(WgdWbxd wgdWbxd); + + int deleteWgdWbxd(String id); + + int deleteWgdWbxds(String ids); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java new file mode 100644 index 00000000..b97f7b0a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计支出表 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdZcbService extends IService { + + Object getAllWgdZcb(); + + Object queryAllWgdZcb(WgdZcb wgdZcb); + + List getAllWgdZcbs(); + + List queryAllWgdZcbs(WgdZcb wgdZcb); + + Object getWgdZcbById(String id); + + int updateWgdZcb(WgdZcb wgdZcb); + + int insertWgdZcb(WgdZcb wgdZcb); + + int deleteWgdZcb(String id); + + int deleteWgdZcbs(String ids); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java new file mode 100644 index 00000000..30bb76a3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java @@ -0,0 +1,63 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +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.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 采购费用信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public abstract class WgdCgfyServiceImpl extends ServiceImpl implements IWgdCgfyService { + + @Autowired + WgdCgfyDao wgdCgfyDao; + + @Override + public List getAllWgdCgfys() { + return wgdCgfyDao.selectAll(); + } + + @Override + public List queryAllWgdCgfys(WgdCgfy wgdCgfy) { + return wgdCgfyDao.queryAll(wgdCgfy); + } + + @Override + public WgdCgfy getWgdCgfyById(String id) { + return wgdCgfyDao.selectOne(id); + } + + @Override + public int updateWgdCgfy(WgdCgfy wgdCgfy) { + return wgdCgfyDao.updateOne(wgdCgfy); + } + + @Override + public int insertWgdCgfy(WgdCgfy wgdCgfy) { + wgdCgfy.setId(UUIDUtils.randomUUID(32)); + return wgdCgfyDao.insertOne(wgdCgfy); + } + + @Override + public int deleteWgdCgfy(String id) { + return wgdCgfyDao.deleteOne(id); + } + + @Override + public int deleteWgdCgfys(String ids) { + String[] str = ids.split(","); + return wgdCgfyDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java new file mode 100644 index 00000000..d08ff56d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 翻译费用信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public abstract class WgdFyfyServiceImpl extends ServiceImpl implements IWgdFyfyService { + @Autowired + WgdFyfyDao wgdFyfyDao; + + @Override + public List getAllWgdFyfys() { + return wgdFyfyDao.selectAll(); + } + + @Override + public List queryAllWgdFyfys(WgdFyfy wgdFyfy) { + return wgdFyfyDao.queryAll(wgdFyfy); + } + + @Override + public WgdFyfy getWgdFyfyById(String id) { + return wgdFyfyDao.selectOne(id); + } + + @Override + public int updateWgdFyfy(WgdFyfy wgdFyfy) { + return wgdFyfyDao.updateOne(wgdFyfy); + } + + @Override + public int insertWgdFyfy(WgdFyfy wgdFyfy) { + wgdFyfy.setId(UUIDUtils.randomUUID(32)); + return wgdFyfyDao.insertOne(wgdFyfy); + } + + @Override + public int deleteWgdFyfy(String id) { + return wgdFyfyDao.deleteOne(id); + } + + @Override + public int deleteWgdFyfys(String ids) { + String[] str = ids.split(","); + return wgdFyfyDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java new file mode 100644 index 00000000..730b0f1d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java @@ -0,0 +1,61 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计收入表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public abstract class WgdSrbServiceImpl extends ServiceImpl implements IWgdSrbService { + @Autowired + WgdSrbDao wgdSrbDao; + @Override + public List getAllWgdSrbs() { + return wgdSrbDao.selectAll(); + } + + @Override + public List queryAllWgdSrbs(WgdSrb wgdSrb) { + return wgdSrbDao.queryAll(wgdSrb); + } + + @Override + public WgdSrb getWgdSrbById(String id) { + return wgdSrbDao.selectOne(id); + } + + @Override + public int updateWgdSrb(WgdSrb wgdSrb) { + return wgdSrbDao.updateOne(wgdSrb); + } + + @Override + public int insertWgdSrb(WgdSrb wgdSrb) { + wgdSrb.setId(UUIDUtils.randomUUID(32)); + return wgdSrbDao.insertOne(wgdSrb); + } + + @Override + public int deleteWgdSrb(String id) { + return wgdSrbDao.deleteOne(id); + } + + @Override + public int deleteWgdSrbs(String ids) { + String[] str = ids.split(","); + return wgdSrbDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java new file mode 100644 index 00000000..d08dece4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +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.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 参与外部协会会议统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public abstract class WgdWbtjServiceImpl extends ServiceImpl implements IWgdWbtjService { + @Autowired + WgdWbtjDao wgdWbtjDao; + + @Override + public List getAllWgdWbtjs() { + return wgdWbtjDao.selectAll(); + } + + @Override + public List queryAllWgdWbtjs(WgdWbtj wgdWbtj) { + return wgdWbtjDao.queryAll(wgdWbtj); + } + + @Override + public WgdWbtj getWgdWbtjById(String id) { + return wgdWbtjDao.selectOne(id); + } + + @Override + public int updateWgdWbtj(WgdWbtj wgdWbtj) { + return wgdWbtjDao.updateOne(wgdWbtj); + } + + @Override + public int insertWgdWbtj(WgdWbtj wgdWbtj) { + wgdWbtj.setId(UUIDUtils.randomUUID(32)); + return wgdWbtjDao.insertOne(wgdWbtj); + } + + @Override + public int deleteWgdWbtj(String id) { + return wgdWbtjDao.deleteOne(id); + } + + @Override + public int deleteWgdWbtjs(String ids) { + String[] str = ids.split(","); + return wgdWbtjDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java new file mode 100644 index 00000000..dda4435e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +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.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 参与外部标准制修订信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public abstract class WgdWbxdServiceImpl extends ServiceImpl implements IWgdWbxdService { + @Autowired + WgdWbxdDao wgdWbxdDao; + + @Override + public List getAllWgdWbxds() { + return wgdWbxdDao.selectAll(); + } + + @Override + public List queryAllWgdWbxds(WgdWbxd wgdWbxd) { + return wgdWbxdDao.queryAll(wgdWbxd); + } + + @Override + public WgdWbxd getWgdWbxdById(String id) { + return wgdWbxdDao.selectOne(id); + } + + @Override + public int updateWgdWbxd(WgdWbxd wgdWbxd) { + return wgdWbxdDao.updateOne(wgdWbxd); + } + + @Override + public int insertWgdWbxd(WgdWbxd wgdWbxd) { + wgdWbxd.setId(UUIDUtils.randomUUID(32)); + return wgdWbxdDao.insertOne(wgdWbxd); + } + + @Override + public int deleteWgdWbxd(String id) { + return wgdWbxdDao.deleteOne(id); + } + + @Override + public int deleteWgdWbxds(String ids) { + String[] str = ids.split(","); + return wgdWbxdDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java new file mode 100644 index 00000000..7f29d37f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +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.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计支出表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public abstract class WgdZcbServiceImpl extends ServiceImpl implements IWgdZcbService { + @Autowired + WgdZcbDao wgdZcbDao; + + @Override + public List getAllWgdZcbs() { + return wgdZcbDao.selectAll(); + } + + @Override + public List queryAllWgdZcbs(WgdZcb wgdZcb) { + return wgdZcbDao.queryAll(wgdZcb); + } + + @Override + public WgdZcb getWgdZcbById(String id) { + return wgdZcbDao.selectOne(id); + } + + @Override + public int updateWgdZcb(WgdZcb wgdZcb) { + return wgdZcbDao.updateOne(wgdZcb); + } + + @Override + public int insertWgdZcb(WgdZcb wgdZcb) { + wgdZcb.setId(UUIDUtils.randomUUID(32)); + return wgdZcbDao.insertOne(wgdZcb); + } + + @Override + public int deleteWgdZcb(String id) { + return wgdZcbDao.deleteOne(id); + } + + @Override + public int deleteWgdZcbs(String ids) { + String[] str = ids.split(","); + return wgdZcbDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml new file mode 100644 index 00000000..ec273d5f --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml new file mode 100644 index 00000000..29b21b50 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml new file mode 100644 index 00000000..4b18592a --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml new file mode 100644 index 00000000..5cf1f0c7 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml new file mode 100644 index 00000000..96b72f75 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml new file mode 100644 index 00000000..f8c09d9e --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml @@ -0,0 +1,5 @@ + + + + + From 303640aa27b5284bb6989a1a0a07ea5c83eebe7a Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 15 Nov 2021 14:35:40 +0800 Subject: [PATCH 06/18] ~ --- .../mapper/wgdCensusLeo/WgdCgfyMapper.xml | 121 ++++++- .../mapper/wgdCensusLeo/WgdFyfyMapper.xml | 132 +++++++- .../mapper/wgdCensusLeo/WgdSrbMapper.xml | 122 +++++++ .../mapper/wgdCensusLeo/WgdWbtjMapper.xml | 216 +++++++++++- .../mapper/wgdCensusLeo/WgdWbxdMapper.xml | 311 ++++++++++++++++++ .../mapper/wgdCensusLeo/WgdZcbMapper.xml | 112 ++++++- 6 files changed, 1010 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml index ec273d5f..0355c78d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml @@ -1,5 +1,124 @@ - + + + id,type,number,name,pages,cost + + + + + + and id = #{id} + + + and type like concat('%',#{type},'%') + + + and number like concat('%',#{number},'%') + + + and name like concat('%',#{name},'%') + + + and pages = #{pages} + + + and cost = #{cost} + + + + + + + + + + + + update wgd_cgfy + + + type = #{type}, + + + number = #{number}, + + + name = #{name}, + + + pages = #{pages}, + + + cost = #{cost}, + + + where id = #{id} + + + + insert into wgd_cgfy + + + id, + + + type, + + + number, + + + name, + + + pages, + + + cost, + + + values + + + #{id}, + + + #{type}, + + + #{number}, + + + #{name}, + + + #{pages}, + + + #{cost}, + + + + + + delete from wgd_cgfy where id = #{id} + + + + delete from wgd_cgfy where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml index 29b21b50..5785e9c6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml @@ -1,5 +1,135 @@ - + + + id,type,number,name,pages,cost,time + + + + + + and id = #{id} + + + and type like concat('%',#{type},'%') + + + and number like concat('%',#{number},'%') + + + and name like concat('%',#{name},'%') + + + and pages = #{pages} + + + and cost = #{cost} + + + and time = #{time} + + + + + + + + + + + + update wgd_fyfy + + + type = #{type}, + + + number = #{number}, + + + name = #{name}, + + + pages = #{pages}, + + + cost = #{cost}, + + + time = #{time}, + + + where id = #{id} + + + + insert into wgd_fyfy + + + id, + + + type, + + + number, + + + name, + + + pages, + + + cost, + + + time, + + + values + + + #{id}, + + + #{type}, + + + #{number}, + + + #{name}, + + + #{pages}, + + + #{cost}, + + + #{time}, + + + + + + delete from wgd_fyfy where id = #{id} + + + + delete from wgd_fyfy where id in + + #{id} + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml index 4b18592a..b03f2d77 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml @@ -1,5 +1,127 @@ + + + id,name,number,source,cost,time + + + + + + and id = #{id} + + + and name like concat('%',#{name},'%') + + + and number like concat('%',#{number},'%') + + + + and source = #{source} + + + and cost = #{cost} + + + and time = #{time} + + + + + + + + + + + + update wgd_srb + + + name = #{name}, + + + number = #{number}, + + + source = #{source}, + + + cost = #{cost}, + + + time = #{time}, + + + where id = #{id} + + + + insert into wgd_srb + + + id, + + + name, + + + number, + + + + source, + + + cost, + + + time, + + + values + + + #{id}, + + + #{name}, + + + #{number}, + + + + #{source}, + + + #{cost}, + + + #{time}, + + + + + + delete from wgd_srb where id = #{id} + + + + delete from wgd_srb where id in + + #{id} + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml index 5cf1f0c7..bb9deeca 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml @@ -1,5 +1,219 @@ - + + + id,host,meeting,time,place,contributions,occurs,expenses,user,leadership,participants,information,recording,Issues + + + + + + and id = #{id} + + + and host like concat('%',#{host},'%') + + + and meeting like concat('%',#{meeting},'%') + + + and time like concat('%',#{time},'%') + + + and place = #{place} + + + and contributions = #{contributions} + + + and occurs = #{occurs} + + + and expenses = #{expenses} + + + and user = #{user} + + + and leadership = #{leadership} + + + and participants = #{participants} + + + and information = #{information} + + + and recording = #{recording} + + + and Issues = #{Issues} + + + + + + + + + + + + update wgd_wbtj + + + host = #{host}, + + + meeting = #{meeting}, + + + time = #{time}, + + + place = #{place}, + + + contributions = #{contributions}, + + + occurs = #{occurs}, + + + expenses = #{expenses}, + + + user = #{user}, + + + leadership = #{leadership}, + + + participants = #{participants}, + + + information = #{information}, + + + recording = #{recording}, + + + Issues = #{Issues}, + + + where id = #{id} + + + + insert into wgd_wbtj + + + id, + + + host, + + + meeting, + + + time, + + + place, + + + contributions, + + + occurs, + + + expenses, + + + user, + + + leadership, + + + participants, + + + information, + + + recording, + + + Issues, + + + values + + + #{id}, + + + #{host}, + + + #{meeting}, + + + #{time}, + + + #{place}, + + + #{contributions}, + + + #{occurs}, + + + #{expenses}, + + + #{user}, + + + #{leadership}, + + + #{participants}, + + + #{information}, + + + #{recording}, + + + #{Issues}, + + + + + + delete from wgd_wbtj where id = #{id} + + + + delete from wgd_wbtj where id in + + #{id} + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml index 96b72f75..fbfc54a7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml @@ -1,5 +1,316 @@ + + + id,stage,number,name,project_id,project_name,type,preside,data_start,data_implement,body,drafting,data_record,report,participants,celebrity,cost_marking,cost_other,revised,status,signature,remark + + + + + + and id = #{id} + + + and stage like concat('%',#{stage},'%') + + + and number like concat('%',#{number},'%') + + + and name like concat('%',#{name},'%') + + + and project_id = #{project_id} + + + and project_name = #{project_name} + + + and type = #{type} + + + and preside = #{preside} + + + and data_start = #{data_start} + + + and data_implement = #{data_implement} + + + and body = #{body} + + + and drafting = #{drafting} + + + and data_record = #{data_record} + + + and report = #{report} + + + and participants = #{participants} + + + and celebrity = #{celebrity} + + + and cost_marking = #{cost_marking} + + + and cost_other = #{cost_other} + + + and revised = #{revised} + + + and status = #{status} + + + and signature = #{signature} + + + and remark = #{remark} + + + + + + + + + + + + update wgd_wbxd + + + stage = #{stage}, + + + number = #{number}, + + + name = #{name}, + + + project_id = #{project_id}, + + + project_name = #{project_name}, + + + type = #{type}, + + + preside = #{preside}, + + + data_start = #{data_start}, + + + data_implement = #{data_implement}, + + + body = #{body}, + + + drafting = #{drafting}, + + + data_record = #{data_record}, + + + report = #{report}, + + + participants = #{participants}, + + + celebrity = #{celebrity}, + + + cost_marking = #{cost_marking}, + + + cost_other = #{cost_other}, + + + revised = #{revised}, + + + status = #{status}, + + + signature = #{signature}, + + + remark = #{remark}, + + + where id = #{id} + + + + insert into wgd_wbxd + + + id, + + + stage, + + + number, + + + name, + + + project_id, + + + project_name, + + + type, + + + preside, + + + data_start, + + + data_implement, + + + body, + + + drafting, + + + data_record, + + + report, + + + participants, + + + celebrity, + + + cost_marking, + + + cost_other, + + + revised, + + + status, + + + signature, + + + remark, + + + values + + + #{id}, + + + #{stage}, + + + #{number}, + + + #{name}, + + + #{project_id}, + + + #{project_name}, + + + #{type}, + + + #{preside}, + + + #{data_start}, + + + #{data_implement}, + + + #{body}, + + + #{drafting}, + + + #{data_record}, + + + #{report}, + + + #{participants}, + + + #{celebrity}, + + + #{cost_marking}, + + + #{cost_other}, + + + #{revised}, + + + #{status}, + + + #{signature}, + + + #{remark}, + + + + + + delete from wgd_wbxd where id = #{id} + + + + delete from wgd_wbxd where id in + + #{id} + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml index f8c09d9e..ad2b80ea 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml @@ -1,5 +1,115 @@ - + + + id,name,cost,use,annex + + + + + + and id = #{id} + + + and name like concat('%',#{name},'%') + + + and cost like concat('%',#{cost},'%') + + + and use like concat('%',#{use},'%') + + + and annex = #{annex} + + + + + + + + + + + + + update wgd_zcb + + + name = #{name}, + + + cost = #{cost}, + + + use = #{use}, + + + annex = #{annex}, + + + + where id = #{id} + + + + insert into wgd_zcb + + + id, + + + name, + + + cost, + + + use, + + + annex, + + + + values + + + #{id}, + + + #{name}, + + + #{cost}, + + + #{use}, + + + #{annex}, + + + + + + + delete from wgd_zcb where id = #{id} + + + + delete from wgd_zcb where id in + + #{id} + + From a5d0745aa095705eb79746967bddfa8a28c68ab7 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 16 Nov 2021 09:17:06 +0800 Subject: [PATCH 07/18] =?UTF-8?q?zcr:=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 11 +- .../esRevisePlan/dao/EsRevisePlanDao.java | 4 +- .../esRevisePlan/entity/EsRevisePlan.java | 3 +- .../service/IEsRevisePlanService.java | 2 +- .../service/impl/EsRevisePlanServiceImpl.java | 12 +- .../controller/WgdAssocCostController.java | 21 +- .../controller/WgdAssocInfoController.java | 33 +-- .../controller/WgdCommiInfoController.java | 33 +-- .../controller/WgdExReviseCostController.java | 33 +-- .../controller/WgdMeetCostController.java | 33 +-- .../slrs/wgdCensusZ/dao/WgdAssocCostDao.java | 7 +- .../slrs/wgdCensusZ/dao/WgdAssocInfoDao.java | 3 +- .../slrs/wgdCensusZ/dao/WgdCommiInfoDao.java | 2 + .../wgdCensusZ/dao/WgdExReviseCostDao.java | 2 + .../slrs/wgdCensusZ/dao/WgdMeetCostDao.java | 2 + .../slrs/wgdCensusZ/entity/WgdAssocCost.java | 3 +- .../slrs/wgdCensusZ/entity/WgdAssocInfo.java | 3 +- .../slrs/wgdCensusZ/entity/WgdCommiInfo.java | 3 +- .../wgdCensusZ/entity/WgdExReviseCost.java | 3 +- .../slrs/wgdCensusZ/entity/WgdMeetCost.java | 3 +- .../service/IWgdAssocCostService.java | 4 +- .../service/impl/WgdAssocCostServiceImpl.java | 14 +- .../service/impl/WgdAssocInfoServiceImpl.java | 2 + .../service/impl/WgdCommiInfoServiceImpl.java | 3 + .../impl/WgdExReviseCostServiceImpl.java | 2 + .../service/impl/WgdMeetCostServiceImpl.java | 2 + .../esRevisePlan/EsRevisePlanMapper.xml | 22 +- .../mapper/wgdCensusZ/WgdAssocCostMapper.xml | 15 ++ .../mapper/wgdCensusZ/WgdAssocInfoMapper.xml | 14 +- .../mapper/wgdCensusZ/WgdCommiInfoMapper.xml | 217 +++++++++++++++++- .../wgdCensusZ/WgdExReviseCostMapper.xml | 101 +++++++- .../mapper/wgdCensusZ/WgdMeetCostMapper.xml | 113 ++++++++- 32 files changed, 622 insertions(+), 103 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index e179e933..63852873 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.esRevisePlan.controller; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; @@ -31,14 +32,18 @@ public class EsRevisePlanController extends BaseController { @ApiOperation(value = "获取所有企标计划") @GetMapping("getAllPlans") - public ResponseMessage getAllPlans(){ - return Result.success(iEsRevisePlanService.getAllPlans()); + public ResponseMessage getAllPlans(EsRevisePlan esRevisePlan){ + List esRevisePlans = iEsRevisePlanService.getAllPlans(esRevisePlan); + PageInfo pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans); + return Result.success(pageInfo); } @ApiOperation(value = "多条件查询企标计划") @PostMapping("queryAllPlans") public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ - return Result.success(iEsRevisePlanService.queryAllPlans(esRevisePlan)); + List esRevisePlans = iEsRevisePlanService.queryAllPlans(esRevisePlan); + PageInfo pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans); + return Result.success(pageInfo); } @ApiOperation(value = "获取单个企标计划详情") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java index fd735200..dee08a19 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java @@ -15,7 +15,9 @@ import java.util.List; * @since 2021-11-14 */ public interface EsRevisePlanDao extends BaseMapper { - List selectAll();//查询所有 + Integer getTotal(); + Integer getQueryTotal(EsRevisePlan esRevisePlan); + List selectAll(EsRevisePlan esRevisePlan);//查询所有 List queryAll(EsRevisePlan esRevisePlan);//多条件查询 EsRevisePlan selectOne(String id);//查询详情 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 5f2b2a39..93cfa32f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.esRevisePlan.entity; import java.util.Date; +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat; @Data @Accessors(chain = true) @ApiModel(value="EsRevisePlan对象", description="企标制修订计划") -public class EsRevisePlan{ +public class EsRevisePlan extends BasePage { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index bf8c6239..cc5eab90 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -14,7 +14,7 @@ import java.util.List; * @since 2021-11-14 */ public interface IEsRevisePlanService extends IService { - List getAllPlans();//查询所有 + List getAllPlans(EsRevisePlan esRevisePlan);//查询所有 List queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询 EsRevisePlan getOnePlan(String id);//查询详情 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 31942a44..0e7a4ade 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -25,13 +25,19 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlans() { - return esRevisePlanDao.selectAll(); + public List getAllPlans(EsRevisePlan esRevisePlan) { + Integer count = esRevisePlanDao.getTotal(); + esRevisePlan.getPager().setRowCount(count); + List esRevisePlans = esRevisePlanDao.selectAll(esRevisePlan); + return esRevisePlans; } @Override public List queryAllPlans(EsRevisePlan esRevisePlan) { - return esRevisePlanDao.queryAll(esRevisePlan); + Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan); + esRevisePlan.getPager().setRowCount(count); + List esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan); + return esRevisePlans; } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java index 2a4cae2c..8b2563c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java @@ -1,10 +1,14 @@ package com.adc.da.slrs.wgdCensusZ.controller; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; @@ -29,36 +33,47 @@ public class WgdAssocCostController extends BaseController { @Autowired IWgdAssocCostService iWgdAssocCostService; + @ApiOperation("查询所有信息") @GetMapping("getAllAssocCosts") - public ResponseMessage getAllWgdAssocCosts(){//查询所有 - return Result.success(iWgdAssocCostService.getAllWgdAssocCosts()); + public ResponseMessage getAllWgdAssocCosts(WgdAssocCost page){//查询所有 + List wgdAssocCosts = iWgdAssocCostService.getAllWgdAssocCosts(page); + PageInfo pageInfo = getPageInfo(page.getPager(), wgdAssocCosts); + return Result.success(pageInfo); } + @ApiOperation("多条件查询") @PostMapping("queryAllAssocCosts") public ResponseMessage queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询 - return Result.success(iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost)); + List wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost); + PageInfo pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts); + return Result.success(pageInfo); } + @ApiOperation("查询详情") @GetMapping("getAssocCostById") public ResponseMessage getWgdAssocCostById(String id) {//查询详情 return Result.success(iWgdAssocCostService.getWgdAssocCostById(id)); } + @ApiOperation("编辑") @PostMapping("modAssocCost") ResponseMessage updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑 return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost)); } + @ApiOperation("插入") @PostMapping("addAssocCost") ResponseMessage insertWgdAssocCost(WgdAssocCost wgdAssocCost) {//插入 return Result.success(iWgdAssocCostService.insertWgdAssocCost(wgdAssocCost)); } + @ApiOperation("删除") @GetMapping("delAssocCost") ResponseMessage deleteWgdAssocCost(String id){//删除 return Result.success(iWgdAssocCostService.deleteWgdAssocCost(id)); } + @ApiOperation("批量删除") @GetMapping("delAssocCosts") ResponseMessage deleteWgdAssocCosts(String ids){//批量删除 return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java index 2a3b53e4..0823966b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java @@ -1,6 +1,9 @@ package com.adc.da.slrs.wgdCensusZ.controller; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,37 +32,39 @@ public class WgdAssocInfoController extends BaseController { IWgdAssocInfoService iWgdAssocInfoService; @GetMapping("getAllAssocInfos") - public List getAllWgdAssocInfos(){//查询所有 - return iWgdAssocInfoService.getAllWgdAssocInfos(); + public ResponseMessage getAllWgdAssocInfos(){//查询所有 + return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos()); } @PostMapping("queryAllAssocInfos") - public List queryAllWgdAssocInfos(WgdAssocInfo WgdAssocInfo){//多条件查询 - return iWgdAssocInfoService.queryAllWgdAssocInfos(WgdAssocInfo); + public ResponseMessage queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询 + List wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo); + PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos); + return Result.success(pageInfo); } @GetMapping("getAssocInfoById") - public WgdAssocInfo getWgdAssocInfoById(String id) {//查询详情 - return iWgdAssocInfoService.getWgdAssocInfoById(id); + public ResponseMessage getWgdAssocInfoById(String id) {//查询详情 + return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id)); } @PostMapping("modAssocInfo") - int updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑 - return iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo); + ResponseMessage updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑 + return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo)); } @PostMapping("addAssocInfo") - int insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入 - return iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo); + ResponseMessage insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入 + return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo)); } @GetMapping("delAssocInfo") - int deleteWgdAssocInfo(String id){//删除 - return iWgdAssocInfoService.deleteWgdAssocInfo(id); + ResponseMessage deleteWgdAssocInfo(String id){//删除 + return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id)); } @GetMapping("delAssocInfos") - int deleteWgdAssocInfos(String ids){//批量删除 - return iWgdAssocInfoService.deleteWgdAssocInfos(ids); + ResponseMessage deleteWgdAssocInfos(String ids){//批量删除 + return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java index a1440258..b3df81d3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java @@ -1,6 +1,9 @@ package com.adc.da.slrs.wgdCensusZ.controller; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -29,37 +32,39 @@ public class WgdCommiInfoController extends BaseController { IWgdCommiInfoService iWgdCommiInfoService; @GetMapping("getAllCommiInfos") - public List getAllWgdCommiInfos(){//查询所有 - return iWgdCommiInfoService.getAllWgdCommiInfos(); + public ResponseMessage getAllWgdCommiInfos(){//查询所有 + return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos()); } @PostMapping("queryAllCommiInfos") - public List queryAllWgdCommiInfos(WgdCommiInfo WgdCommiInfo){//多条件查询 - return iWgdCommiInfoService.queryAllWgdCommiInfos(WgdCommiInfo); + public ResponseMessage queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询 + List wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo); + PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos); + return Result.success(pageInfo); } @GetMapping("getCommiInfoById") - public WgdCommiInfo getWgdCommiInfoById(String id) {//查询详情 - return iWgdCommiInfoService.getWgdCommiInfoById(id); + public ResponseMessage getWgdCommiInfoById(String id) {//查询详情 + return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id)); } @PostMapping("modCommiInfo") - int updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑 - return iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo); + ResponseMessage updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑 + return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo)); } @PostMapping("addCommiInfo") - int insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入 - return iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo); + ResponseMessage insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入 + return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo)); } @GetMapping("delCommiInfo") - int deleteWgdCommiInfo(String id){//删除 - return iWgdCommiInfoService.deleteWgdCommiInfo(id); + ResponseMessage deleteWgdCommiInfo(String id){//删除 + return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id)); } @GetMapping("delCommiInfos") - int deleteWgdCommiInfos(String ids){//批量删除 - return iWgdCommiInfoService.deleteWgdCommiInfos(ids); + ResponseMessage deleteWgdCommiInfos(String ids){//批量删除 + return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java index 423f5c7b..b76d0ab5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java @@ -1,6 +1,9 @@ package com.adc.da.slrs.wgdCensusZ.controller; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; import org.springframework.beans.factory.annotation.Autowired; @@ -29,37 +32,39 @@ public class WgdExReviseCostController extends BaseController { IWgdExReviseCostService iWgdExReviseCostService; @GetMapping("getAllExReviseCosts") - public List getAllWgdExReviseCosts(){//查询所有 - return iWgdExReviseCostService.getAllWgdExReviseCosts(); + public ResponseMessage getAllWgdExReviseCosts(){//查询所有 + return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts()); } @PostMapping("queryAllExReviseCosts") - public List queryAllWgdExReviseCosts(WgdExReviseCost WgdExReviseCost){//多条件查询 - return iWgdExReviseCostService.queryAllWgdExReviseCosts(WgdExReviseCost); + public ResponseMessage queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询 + List wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost); + PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts); + return Result.success(pageInfo); } @GetMapping("getExReviseCostById") - public WgdExReviseCost getWgdExReviseCostById(String id) {//查询详情 - return iWgdExReviseCostService.getWgdExReviseCostById(id); + public ResponseMessage getWgdExReviseCostById(String id) {//查询详情 + return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id)); } @PostMapping("modExReviseCost") - int updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑 - return iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost); + ResponseMessage updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑 + return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost)); } @PostMapping("addExReviseCost") - int insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入 - return iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost); + ResponseMessage insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入 + return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost)); } @GetMapping("delExReviseCost") - int deleteWgdExReviseCost(String id){//删除 - return iWgdExReviseCostService.deleteWgdExReviseCost(id); + ResponseMessage deleteWgdExReviseCost(String id){//删除 + return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id)); } @GetMapping("delExReviseCosts") - int deleteWgdExReviseCosts(String ids){//批量删除 - return iWgdExReviseCostService.deleteWgdExReviseCosts(ids); + ResponseMessage deleteWgdExReviseCosts(String ids){//批量删除 + return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java index 595b993a..449692a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java @@ -1,6 +1,9 @@ package com.adc.da.slrs.wgdCensusZ.controller; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +14,6 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; -import java.util.List; /** *

@@ -29,37 +31,38 @@ public class WgdMeetCostController extends BaseController { IWgdMeetCostService iWgdMeetCostService; @GetMapping("getAllMeetCosts") - public List getAllWgdMeetCosts(){//查询所有 - return iWgdMeetCostService.getAllWgdMeetCosts(); + public ResponseMessage getAllWgdMeetCosts(){//查询所有 + return Result.success(iWgdMeetCostService.getAllWgdMeetCosts()); } @PostMapping("queryAllMeetCosts") - public List queryAllWgdMeetCosts(WgdMeetCost WgdMeetCost){//多条件查询 - return iWgdMeetCostService.queryAllWgdMeetCosts(WgdMeetCost); + public ResponseMessage queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询 + PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost)); + return Result.success(pageInfo); } @GetMapping("getMeetCostById") - public WgdMeetCost getWgdMeetCostById(String id) {//查询详情 - return iWgdMeetCostService.getWgdMeetCostById(id); + public ResponseMessage getWgdMeetCostById(String id) {//查询详情 + return Result.success(iWgdMeetCostService.getWgdMeetCostById(id)); } @PostMapping("modMeetCost") - int updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑 - return iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost); + ResponseMessage updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑 + return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost)); } @PostMapping("addMeetCost") - int insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入 - return iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost); + ResponseMessage insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入 + return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost)); } @GetMapping("delMeetCost") - int deleteWgdMeetCost(String id){//删除 - return iWgdMeetCostService.deleteWgdMeetCost(id); + ResponseMessage deleteWgdMeetCost(String id){//删除 + return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id)); } @GetMapping("delMeetCosts") - int deleteWgdMeetCosts(String ids){//批量删除 - return iWgdMeetCostService.deleteWgdMeetCosts(ids); + ResponseMessage deleteWgdMeetCosts(String ids){//批量删除 + return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java index e5f25c50..e7b19e41 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.wgdCensusZ.dao; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import java.util.Map; @@ -16,7 +17,9 @@ import java.util.Map; * @since 2021-11-12 */ public interface WgdAssocCostDao extends BaseMapper { - List selectAll();//查询所有 + Integer getTotal();//总数 + Integer getQueryTotal(WgdAssocCost wgdAssocCost);//总数 + List selectAll(WgdAssocCost page);//查询所有 List queryAll(WgdAssocCost wgdAssocCost);//多条件查询 WgdAssocCost selectOne(String id);//查询详情 @@ -24,4 +27,6 @@ public interface WgdAssocCostDao extends BaseMapper { int insertOne(WgdAssocCost wgdAssocCost);//插入 int deleteOne(String id);//删除 int deleteBatch(String[] ids);//批量删除 + } + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java index 1630539b..48431efb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.wgdCensusZ.dao; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -15,7 +16,7 @@ import java.util.Map; * @since 2021-11-12 */ public interface WgdAssocInfoDao extends BaseMapper { - + Integer getQueryTotal(WgdAssocInfo WgdAssocInfo);//总数 List selectAll();//查询所有 List queryAll(WgdAssocInfo wgdAssocInfo);//多条件查询 WgdAssocInfo selectOne(String id);//查询详情 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java index d8833d51..36980275 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.wgdCensusZ.dao; +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.core.mapper.BaseMapper; @@ -16,6 +17,7 @@ import java.util.Map; * @since 2021-11-12 */ public interface WgdCommiInfoDao extends BaseMapper { + Integer getQueryTotal(WgdCommiInfo WgdCommiInfo);//总数 List selectAll();//查询所有 List queryAll(WgdCommiInfo wgdCommiInfo);//多条件查询 WgdCommiInfo selectOne(String id);//查询详情 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java index 11ff1eb4..2d67546e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.wgdCensusZ.dao; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,6 +17,7 @@ import java.util.Map; * @since 2021-11-12 */ public interface WgdExReviseCostDao extends BaseMapper { + Integer getQueryTotal(WgdExReviseCost WgdExReviseCost);//总数 List selectAll();//查询所有 List queryAll(WgdExReviseCost wgdExReviseCost);//多条件查询 WgdExReviseCost selectOne(String id);//查询详情 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java index a8b7f934..71610aa1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.wgdCensusZ.dao; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,6 +17,7 @@ import java.util.Map; * @since 2021-11-12 */ public interface WgdMeetCostDao extends BaseMapper { + Integer getQueryTotal(WgdMeetCost WgdMeetCost);//总数 List selectAll();//查询所有 List queryAll(WgdMeetCost wgdMeetCost);//多条件查询 WgdMeetCost selectOne(String id);//查询详情 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java index 923aa253..741601e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.wgdCensusZ.entity; +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +17,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @ApiModel(value="WgdAssocCost对象", description="协会费用信息统计") -public class WgdAssocCost { +public class WgdAssocCost extends BasePage { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java index 7cf4c87c..76ccfa35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity; import java.util.Date; +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat; @Data @Accessors(chain = true) @ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计") -public class WgdAssocInfo { +public class WgdAssocInfo extends BasePage { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java index f8d4bd6c..40c6d61b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity; import java.util.Date; +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat; @Data @Accessors(chain = true) @ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计") -public class WgdCommiInfo { +public class WgdCommiInfo extends BasePage { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java index 56af460e..7181ba67 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.wgdCensusZ.entity; +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +17,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计") -public class WgdExReviseCost { +public class WgdExReviseCost extends BasePage { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java index 9c6fbff3..7c3d3ca2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity; import java.util.Date; +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat; @Data @Accessors(chain = true) @ApiModel(value="WgdMeetCost对象", description="参会费用信息统计") -public class WgdMeetCost { +public class WgdMeetCost extends BasePage { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java index 323fe734..361f468f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java @@ -2,6 +2,8 @@ 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.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -15,7 +17,7 @@ import java.util.List; * @since 2021-11-12 */ public interface IWgdAssocCostService extends IService { - List getAllWgdAssocCosts();//查询所有 + List getAllWgdAssocCosts(WgdAssocCost page);//查询所有 List queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost);//多条件查询 WgdAssocCost getWgdAssocCostById(String id);//查询详情 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java index 54fe553c..0fe20013 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java @@ -4,6 +4,8 @@ import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao; import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService; import com.adc.da.util.UUIDUtils; +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; @@ -26,13 +28,19 @@ public class WgdAssocCostServiceImpl extends ServiceImpl getAllWgdAssocCosts() { - return wgdAssocCostDao.selectAll(); + public List getAllWgdAssocCosts(WgdAssocCost page) { + Integer count = wgdAssocCostDao.getTotal(); + page.getPager().setRowCount(count); + List wgdAssocCosts = wgdAssocCostDao.selectAll(page); + return wgdAssocCosts; } @Override public List queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost) { - return wgdAssocCostDao.queryAll(wgdAssocCost); + Integer count = wgdAssocCostDao.getQueryTotal(wgdAssocCost); + wgdAssocCost.getPager().setRowCount(count); + List wgdAssocCosts = wgdAssocCostDao.queryAll(wgdAssocCost); + return wgdAssocCosts; } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java index b4c2e382..a6bade22 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java @@ -31,6 +31,8 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo) { + Integer count = wgdAssocInfoDao.getQueryTotal(wgdAssocInfo); + wgdAssocInfo.getPager().setRowCount(count); return wgdAssocInfoDao.queryAll(wgdAssocInfo); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java index 3c1a8059..fbea8d2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java @@ -33,6 +33,8 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo) { + Integer count = wgdCommiInfoDao.getQueryTotal(wgdCommiInfo); + wgdCommiInfo.getPager().setRowCount(count); return wgdCommiInfoDao.queryAll(wgdCommiInfo); } @@ -43,6 +45,7 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost) { + Integer count = wgdExReviseCostDao.getQueryTotal(wgdExReviseCost); + wgdExReviseCost.getPager().setRowCount(count); return wgdExReviseCostDao.queryAll(wgdExReviseCost); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java index ee98a8d0..f0124fa6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java @@ -32,6 +32,8 @@ public class WgdMeetCostServiceImpl extends ServiceImpl queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost) { + Integer count = wgdMeetCostDao.getQueryTotal(wgdMeetCost); + wgdMeetCost.getPager().setRowCount(count); return wgdMeetCostDao.queryAll(wgdMeetCost); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 6cea67c4..fbf42949 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -1,6 +1,11 @@ + + + LIMIT ${(page-1) * pageSize},${pageSize} + + id, @@ -29,9 +34,6 @@ - - and id = #{id} - and es_name like concat('%',#{esName},'%') @@ -61,14 +63,26 @@ + + + select count(*) from wgd_assoc_cost + + + select count(*) from wgd_assoc_info + + + select count(*) from wgd_commi_info + + - + update wgd_commi_info + + + unit = #{unit}, + + + sc_name = #{scName}, + + + ssc_name = #{sscName}, + + + wg_name = #{wgName}, + + + role = #{role}, + + + attend = #{attend}, + + + cur_time = #{curTime}, + + + job = #{job}, + + + department = #{department}, + + + tel = #{tel}, + + + term = #{term}, + + + certificate = #{certificate}, + + + account = #{account}, + + + password = #{password}, + + + remark = #{remark}, + + + where id = #{id} - + insert into wgd_commi_info + + + id, + + + unit, + + + sc_name, + + + ssc_name, + + + wg_name, + + + role, + + + attend, + + + cur_time, + + + job, + + + department, + + + tel, + + + term, + + + certificate, + + + account, + + + password, + + + remark, + + + values + + + #{id}, + + + #{unit}, + + + #{scName}, + + + #{sscName}, + + + #{wgName}, + + + #{role}, + + + #{attend}, + + + #{curTime}, + + + #{job}, + + + #{department}, + + + #{tel}, + + + #{term}, + + + #{certificate}, + + + #{account}, + + + #{password}, + + + #{remark}, + + - + delete from wgd_commi_info where id = #{id} - + delete from wgd_commi_info where id in + + #{id} + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml index 911262e9..f7060895 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml @@ -1,19 +1,46 @@ - + + + LIMIT ${(page-1) * pageSize},${pageSize} + + id,type,pro_id,pro_name,cost_outlay,cost - + where 1=1 + + and id = #{id} + + + and type = #{type} + + + and pro_id = #{proId} + + + and pro_name = #{proName} + + + and cost = #{cost} + + + and cost_outlay = #{costOutlay} + + - + update wgd_ex_revise_cost + + + type = #{type}, + + + pro_id = #{proId}, + + + pro_name = #{proName}, + + + cost = #{cost}, + + + cost_outlay = #{costOutlay}, + + + where id = #{id} - + insert into wgd_ex_revise_cost + + + id, + + + type, + + + pro_id + + + pro_name, + + + cost, + + + cost_outlay, + + + values + + + #{id}, + + + #{type}, + + + #{proId}, + + + #{proName}, + + + #{cost}, + + + #{costOutlay}, + + - + delete from wgd_ex_revise_cost where id = #{id} - + delete from wgd_ex_revise_cost where id in + + #{id} + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml index 5a7b9b68..f8499871 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml @@ -1,20 +1,50 @@ - + + + LIMIT ${(page-1) * pageSize},${pageSize} + + id,unit,meet_name,meet_time,pay_standard,pay_reality,cost_outlay - + where 1=1 + + and id = #{id} + + + and unit = #{unit} + + + and meet_name = #{meetName} + + + and meet_time = #{meetTime} + + + and pay_standard = #{payStandard} + + + and pay_reality = #{payReality} + + + and cost_outlay = #{costOutlay} + + - + update wgd_meet_cost + + + unit = #{unit}, + + + meet_name = #{meetName}, + + + meet_time = #{meetTime}, + + + pay_standard = #{payStandard}, + + + pay_reality = #{payReality}, + + + cost_outlay = #{costOutlay}, + + + where id = #{id} - + insert into wgd_meet_cost + + + id, + + + unit, + + + meet_name, + + + meet_time, + + + pay_standard, + + + pay_reality, + + + cost_outlay, + + + values + + + #{id}, + + + #{unit}, + + + #{meetName}, + + + #{meetTime}, + + + #{payStandard}, + + + #{payReality}, + + + #{costOutlay}, + + - + delete from wgd_meet_cost where id = #{id} - + delete from wgd_meet_cost where id in + + #{id} + From 11baf7eda5da56c2043a0a752d5dd904a148fa6f Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Tue, 16 Nov 2021 14:27:54 +0800 Subject: [PATCH 08/18] ~ --- .../controller/WgdCgfyController.java | 27 ++++++++++------- .../controller/WgdFyfyController.java | 27 ++++++++++------- .../controller/WgdSrbController.java | 29 +++++++++++-------- .../controller/WgdWbtjController.java | 27 ++++++++++------- .../controller/WgdWbxdController.java | 27 ++++++++++------- .../controller/WgdZcbController.java | 29 +++++++++++-------- .../da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java | 3 +- .../da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java | 11 +++++-- .../da/slrs/wgdCensusLeo/dao/WgdSrbDao.java | 3 +- .../da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java | 3 +- .../da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java | 3 +- .../da/slrs/wgdCensusLeo/dao/WgdZcbDao.java | 3 +- .../da/slrs/wgdCensusLeo/entity/WgdCgfy.java | 4 ++- .../da/slrs/wgdCensusLeo/entity/WgdFyfy.java | 6 +++- .../da/slrs/wgdCensusLeo/entity/WgdSrb.java | 6 +++- .../da/slrs/wgdCensusLeo/entity/WgdWbtj.java | 5 +++- .../da/slrs/wgdCensusLeo/entity/WgdWbxd.java | 8 ++++- .../da/slrs/wgdCensusLeo/entity/WgdZcb.java | 4 ++- .../wgdCensusLeo/service/IWgdCgfyService.java | 26 +++++------------ .../wgdCensusLeo/service/IWgdFyfyService.java | 26 +++++------------ .../wgdCensusLeo/service/IWgdSrbService.java | 24 +++++---------- .../wgdCensusLeo/service/IWgdWbtjService.java | 24 +++++---------- .../wgdCensusLeo/service/IWgdWbxdService.java | 24 +++++---------- .../wgdCensusLeo/service/IWgdZcbService.java | 24 +++++---------- .../service/impl/WgdCgfyServiceImpl.java | 6 ++-- .../service/impl/WgdFyfyServiceImpl.java | 11 ++++--- .../service/impl/WgdSrbServiceImpl.java | 12 +++++--- .../service/impl/WgdWbtjServiceImpl.java | 9 ++++-- .../service/impl/WgdWbxdServiceImpl.java | 9 ++++-- .../service/impl/WgdZcbServiceImpl.java | 9 ++++-- .../mapper/wgdCensusLeo/WgdCgfyMapper.xml | 16 ++++++---- 31 files changed, 235 insertions(+), 210 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java index a15c77d7..93648137 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusLeo.controller; import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; @@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** *

* 采购费用信息统计 前端控制器 @@ -29,14 +32,16 @@ public class WgdCgfyController extends BaseController { @Autowired IWgdCgfyService iWgdCgfyService; - @GetMapping("getAllCgfy") - public ResponseMessage getAllWgdCgfy(){//查询所有 - return Result.success(iWgdCgfyService.getAllWgdCgfy()); + @GetMapping("getAllCgfys") + public ResponseMessage getAllWgdCgfys(){//查询所有 + return Result.success(iWgdCgfyService.getAllWgdCgfys()); } - @PostMapping("queryAllCgfy") - public ResponseMessage queryAllWgdCgfy(WgdCgfy wgdCgfy){//多条件查询 - return Result.success(iWgdCgfyService.queryAllWgdCgfy(wgdCgfy)); + @PostMapping("queryAllCgfys") + public ResponseMessage queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询 + List wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy); + PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys); + return Result.success(pageInfo); } @GetMapping("getCgfyById") @@ -45,13 +50,13 @@ public class WgdCgfyController extends BaseController { } @PostMapping("modCgfy") - ResponseMessage updateWgdCgfy(WgdCgfy wgdCgfy) {//编辑 - return Result.success(iWgdCgfyService.updateWgdCgfy(wgdCgfy)); + ResponseMessage updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑 + return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy)); } @PostMapping("addCgfy") - ResponseMessage insertWgdCgfy(WgdCgfy wgdCgfy) {//插入 - return Result.success(iWgdCgfyService.insertWgdCgfy(wgdCgfy)); + ResponseMessage insertWgdCgfy(WgdCgfy WgdCgfy) {//插入 + return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy)); } @GetMapping("delCgfy") @@ -61,6 +66,6 @@ public class WgdCgfyController extends BaseController { @GetMapping("delCgfys") ResponseMessage deleteWgdCgfys(String ids){//批量删除 - return Result.success(iWgdCgfyService.deleteWgdCgfy(ids)); + return Result.success(iWgdCgfyService.deleteWgdCgfys(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java index eeefef57..be878baa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.wgdCensusLeo.controller; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; @@ -13,6 +14,8 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 翻译费用信息统计 前端控制器 @@ -28,14 +31,16 @@ public class WgdFyfyController extends BaseController { @Autowired IWgdFyfyService iWgdFyfyService; - @GetMapping("getAllFyfy") - public ResponseMessage getAllWgdFyfy(){//查询所有 - return Result.success(iWgdFyfyService.getAllWgdFyfy()); + @GetMapping("getAllFyfys") + public ResponseMessage getAllWgdFyfys(){//查询所有 + return Result.success(iWgdFyfyService.getAllWgdFyfys()); } - @PostMapping("queryAllFyfy") - public ResponseMessage queryAllWgdCgfy(WgdFyfy wgdFyfy){//多条件查询 - return Result.success(iWgdFyfyService.queryAllWgdFyfy(wgdFyfy)); + @PostMapping("queryAllFyfys") + public ResponseMessage queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询 + List wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy); + PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys); + return Result.success(pageInfo); } @GetMapping("getFyfyById") @@ -44,13 +49,13 @@ public class WgdFyfyController extends BaseController { } @PostMapping("modFyfy") - ResponseMessage updateWgdFyfy(WgdFyfy wgdFyfy) {//编辑 - return Result.success(iWgdFyfyService.updateWgdFyfy(wgdFyfy)); + ResponseMessage updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑 + return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy)); } @PostMapping("addFyfy") - ResponseMessage insertWgdFyfy(WgdFyfy wgdFyfy) {//插入 - return Result.success(iWgdFyfyService.insertWgdFyfy(wgdFyfy)); + ResponseMessage insertWgdFyfy(WgdFyfy WgdFyfy) {//插入 + return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy)); } @GetMapping("delFyfy") @@ -60,6 +65,6 @@ public class WgdFyfyController extends BaseController { @GetMapping("delFyfys") ResponseMessage deleteWgdFyfys(String ids){//批量删除 - return Result.success(iWgdFyfyService.deleteWgdFyfy(ids)); + return Result.success(iWgdFyfyService.deleteWgdFyfys(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java index 5b432de3..53a5d130 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java @@ -1,18 +1,21 @@ package com.adc.da.slrs.wgdCensusLeo.controller; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 标准制修订补助资金收支统计收入表 前端控制器 @@ -28,14 +31,16 @@ public class WgdSrbController extends BaseController { @Autowired IWgdSrbService iWgdSrbService; - @GetMapping("getAllSrb") - public ResponseMessage getAllWgdSrb(){//查询所有 - return Result.success(iWgdSrbService.getAllWgdSrb()); + @GetMapping("getAllSrbs") + public ResponseMessage getAllWgdSrbs(){//查询所有 + return Result.success(iWgdSrbService.getAllWgdSrbs()); } - @PostMapping("queryAllSrb") - public ResponseMessage queryAllWgdSrb(WgdSrb wgdSrb){//多条件查询 - return Result.success(iWgdSrbService.queryAllWgdSrb(wgdSrb)); + @PostMapping("queryAllSrbs") + public ResponseMessage queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询 + List wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb); + PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs); + return Result.success(pageInfo); } @GetMapping("getSrbById") @@ -44,13 +49,13 @@ public class WgdSrbController extends BaseController { } @PostMapping("modSrb") - ResponseMessage updateWgdSrb(WgdSrb wgdSrb) {//编辑 - return Result.success(iWgdSrbService.updateWgdSrb(wgdSrb)); + ResponseMessage updateWgdSrb(WgdSrb WgdSrb) {//编辑 + return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb)); } @PostMapping("addSrb") - ResponseMessage insertWgdSrb(WgdSrb wgdSrb) {//插入 - return Result.success(iWgdSrbService.insertWgdSrb(wgdSrb)); + ResponseMessage insertWgdSrb(WgdSrb WgdSrb) {//插入 + return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb)); } @GetMapping("delSrb") @@ -60,6 +65,6 @@ public class WgdSrbController extends BaseController { @GetMapping("delSrbs") ResponseMessage deleteWgdSrbs(String ids){//批量删除 - return Result.success(iWgdSrbService.deleteWgdSrb(ids)); + return Result.success(iWgdSrbService.deleteWgdSrbs(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java index d8709374..e581b18d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.wgdCensusLeo.controller; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; @@ -13,6 +14,8 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 参与外部协会会议统计 前端控制器 @@ -28,14 +31,16 @@ public class WgdWbtjController extends BaseController { @Autowired IWgdWbtjService iWgdWbtjService; - @GetMapping("getAllWbtj") - public ResponseMessage getAllWgdWbtj(){//查询所有 - return Result.success(iWgdWbtjService.getAllWgdWbtj()); + @GetMapping("getAllWbtjs") + public ResponseMessage getAllWgdWbtjs(){//查询所有 + return Result.success(iWgdWbtjService.getAllWgdWbtjs()); } - @PostMapping("queryAllWbtj") - public ResponseMessage queryAllWgdWbtj(WgdWbtj wgdWbtj){//多条件查询 - return Result.success(iWgdWbtjService.queryAllWgdWbtj(wgdWbtj)); + @PostMapping("queryAllWbtjs") + public ResponseMessage queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询 + List wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj); + PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs); + return Result.success(pageInfo); } @GetMapping("getWbtjById") @@ -44,13 +49,13 @@ public class WgdWbtjController extends BaseController { } @PostMapping("modWbtj") - ResponseMessage updateWgdWbtj(WgdWbtj wgdWbtj) {//编辑 - return Result.success(iWgdWbtjService.updateWgdWbtj(wgdWbtj)); + ResponseMessage updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑 + return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj)); } @PostMapping("addWbtj") - ResponseMessage insertWgdWbtj(WgdWbtj wgdWbtj) {//插入 - return Result.success(iWgdWbtjService.insertWgdWbtj(wgdWbtj)); + ResponseMessage insertWgdWbtj(WgdWbtj WgdWbtj) {//插入 + return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj)); } @GetMapping("delWbtj") @@ -60,6 +65,6 @@ public class WgdWbtjController extends BaseController { @GetMapping("delWbtjs") ResponseMessage deleteWgdWbtjs(String ids){//批量删除 - return Result.success(iWgdWbtjService.deleteWgdWbtj(ids)); + return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java index 799d66b7..36566cd7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.wgdCensusLeo.controller; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; @@ -13,6 +14,8 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 参与外部标准制修订信息统计 前端控制器 @@ -28,14 +31,16 @@ public class WgdWbxdController extends BaseController { @Autowired IWgdWbxdService iWgdWbxdService; - @GetMapping("getAllWbxd") - public ResponseMessage getAllWgdWbxd(){//查询所有 - return Result.success(iWgdWbxdService.getAllWgdWbxd()); + @GetMapping("getAllWbxds") + public ResponseMessage getAllWgdWbxds(){//查询所有 + return Result.success(iWgdWbxdService.getAllWgdWbxds()); } - @PostMapping("queryAllWbxd") - public ResponseMessage queryAllWgdWbxd(WgdWbxd wgdWbxd){//多条件查询 - return Result.success(iWgdWbxdService.queryAllWgdWbxd(wgdWbxd)); + @PostMapping("queryAllWbxds") + public ResponseMessage queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询 + List wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd); + PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds); + return Result.success(pageInfo); } @GetMapping("getWbxdById") @@ -44,13 +49,13 @@ public class WgdWbxdController extends BaseController { } @PostMapping("modWbxd") - ResponseMessage updateWgdWbxd(WgdWbxd wgdWbxd) {//编辑 - return Result.success(iWgdWbxdService.updateWgdWbxd(wgdWbxd)); + ResponseMessage updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑 + return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd)); } @PostMapping("addWbxd") - ResponseMessage insertWgdWbxd(WgdWbxd wgdWbxd) {//插入 - return Result.success(iWgdWbxdService.insertWgdWbxd(wgdWbxd)); + ResponseMessage insertWgdWbxd(WgdWbxd WgdWbxd) {//插入 + return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd)); } @GetMapping("delWbxd") @@ -60,6 +65,6 @@ public class WgdWbxdController extends BaseController { @GetMapping("delWbxds") ResponseMessage deleteWgdWbxds(String ids){//批量删除 - return Result.success(iWgdWbxdService.deleteWgdWbxd(ids)); + return Result.success(iWgdWbxdService.deleteWgdWbxds(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java index 3eb648b7..d42fb3a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -1,18 +1,21 @@ package com.adc.da.slrs.wgdCensusLeo.controller; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 标准制修订补助资金收支统计支出表 前端控制器 @@ -28,14 +31,16 @@ public class WgdZcbController extends BaseController { @Autowired IWgdZcbService iWgdZcbService; - @GetMapping("getAllZcb") - public ResponseMessage getAllWgdZcb(){//查询所有 - return Result.success(iWgdZcbService.getAllWgdZcb()); + @GetMapping("getAllZcbs") + public ResponseMessage getAllWgdZcbs(){//查询所有 + return Result.success(iWgdZcbService.getAllWgdZcbs()); } - @PostMapping("queryAllZcb") - public ResponseMessage queryAllWgdZcb(WgdZcb wgdZcb){//多条件查询 - return Result.success(iWgdZcbService.queryAllWgdZcb(wgdZcb)); + @PostMapping("queryAllZcbs") + public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 + List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); + PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); + return Result.success(pageInfo); } @GetMapping("getZcbById") @@ -44,13 +49,13 @@ public class WgdZcbController extends BaseController { } @PostMapping("modZcb") - ResponseMessage updateWgdZcb(WgdZcb wgdZcb) {//编辑 - return Result.success(iWgdZcbService.updateWgdZcb(wgdZcb)); + ResponseMessage updateWgdZcb(WgdZcb WgdZcb) {//编辑 + return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb)); } @PostMapping("addZcb") - ResponseMessage insertWgdZcb(WgdZcb wgdZcb) {//插入 - return Result.success(iWgdZcbService.insertWgdZcb(wgdZcb)); + ResponseMessage insertWgdZcb(WgdZcb WgdZcb) {//插入 + return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb)); } @GetMapping("delZcb") @@ -60,6 +65,6 @@ public class WgdZcbController extends BaseController { @GetMapping("delZcbs") ResponseMessage deleteWgdZcbs(String ids){//批量删除 - return Result.success(iWgdZcbService.deleteWgdZcb(ids)); + return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java index f42f56f8..b9cecd23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java @@ -14,6 +14,7 @@ import java.util.List; * @since 2021-11-12 */ public interface WgdCgfyDao extends BaseMapper { + Integer getQueryTotal(WgdCgfy WgdCgfy);//总数 List selectAll();//查询所有 List queryAll(WgdCgfy wgdCgfy);//多条件查询 WgdCgfy selectOne(String id);//查询详情 @@ -21,5 +22,5 @@ public interface WgdCgfyDao extends BaseMapper { int updateOne(WgdCgfy wgdCgfy);//编辑 int insertOne(WgdCgfy wgdCgfy);//插入 int deleteOne(String id);//删除 - int deleteBatch(String[] ids);//批量删除 + int deleteBatch();//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java index 3be601a5..70532885 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java @@ -14,12 +14,19 @@ import java.util.List; * @since 2021-11-12 */ public interface WgdFyfyDao extends BaseMapper { + Integer getQueryTotal(WgdFyfy WgdFyfy);//总数 + List selectAll();//查询所有 + List queryAll(WgdFyfy wgdFyfy);//多条件查询 + WgdFyfy selectOne(String id);//查询详情 int updateOne(WgdFyfy wgdFyfy);//编辑 + int insertOne(WgdFyfy wgdFyfy);//插入 + int deleteOne(String id);//删除 - int deleteBatch(String[] ids);//批量删除 -} + + int deleteBatch();//批量删除 +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java index e219f5cb..b30aa0b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java @@ -14,6 +14,7 @@ import java.util.List; * @since 2021-11-12 */ public interface WgdSrbDao extends BaseMapper { + Integer getQueryTotal(WgdSrb WgdSrb);//总数 List selectAll();//查询所有 List queryAll(WgdSrb wgdSrb);//多条件查询 WgdSrb selectOne(String id);//查询详情 @@ -21,5 +22,5 @@ public interface WgdSrbDao extends BaseMapper { int updateOne(WgdSrb wgdSrb);//编辑 int insertOne(WgdSrb wgdSrb);//插入 int deleteOne(String id);//删除 - int deleteBatch(String[] ids);//批量删除 + int deleteBatch();//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java index 64821346..8b432eb2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java @@ -14,6 +14,7 @@ import java.util.List; * @since 2021-11-12 */ public interface WgdWbtjDao extends BaseMapper { + Integer getQueryTotal(WgdWbtj WgdWbtj);//总数 List selectAll();//查询所有 List queryAll(WgdWbtj wgdWbtj);//多条件查询 WgdWbtj selectOne(String id);//查询详情 @@ -21,5 +22,5 @@ public interface WgdWbtjDao extends BaseMapper { int updateOne(WgdWbtj wgdWbtj);//编辑 int insertOne(WgdWbtj wgdWbtj);//插入 int deleteOne(String id);//删除 - int deleteBatch(String[] ids);//批量删除 + int deleteBatch();//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java index 686defcc..d20d355e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java @@ -14,6 +14,7 @@ import java.util.List; * @since 2021-11-12 */ public interface WgdWbxdDao extends BaseMapper { + Integer getQueryTotal(WgdWbxd WgdWbxd);//总数 List selectAll();//查询所有 List queryAll(WgdWbxd wgdWbxd);//多条件查询 WgdWbxd selectOne(String id);//查询详情 @@ -21,5 +22,5 @@ public interface WgdWbxdDao extends BaseMapper { int updateOne(WgdWbxd wgdWbxd);//编辑 int insertOne(WgdWbxd wgdWbxd);//插入 int deleteOne(String id);//删除 - int deleteBatch(String[] ids);//批量删除 + int deleteBatch();//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java index 00c8df4e..a2c3773d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java @@ -14,6 +14,7 @@ import java.util.List; * @since 2021-11-12 */ public interface WgdZcbDao extends BaseMapper { + Integer getQueryTotal(WgdZcb WgdZcb);//总数 List selectAll();//查询所有 List queryAll(WgdZcb wgdZcb);//多条件查询 WgdZcb selectOne(String id);//查询详情 @@ -21,5 +22,5 @@ public interface WgdZcbDao extends BaseMapper { int updateOne(WgdZcb wgdZcb);//编辑 int insertOne(WgdZcb wgdZcb);//插入 int deleteOne(String id);//删除 - int deleteBatch(String[] ids);//批量删除 + int deleteBatch();//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java index a71fc8a7..7303343e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java @@ -2,6 +2,8 @@ package com.adc.da.slrs.wgdCensusLeo.entity; import com.adc.da.base.entity.BaseEntity; import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,7 +22,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="WgdCgfy对象", description="采购费用信息统计") -public class WgdCgfy extends BaseEntity { +public class WgdCgfy extends BasePage { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java index 66116ea1..87e4886a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java @@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity; import com.adc.da.base.entity.BaseEntity; import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -20,7 +23,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="WgdFyfy对象", description="翻译费用信息统计") -public class WgdFyfy extends BaseEntity { +public class WgdFyfy extends BasePage { private static final long serialVersionUID = 1L; @@ -46,6 +49,7 @@ public class WgdFyfy extends BaseEntity { private String cost; @ApiModelProperty(value = "翻译完成时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String time; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java index 250f0954..b1df6e0e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java @@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity; import com.adc.da.base.entity.BaseEntity; import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -20,7 +23,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表") -public class WgdSrb extends BaseEntity { +public class WgdSrb extends BasePage { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") @@ -39,6 +42,7 @@ public class WgdSrb extends BaseEntity { private String money; @ApiModelProperty(value = "入账时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String data; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java index 27f7d004..6056acc2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java @@ -1,12 +1,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity; import com.adc.da.base.entity.BaseEntity; +import com.adc.da.base.page.BasePage; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -20,7 +22,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计") -public class WgdWbtj extends BaseEntity { +public class WgdWbtj extends BasePage { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") @@ -33,6 +35,7 @@ public class WgdWbtj extends BaseEntity { private String meeting; @ApiModelProperty(value = "会议时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String time; @ApiModelProperty(value = "会议地点") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java index 0ec6e035..f95a486c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java @@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity; import com.adc.da.base.entity.BaseEntity; import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -20,7 +23,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计") -public class WgdWbxd extends BaseEntity { +public class WgdWbxd extends BasePage { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") @@ -48,9 +51,11 @@ public class WgdWbxd extends BaseEntity { private String preside; @ApiModelProperty(value = "发布日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String dataStart; @ApiModelProperty(value = "实施日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String dataImplement; @ApiModelProperty(value = "颁布机构") @@ -60,6 +65,7 @@ public class WgdWbxd extends BaseEntity { private String drafting; @ApiModelProperty(value = "备案时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String dataRecord; @ApiModelProperty(value = "提报单位名称") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java index ce6bc7eb..20e2e9cf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -2,6 +2,8 @@ package com.adc.da.slrs.wgdCensusLeo.entity; import com.adc.da.base.entity.BaseEntity; import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,7 +22,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表") -public class WgdZcb extends BaseEntity { +public class WgdZcb extends BasePage { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java index f0e8fa75..df3c5e48 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java @@ -14,24 +14,12 @@ import java.util.List; * @since 2021-11-12 */ public interface IWgdCgfyService extends IService { + List getAllWgdCgfys();//查询所有 + List queryAllWgdCgfys(WgdCgfy wgdCgfy);//多条件查询 + WgdCgfy getWgdCgfyById(String id);//查询详情 - Object getAllWgdCgfy(); - - Object queryAllWgdCgfy(WgdCgfy wgdCgfy); - - List queryAllWgdAssocCosts(WgdCgfy wgdAssocCost); - - List getAllWgdCgfys(); - - List queryAllWgdCgfys(WgdCgfy wgdCgfy); - - Object getWgdCgfyById(String id); - - int updateWgdCgfy(WgdCgfy wgdCgfy); - - int insertWgdCgfy(WgdCgfy wgdCgfy); - - int deleteWgdCgfy(String id); - - int deleteWgdCgfys(String ids); + int updateWgdCgfy(WgdCgfy wgdCgfy);//编辑 + int insertWgdCgfy(WgdCgfy wgdCgfy);//插入 + int deleteWgdCgfy(String id);//删除 + int deleteWgdCgfys(String ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java index 1bef9456..4a16bdf8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java @@ -14,22 +14,12 @@ import java.util.List; * @since 2021-11-12 */ public interface IWgdFyfyService extends IService { + List getAllWgdFyfys();//查询所有 + List queryAllWgdFyfys(WgdFyfy wgdFyfy);//多条件查询 + WgdFyfy getWgdFyfyById(String id);//查询详情 - Object getAllWgdFyfy(); - - Object queryAllWgdFyfy(WgdFyfy wgdFyfy); - - List getAllWgdFyfys(); - - List queryAllWgdFyfys(WgdFyfy wgdFyfy); - - Object getWgdFyfyById(String id); - - int updateWgdFyfy(WgdFyfy wgdFyfy); - - int insertWgdFyfy(WgdFyfy wgdFyfy); - - int deleteWgdFyfy(String id); - - int deleteWgdFyfys(String ids); -} + int updateWgdFyfy(WgdFyfy wgdFyfy);//编辑 + int insertWgdFyfy(WgdFyfy wgdFyfy);//插入 + int deleteWgdFyfy(String id);//删除 + int deleteWgdFyfys(String ids);//批量删除 +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java index 32cf2f3e..fcb2c28d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java @@ -14,22 +14,12 @@ import java.util.List; * @since 2021-11-12 */ public interface IWgdSrbService extends IService { + List getAllWgdSrbs();//查询所有 + List queryAllWgdSrbs(WgdSrb wgdSrb);//多条件查询 + WgdSrb getWgdSrbById(String id);//查询详情 - Object getAllWgdSrb(); - - Object queryAllWgdSrb(WgdSrb wgdSrb); - - List getAllWgdSrbs(); - - List queryAllWgdSrbs(WgdSrb wgdSrb); - - Object getWgdSrbById(String id); - - int updateWgdSrb(WgdSrb wgdSrb); - - int insertWgdSrb(WgdSrb wgdSrb); - - int deleteWgdSrb(String id); - - int deleteWgdSrbs(String ids); + int updateWgdSrb(WgdSrb wgdSrb);//编辑 + int insertWgdSrb(WgdSrb wgdSrb);//插入 + int deleteWgdSrb(String id);//删除 + int deleteWgdSrbs(String ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java index a4953148..80b2505a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java @@ -14,22 +14,12 @@ import java.util.List; * @since 2021-11-12 */ public interface IWgdWbtjService extends IService { + List getAllWgdWbtjs();//查询所有 + List queryAllWgdWbtjs(WgdWbtj wgdWbtj);//多条件查询 + WgdWbtj getWgdWbtjById(String id);//查询详情 - Object getAllWgdWbtj(); - - Object queryAllWgdWbtj(WgdWbtj wgdWbtj); - - List getAllWgdWbtjs(); - - List queryAllWgdWbtjs(WgdWbtj wgdWbtj); - - Object getWgdWbtjById(String id); - - int updateWgdWbtj(WgdWbtj wgdWbtj); - - int insertWgdWbtj(WgdWbtj wgdWbtj); - - int deleteWgdWbtj(String id); - - int deleteWgdWbtjs(String ids); + int updateWgdWbtj(WgdWbtj wgdWbtj);//编辑 + int insertWgdWbtj(WgdWbtj wgdWbtj);//插入 + int deleteWgdWbtj(String id);//删除 + int deleteWgdWbtjs(String ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java index cc532b28..cfc0e862 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java @@ -14,22 +14,12 @@ import java.util.List; * @since 2021-11-12 */ public interface IWgdWbxdService extends IService { + List getAllWgdWbxds();//查询所有 + List queryAllWgdWbxds(WgdWbxd wgdWbxd);//多条件查询 + WgdWbxd getWgdWbxdById(String id);//查询详情 - Object getAllWgdWbxd(); - - Object queryAllWgdWbxd(WgdWbxd wgdWbxd); - - List getAllWgdWbxds(); - - List queryAllWgdWbxds(WgdWbxd wgdWbxd); - - Object getWgdWbxdById(String id); - - int updateWgdWbxd(WgdWbxd wgdWbxd); - - int insertWgdWbxd(WgdWbxd wgdWbxd); - - int deleteWgdWbxd(String id); - - int deleteWgdWbxds(String ids); + int updateWgdWbxd(WgdWbxd wgdWbxd);//编辑 + int insertWgdWbxd(WgdWbxd wgdWbxd);//插入 + int deleteWgdWbxd(String id);//删除 + int deleteWgdWbxds(String ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java index b97f7b0a..505af47a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java @@ -14,22 +14,12 @@ import java.util.List; * @since 2021-11-12 */ public interface IWgdZcbService extends IService { + List getAllWgdZcbs();//查询所有 + List queryAllWgdZcbs(WgdZcb wgdZcb);//多条件查询 + WgdZcb getWgdZcbById(String id);//查询详情 - Object getAllWgdZcb(); - - Object queryAllWgdZcb(WgdZcb wgdZcb); - - List getAllWgdZcbs(); - - List queryAllWgdZcbs(WgdZcb wgdZcb); - - Object getWgdZcbById(String id); - - int updateWgdZcb(WgdZcb wgdZcb); - - int insertWgdZcb(WgdZcb wgdZcb); - - int deleteWgdZcb(String id); - - int deleteWgdZcbs(String ids); + int updateWgdZcb(WgdZcb wgdZcb);//编辑 + int insertWgdZcb(WgdZcb wgdZcb);//插入 + int deleteWgdZcb(String id);//删除 + int deleteWgdZcbs(String ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java index 30bb76a3..4150dc78 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; * @since 2021-11-12 */ @Service -public abstract class WgdCgfyServiceImpl extends ServiceImpl implements IWgdCgfyService { +public class WgdCgfyServiceImpl extends ServiceImpl implements IWgdCgfyService { @Autowired WgdCgfyDao wgdCgfyDao; @@ -31,6 +31,8 @@ public abstract class WgdCgfyServiceImpl extends ServiceImpl queryAllWgdCgfys(WgdCgfy wgdCgfy) { + Integer count = wgdCgfyDao.getQueryTotal(wgdCgfy); + wgdCgfy.getPager().setRowCount(count); return wgdCgfyDao.queryAll(wgdCgfy); } @@ -58,6 +60,6 @@ public abstract class WgdCgfyServiceImpl extends ServiceImpl implements IWgdFyfyService { +public class WgdFyfyServiceImpl extends ServiceImpl implements IWgdFyfyService { + @Autowired WgdFyfyDao wgdFyfyDao; @@ -30,6 +31,8 @@ public abstract class WgdFyfyServiceImpl extends ServiceImpl queryAllWgdFyfys(WgdFyfy wgdFyfy) { + Integer count = wgdFyfyDao.getQueryTotal(wgdFyfy); + wgdFyfy.getPager().setRowCount(count); return wgdFyfyDao.queryAll(wgdFyfy); } @@ -57,6 +60,6 @@ public abstract class WgdFyfyServiceImpl extends ServiceImpl implements IWgdSrbService { +public class WgdSrbServiceImpl extends ServiceImpl implements IWgdSrbService { + @Autowired WgdSrbDao wgdSrbDao; + @Override public List getAllWgdSrbs() { return wgdSrbDao.selectAll(); @@ -29,6 +31,8 @@ public abstract class WgdSrbServiceImpl extends ServiceImpl i @Override public List queryAllWgdSrbs(WgdSrb wgdSrb) { + Integer count = wgdSrbDao.getQueryTotal(wgdSrb); + wgdSrb.getPager().setRowCount(count); return wgdSrbDao.queryAll(wgdSrb); } @@ -56,6 +60,6 @@ public abstract class WgdSrbServiceImpl extends ServiceImpl i @Override public int deleteWgdSrbs(String ids) { String[] str = ids.split(","); - return wgdSrbDao.deleteBatch(str); + return wgdSrbDao.deleteBatch(); } -} +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java index d08dece4..70c65e7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java @@ -19,7 +19,8 @@ import java.util.List; * @since 2021-11-12 */ @Service -public abstract class WgdWbtjServiceImpl extends ServiceImpl implements IWgdWbtjService { +public class WgdWbtjServiceImpl extends ServiceImpl implements IWgdWbtjService { + @Autowired WgdWbtjDao wgdWbtjDao; @@ -30,6 +31,8 @@ public abstract class WgdWbtjServiceImpl extends ServiceImpl queryAllWgdWbtjs(WgdWbtj wgdWbtj) { + Integer count = wgdWbtjDao.getQueryTotal(wgdWbtj); + wgdWbtj.getPager().setRowCount(count); return wgdWbtjDao.queryAll(wgdWbtj); } @@ -57,6 +60,6 @@ public abstract class WgdWbtjServiceImpl extends ServiceImpl implements IWgdWbxdService { +public class WgdWbxdServiceImpl extends ServiceImpl implements IWgdWbxdService { + @Autowired WgdWbxdDao wgdWbxdDao; @@ -30,6 +31,8 @@ public abstract class WgdWbxdServiceImpl extends ServiceImpl queryAllWgdWbxds(WgdWbxd wgdWbxd) { + Integer count = wgdWbxdDao.getQueryTotal(wgdWbxd); + wgdWbxd.getPager().setRowCount(count); return wgdWbxdDao.queryAll(wgdWbxd); } @@ -57,6 +60,6 @@ public abstract class WgdWbxdServiceImpl extends ServiceImpl implements IWgdZcbService { +public class WgdZcbServiceImpl extends ServiceImpl implements IWgdZcbService { + @Autowired WgdZcbDao wgdZcbDao; @@ -30,6 +31,8 @@ public abstract class WgdZcbServiceImpl extends ServiceImpl i @Override public List queryAllWgdZcbs(WgdZcb wgdZcb) { + Integer count = wgdZcbDao.getQueryTotal(wgdZcb); + wgdZcb.getPager().setRowCount(count); return wgdZcbDao.queryAll(wgdZcb); } @@ -57,6 +60,6 @@ public abstract class WgdZcbServiceImpl extends ServiceImpl i @Override public int deleteWgdZcbs(String ids) { String[] str = ids.split(","); - return wgdZcbDao.deleteBatch(str); + return wgdZcbDao.deleteBatch(); } -} +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml index 0355c78d..c56391f0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml @@ -1,13 +1,18 @@ + + + LIMIT ${(page-1) * pageSize},${pageSize} + + id,type,number,name,pages,cost - + where 1=1 and id = #{id} @@ -26,18 +31,19 @@ and cost = #{cost} - - + - - select from wgd_assoc_info + - + update wgd_assoc_info @@ -215,6 +216,7 @@ where id = #{id} + insert into wgd_assoc_info @@ -454,6 +456,7 @@ delete from wgd_assoc_info where id = #{id} + delete from wgd_assoc_info where id in From 7485c048016db622a59ceb1a6e2679b0463efbf8 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 18 Nov 2021 15:52:03 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 7b241288..85625c89 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -78,6 +78,9 @@ public class WebMvcConfig implements WebMvcConfigurer { // 拆分查看页，导出程序异常 addInterceptor.excludePathPatterns("/api/lawss/sarFileSplitItems/exportSplitInfoZip"); + //调研流程下载接口 + addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); From c260cd5533cab3adc5d72d79a010ffc3a92a4d4e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 18 Nov 2021 16:17:27 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index b3792ef9..9b1ce5e4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -995,7 +995,10 @@ and sar_standards_info.ID in (select distinct stand_id from sar_stand_items) - + + + limit ${page.pager.startIndex-1},${page.pageSize} From 9dc1eca7245f0836870d4c6e3b3b5f07b1ffb9b3 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 11:19:11 +0800 Subject: [PATCH 17/18] =?UTF-8?q?update:=E6=96=87=E6=A1=A3=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=9B=BE=E7=89=87=E5=AD=98=E5=82=A8=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=85=A5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 1 + .../service/impl/SarFileSplitInfoEOServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 485a213d..bd254d7d 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -61,6 +61,7 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5 # 文档存储路径指向 # ============================================== file.path=/usr/laws/file/ +file.split.path=/usr/laws/file/ # 云端OCR识别集成配置参数 #OCR请求识别URL地址 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 6c6bf9ca..d2f18ceb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -57,6 +57,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService private IAttFileEOService attFileEOService; @Value("${file.path}") private String filePath;//文件存储路径 + @Value("${file.split.path}") + private String splitFilePath;//拆分图片存储路径 /** * 文件下载路径 */ @@ -480,7 +482,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService try { FileOutputStream fos = new FileOutputStream(filepathandname); fos.write(bytev); - String path = "uploadPath/img/" + imageName; + String path = splitFilePath +"/" + imageName; String imgCon = ""; message.getItemsCondi().add(imgCon); message.setItermsConditions(message.getItermsConditions() + imgCon); From 5abbc7edd94e27644ad7d552d949ec70d77c2f93 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Fri, 19 Nov 2021 11:19:42 +0800 Subject: [PATCH 18/18] ~ --- .../controller/WgdCgfyController.java | 9 ++++++-- .../controller/WgdFyfyController.java | 9 ++++++-- .../controller/WgdSrbController.java | 9 ++++++-- .../controller/WgdWbtjController.java | 9 ++++++-- .../controller/WgdWbxdController.java | 9 ++++++-- .../controller/WgdZcbController.java | 9 ++++++-- .../da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdSrbDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdZcbDao.java | 2 +- .../da/slrs/wgdCensusLeo/entity/WgdSrb.java | 4 ++-- .../da/slrs/wgdCensusLeo/entity/WgdZcb.java | 2 +- .../service/impl/WgdCgfyServiceImpl.java | 3 ++- .../service/impl/WgdFyfyServiceImpl.java | 2 +- .../service/impl/WgdSrbServiceImpl.java | 2 +- .../service/impl/WgdWbtjServiceImpl.java | 2 +- .../service/impl/WgdWbxdServiceImpl.java | 2 +- .../service/impl/WgdZcbServiceImpl.java | 2 +- .../mapper/wgdCensusLeo/WgdCgfyMapper.xml | 3 +++ .../mapper/wgdCensusLeo/WgdFyfyMapper.xml | 21 ++++++++++++++++++- .../mapper/wgdCensusLeo/WgdSrbMapper.xml | 7 +++++++ .../mapper/wgdCensusLeo/WgdWbtjMapper.xml | 7 +++++++ .../mapper/wgdCensusLeo/WgdWbxdMapper.xml | 7 +++++++ .../mapper/wgdCensusLeo/WgdZcbMapper.xml | 7 +++++++ 26 files changed, 109 insertions(+), 28 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java index 78241ecc..ca9b942d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdCgfyController extends BaseController { return Result.success(iWgdCgfyService.getAllWgdCgfys()); } + @ApiOperation("查询") @GetMapping("/queryAllCgfys") public ResponseMessage queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询 List wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy); @@ -45,22 +47,25 @@ public class WgdCgfyController extends BaseController { return Result.success(iWgdCgfyService.getWgdCgfyById(id)); } + @ApiOperation("更新") @PostMapping("/modCgfy") ResponseMessage updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑 return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy)); } + @ApiOperation("添加") @PostMapping("/addCgfy") ResponseMessage insertWgdCgfy(WgdCgfy WgdCgfy) {//插入 return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy)); } - @DeleteMapping("/delCgfy") + @PostMapping("/delCgfy") ResponseMessage deleteWgdCgfy(String id){//删除 return Result.success(iWgdCgfyService.deleteWgdCgfy(id)); } - @DeleteMapping("/delCgfys") + @ApiOperation("删除") + @PostMapping("/delCgfys") ResponseMessage deleteWgdCgfys(String ids){//批量删除 return Result.success(iWgdCgfyService.deleteWgdCgfys(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java index e176458c..37873d6f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdFyfyController extends BaseController { return Result.success(iWgdFyfyService.getAllWgdFyfys()); } + @ApiOperation("查询") @GetMapping("/queryAllFyfys") public ResponseMessage queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询 List wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy); @@ -45,22 +47,25 @@ public class WgdFyfyController extends BaseController { return Result.success(iWgdFyfyService.getWgdFyfyById(id)); } + @ApiOperation("更新") @PostMapping("/modFyfy") ResponseMessage updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑 return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy)); } + @ApiOperation("添加") @PostMapping("/addFyfy") ResponseMessage insertWgdFyfy(WgdFyfy WgdFyfy) {//插入 return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy)); } - @DeleteMapping("/delFyfy") + @PostMapping("/delFyfy") ResponseMessage deleteWgdFyfy(String id){//删除 return Result.success(iWgdFyfyService.deleteWgdFyfy(id)); } - @DeleteMapping("/delFyfys") + @ApiOperation("删除") + @PostMapping("/delFyfys") ResponseMessage deleteWgdFyfys(String ids){//批量删除 return Result.success(iWgdFyfyService.deleteWgdFyfys(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java index 0c5547f3..51249bbf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdSrbController extends BaseController { return Result.success(iWgdSrbService.getAllWgdSrbs()); } + @ApiOperation("查询") @GetMapping("/queryAllSrbs") public ResponseMessage queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询 List wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb); @@ -45,22 +47,25 @@ public class WgdSrbController extends BaseController { return Result.success(iWgdSrbService.getWgdSrbById(id)); } + @ApiOperation("更新") @PostMapping("/modSrb") ResponseMessage updateWgdSrb(WgdSrb WgdSrb) {//编辑 return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb)); } + @ApiOperation("添加") @PostMapping("/addSrb") ResponseMessage insertWgdSrb(WgdSrb WgdSrb) {//插入 return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb)); } - @DeleteMapping("/delSrb") + @PostMapping("/delSrb") ResponseMessage deleteWgdSrb(String id){//删除 return Result.success(iWgdSrbService.deleteWgdSrb(id)); } - @DeleteMapping("/delSrbs") + @ApiOperation("删除") + @PostMapping("/delSrbs") ResponseMessage deleteWgdSrbs(String ids){//批量删除 return Result.success(iWgdSrbService.deleteWgdSrbs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java index 0c386d6c..28694017 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdWbtjController extends BaseController { return Result.success(iWgdWbtjService.getAllWgdWbtjs()); } + @ApiOperation("查询") @GetMapping("/queryAllWbtjs") public ResponseMessage queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询 List wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj); @@ -45,22 +47,25 @@ public class WgdWbtjController extends BaseController { return Result.success(iWgdWbtjService.getWgdWbtjById(id)); } + @ApiOperation("更新") @PostMapping("/modWbtj") ResponseMessage updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑 return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj)); } + @ApiOperation("添加") @PostMapping("/addWbtj") ResponseMessage insertWgdWbtj(WgdWbtj WgdWbtj) {//插入 return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj)); } - @DeleteMapping("/delWbtj") + @PostMapping("/delWbtj") ResponseMessage deleteWgdWbtj(String id){//删除 return Result.success(iWgdWbtjService.deleteWgdWbtj(id)); } - @DeleteMapping("/delWbtjs") + @ApiOperation("删除") + @PostMapping("/delWbtjs") ResponseMessage deleteWgdWbtjs(String ids){//批量删除 return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java index 72a64e4e..dbb61d9f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdWbxdController extends BaseController { return Result.success(iWgdWbxdService.getAllWgdWbxds()); } + @ApiOperation("查询") @GetMapping("/queryAllWbxds") public ResponseMessage queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询 List wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd); @@ -45,22 +47,25 @@ public class WgdWbxdController extends BaseController { return Result.success(iWgdWbxdService.getWgdWbxdById(id)); } + @ApiOperation("更新") @PostMapping("/modWbxd") ResponseMessage updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑 return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd)); } + @ApiOperation("添加") @PostMapping("/addWbxd") ResponseMessage insertWgdWbxd(WgdWbxd WgdWbxd) {//插入 return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd)); } - @DeleteMapping("/delWbxd") + @PostMapping("/delWbxd") ResponseMessage deleteWgdWbxd(String id){//删除 return Result.success(iWgdWbxdService.deleteWgdWbxd(id)); } - @DeleteMapping("/delWbxds") + @ApiOperation("删除") + @PostMapping("/delWbxds") ResponseMessage deleteWgdWbxds(String ids){//批量删除 return Result.success(iWgdWbxdService.deleteWgdWbxds(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java index 3556f79f..49cbfd3d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdZcbController extends BaseController { return Result.success(iWgdZcbService.getAllWgdZcbs()); } + @ApiOperation("查询") @GetMapping("/queryAllZcbs") public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); @@ -45,22 +47,25 @@ public class WgdZcbController extends BaseController { return Result.success(iWgdZcbService.getWgdZcbById(id)); } + @ApiOperation("更新") @PostMapping("/modZcb") ResponseMessage updateWgdZcb(WgdZcb WgdZcb) {//编辑 return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb)); } + @ApiOperation("添加") @PostMapping("/addZcb") ResponseMessage insertWgdZcb(WgdZcb WgdZcb) {//插入 return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb)); } - @DeleteMapping("/delZcb") + @PostMapping("/delZcb") ResponseMessage deleteWgdZcb(String id){//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } - @DeleteMapping("/delZcbs") + @ApiOperation("删除") + @PostMapping("/delZcbs") ResponseMessage deleteWgdZcbs(String ids){//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java index b9cecd23..ea2981fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java @@ -22,5 +22,5 @@ public interface WgdCgfyDao extends BaseMapper { int updateOne(WgdCgfy wgdCgfy);//编辑 int insertOne(WgdCgfy wgdCgfy);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java index 70532885..ca20525c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java @@ -28,5 +28,5 @@ public interface WgdFyfyDao extends BaseMapper { int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java index b30aa0b0..d3989678 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java @@ -22,5 +22,5 @@ public interface WgdSrbDao extends BaseMapper { int updateOne(WgdSrb wgdSrb);//编辑 int insertOne(WgdSrb wgdSrb);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java index 8b432eb2..14577768 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java @@ -22,5 +22,5 @@ public interface WgdWbtjDao extends BaseMapper { int updateOne(WgdWbtj wgdWbtj);//编辑 int insertOne(WgdWbtj wgdWbtj);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java index d20d355e..50b4917d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java @@ -22,5 +22,5 @@ public interface WgdWbxdDao extends BaseMapper { int updateOne(WgdWbxd wgdWbxd);//编辑 int insertOne(WgdWbxd wgdWbxd);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java index a2c3773d..2af97d73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java @@ -22,5 +22,5 @@ public interface WgdZcbDao extends BaseMapper { int updateOne(WgdZcb wgdZcb);//编辑 int insertOne(WgdZcb wgdZcb);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java index b1df6e0e..ab802653 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java @@ -39,11 +39,11 @@ public class WgdSrb extends BasePage { private String source; @ApiModelProperty(value = "补助金额") - private String money; + private String cost; @ApiModelProperty(value = "入账时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String data; + private String time; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java index 20e2e9cf..a47c4c65 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -32,7 +32,7 @@ public class WgdZcb extends BasePage { private String name; @ApiModelProperty(value = "支出金额") - private String money; + private String cost; @ApiModelProperty(value = "用途") private String use; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java index fe6d36fc..3845fc23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java @@ -60,6 +60,7 @@ public class WgdCgfyServiceImpl extends ServiceImpl impleme @Override public int deleteWgdCgfys(String ids) { - return wgdCgfyDao.deleteBatch(); + String[] str = ids.split(","); + return wgdCgfyDao.deleteBatch(str); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java index 08e12353..9de7a613 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java @@ -60,6 +60,6 @@ public class WgdFyfyServiceImpl extends ServiceImpl impleme @Override public int deleteWgdFyfys(String ids) { String[] str = ids.split(","); - return wgdFyfyDao.deleteBatch(); + return wgdFyfyDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java index 138551e6..44498d8f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java @@ -60,6 +60,6 @@ public class WgdSrbServiceImpl extends ServiceImpl implements @Override public int deleteWgdSrbs(String ids) { String[] str = ids.split(","); - return wgdSrbDao.deleteBatch(); + return wgdSrbDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java index 70c65e7c..123c943c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java @@ -60,6 +60,6 @@ public class WgdWbtjServiceImpl extends ServiceImpl impleme @Override public int deleteWgdWbtjs(String ids) { String[] str = ids.split(","); - return wgdWbtjDao.deleteBatch(); + return wgdWbtjDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java index fa887a85..74bb2122 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java @@ -60,6 +60,6 @@ public class WgdWbxdServiceImpl extends ServiceImpl impleme @Override public int deleteWgdWbxds(String ids) { String[] str = ids.split(","); - return wgdWbxdDao.deleteBatch(); + return wgdWbxdDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java index ca0338c4..920d07e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java @@ -60,6 +60,6 @@ public class WgdZcbServiceImpl extends ServiceImpl implements @Override public int deleteWgdZcbs(String ids) { String[] str = ids.split(","); - return wgdZcbDao.deleteBatch(); + return wgdZcbDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml index c56391f0..8798b6e3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml @@ -32,6 +32,9 @@ and cost = #{cost} + + select count(*) from wgd_fyfy + + + select count(*) from wgd_srb + + + select count(*) from wgd_wbtj + + + select count(*) from wgd_wbxd + + + select count(*) from wgd_zcb + +