Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -402,4 +402,7 @@ public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlock",method = RequestMethod.GET)
     List<BusProcessNew> everyDayTenOlock();
+
+    @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET)
+    List<BusProcessNew> everyDayTenOlockSAM();
 }

adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java

@@ -11,6 +11,7 @@ import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.IUserEOService;
 import com.adc.da.workFlow.controller.WorkFlowController;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -185,10 +186,39 @@ public class ProcessTimer {
         }
     }
 
+    @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
+//    @Scheduled(cron = "*/40 * * * * ? ")//20s
+    public void everyDayTenOlockScanSAM() {
+        List<BusProcessNew> busProcessNews=new ArrayList<>();
+        busProcessNews=workFlowFeignClient.everyDayTenOlockSAM();
+        if (!busProcessNews.isEmpty()){
+            for (BusProcessNew bus:busProcessNews) {
+                JSONObject jsonObject= JSON.parseObject(bus.getMesg());
+                String taskInfo = bus.getTaskInfo();
+                String result = jsonObject.getJSONObject("roleList").getString("dockUser");
+                result = result.split(",")[0];
+                jsonObject.put("member",result);
+                if(taskInfo.equals("标准化活动参会流程-流程结束")){
+                    jsonObject.put("auto","1");
+                    ResponseMessage responseMessage = workFlowController.startProcessNew("22",result,null);
+                    BusMes busMes=new BusMes();
+                    busMes.setTaskIds(String.valueOf(responseMessage.getData()));
+                    busMes.setJson(jsonObject.toJSONString());
+                    busMes.setUserId(result);
+
+                    Wrapper<String> wrapper=workFlowFeignClient.completeTaskByUserId(busMes);
+                    System.out.println("标准化活动会后流程自动发起");
+                }
+
+            }
+        }
+    }
+
 
     public static void main(String[]args){
         ProcessTimer processTimer = new ProcessTimer();
         processTimer.everyDayTenOlockScan();
+        processTimer.everyDayTenOlockScanSAM();
     }
 
 }

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -46,6 +46,11 @@ public class ActDefineStartMap {
         map.put("18","policyResearchGroupAttendMeeting");
         map.put("19","policyResearchGroupAfterMeeting");
 
+        //企标复审流程
+        map.put("23","enterpriseBidReviewProcess");
+        map.put("24","Aboliish");
+        map.put("25","enterpriseStandardSystemRevisionPlan");
+
         return map.get(type);
     }
 }

adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java

@@ -49,15 +49,15 @@ public class WaterMarkUtil {
                 // set Transparency
                 PdfGState gs = new PdfGState();
                 // 设置透明度为0.2
-                gs.setFillOpacity(0.4f);
+                gs.setFillOpacity(0.25f);
                 under.setGState(gs);
                 under.restoreState();
                 under.beginText();
-                under.setFontAndSize(base, 56);
+                under.setFontAndSize(base, 50);
                 under.setTextMatrix(30, 30);
                 under.setColorFill(BaseColor.LIGHT_GRAY);
-                for (int y = 0; y < 10; y++) {
-                    for (int x = 0; x < 8; x++) {
+                for (int y = 0; y < 5; y++) {
+                    for (int x = 0; x < 10; x++) {
                         // 水印文字成45度角倾斜
                         under.showTextAligned(Element.ALIGN_LEFT
                                 , waterMarkName, 100 + 300 * x, 300 * y, 40);

adc-da-convert/pom.xml

@@ -22,6 +22,42 @@
             <artifactId>adc-da-sys</artifactId>
             <version>3.0.0</version>
         </dependency>
+        <!-- 导入本地jar -->
+        <!-- 操作ppt -->
+        <dependency>
+            <groupId>com.artofsolving</groupId>
+            <artifactId>jodconverter</artifactId>
+            <scope>system</scope>
+            <version>2.2.2</version>
+            <systemPath>${basedir}/src/main/lib/jodconverter-2.2.2.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.aspose</groupId>
+            <artifactId>aspose-words</artifactId>
+            <version>15.8.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/lib/aspose-words-15.8.0-jdk16.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.aspose</groupId>
+            <artifactId>aspose-cells</artifactId>
+            <version>8.5.2</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/lib/aspose-cells-8.5.2.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.aspose</groupId>
+            <artifactId>aspose-slides</artifactId>
+            <version>16.7.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/lib/aspose.slides-16.7.0.jar</systemPath>
+        </dependency>
+        <!-- 操作文本文件-->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.13</version>
+        </dependency>
         <!-- openOffice 和 jobconverter-->
 
         <dependency>
@@ -46,7 +82,7 @@
             <artifactId>jodconverter-local</artifactId>
             <version>4.3.0</version>
         </dependency>
-        <!-- openOffice end-->
+<!--         openOffice end-->
         <dependency>
             <groupId>org.openoffice</groupId>
             <artifactId>juh</artifactId>

adc-da-convert/src/main/java/com/adc/da/convert/common/AsposeOfficeConvertUtils.java

@@ -0,0 +1,37 @@
+package com.adc.da.convert.common;
+
+import org.apache.commons.lang.StringUtils;
+
+public class AsposeOfficeConvertUtils {
+
+    public static void convertOfficeFileToPDF(String fileType,String attFilePath,String savePdfPath) throws Exception {
+        if(StringUtils.isNotBlank(fileType)){
+            //去掉文件类型中的点
+            fileType =  fileType.replace(".","");
+            fileType = fileType.toUpperCase();
+            switch (fileType){
+                case "DOC":
+                    WordTPdfUtils.doc2pdf(attFilePath,savePdfPath);
+                    break;
+                case "DOCX":
+                    WordTPdfUtils.doc2pdf(attFilePath,savePdfPath);
+                    break;
+                case "PPT":
+                    SlidesTPdfUtils.ppt2pdf(attFilePath,savePdfPath);
+                    break;
+                case "PPTX":
+                    SlidesTPdfUtils.ppt2pdf(attFilePath,savePdfPath);
+                    break;
+                case "XLS":
+                    ExcelTPdfUtils.excel2pdf(attFilePath,savePdfPath);
+                    break;
+                case "XLSX":
+                    ExcelTPdfUtils.excel2pdf(attFilePath,savePdfPath);
+                    break;
+            }
+        }
+
+    }
+
+
+}

adc-da-convert/src/main/java/com/adc/da/convert/common/ExcelTPdfUtils.java

@@ -0,0 +1,122 @@
+package com.adc.da.convert.common;
+
+import com.aspose.cells.PdfSaveOptions;
+import com.aspose.cells.Workbook;
+import com.aspose.cells.License;
+import com.aspose.slides.Presentation;
+import com.aspose.slides.SaveFormat;
+import org.aspectj.weaver.ast.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+
+public class ExcelTPdfUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(WordTPdfUtils.class);
+    private static final String myLicense = "<License><Data><Products><Product>Aspose.Total for Java</Product><Product>Aspose.Words for Java</Product></Products><EditionType>Enterprise</EditionType><SubscriptionExpiry>20991231</SubscriptionExpiry><LicenseExpiry>20991231</LicenseExpiry><SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber></Data><Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature></License>";
+
+    /**
+     * 获取license 去除水印
+     * @return
+     */
+    public static boolean getLicense() {
+        boolean result = false;
+        try {
+            ByteArrayInputStream is = new ByteArrayInputStream(myLicense.getBytes());
+            License aposeLic = new License();
+            aposeLic.setLicense(is);
+            result = true;
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+        }
+        return result;
+    }
+
+    /**
+     * excel 转为pdf 输出。
+     *
+     * @param sourceFilePath  excel文件
+     * @param desFilePathd  pad 输出文件目录
+     */
+    public static void excel2pdf(String sourceFilePath, String desFilePathd ) throws Exception {
+        if (!getLicense()) { // 验证License 若不验证则转化出的pdf文档会有水印产生
+            return;
+        }
+        File file = new File(desFilePathd); // 新建一个空白pdf文档
+        FileOutputStream fileOS = null;
+        try {
+            fileOS = new FileOutputStream(desFilePathd);
+            long old = System.currentTimeMillis();
+            Workbook wb = new Workbook(sourceFilePath);// 原始excel路径
+            PdfSaveOptions pdfSaveOptions = new PdfSaveOptions();
+            pdfSaveOptions.setOnePagePerSheet(true);
+            int[] autoDrawSheets={3};
+            //当excel中对应的sheet页宽度太大时，在PDF中会拆断并分页。此处等比缩放。
+//            autoDraw(wb,autoDrawSheets);
+            int[] showSheets={0};
+            //隐藏workbook中不需要的sheet页。
+            printSheetPage(wb,showSheets);
+            wb.save(fileOS, pdfSaveOptions);
+            fileOS.flush();
+            fileOS.close();
+            long now = System.currentTimeMillis();
+            logger.info("转换文档："+sourceFilePath+"    "+"共耗时：" + ((now - old) / 1000.0) + "秒");
+        } catch (Exception e) {
+            if(fileOS!=null){
+                fileOS.flush();
+                fileOS.close();
+            }
+            file.delete();
+            logger.error("Document Convert Error:"+sourceFilePath);
+            logger.error(e.getMessage(),e);
+            throw new Exception("Document Convert Error:"+sourceFilePath);
+        }
+    }
+
+
+    /**
+     * 设置打印的sheet 自动拉伸比例
+     * @param wb
+     * @param page 自动拉伸的页的sheet数组
+     */
+    public static void autoDraw(Workbook wb,int[] page){
+        if(null!=page&&page.length>0){
+            for (int i = 0; i < page.length; i++) {
+                wb.getWorksheets().get(i).getHorizontalPageBreaks().clear();
+                wb.getWorksheets().get(i).getVerticalPageBreaks().clear();
+            }
+        }
+    }
+
+
+    /**
+     * 隐藏workbook中不需要的sheet页。
+     * @param wb
+     * @param page 显示页的sheet数组
+     */
+    public static void printSheetPage(Workbook wb,int[] page){
+        for (int i= 1; i < wb.getWorksheets().getCount(); i++)  {
+            wb.getWorksheets().get(i).setVisible(false);
+        }
+        if(null==page||page.length==0){
+            wb.getWorksheets().get(0).setVisible(true);
+        }else{
+            for (int i = 0; i < page.length; i++) {
+                wb.getWorksheets().get(i).setVisible(true);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        String sourceFilePath="E:\\EXCELTEXT\\一阶段问题清单426.xlsx";
+        String desFilePath="E:\\EXCELTEXT\\一阶段问题清单426.pdf";
+        try {
+            excel2pdf(sourceFilePath, desFilePath);
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+        }
+    }
+
+
+}

adc-da-convert/src/main/java/com/adc/da/convert/common/SlidesTPdfUtils.java

@@ -0,0 +1,72 @@
+package com.adc.da.convert.common;
+
+import com.aspose.slides.Presentation;
+import com.aspose.slides.License;
+import com.aspose.slides.SaveFormat;
+import org.aspectj.weaver.ast.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+
+/**
+ * 采用破解版的Aspire插件转换文件
+ */
+public class SlidesTPdfUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(SlidesTPdfUtils.class);
+    private static final String myLicense = "<License><Data><Products><Product>Aspose.Total for Java</Product><Product>Aspose.Words for Java</Product></Products><EditionType>Enterprise</EditionType><SubscriptionExpiry>20991231</SubscriptionExpiry><LicenseExpiry>20991231</LicenseExpiry><SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber></Data><Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature></License>";
+
+    public static boolean getLicense() {
+        boolean result = false;
+        try {
+            ByteArrayInputStream is = new ByteArrayInputStream(myLicense.getBytes());
+            License aposeLic = new License();
+            aposeLic.setLicense(is);
+            result = true;
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+        }
+        return result;
+    }
+
+
+    public static void ppt2pdf(String inPath, String outPath) throws Exception{
+        if (!getLicense()) { // 验证License 若不验证则转化出的pdf文档会有水印产生
+            return;
+        }
+        File file = new File(outPath); // 新建一个空白pdf文档
+        FileOutputStream os =null;
+        try {
+            long old = System.currentTimeMillis();
+            os = new FileOutputStream(file);
+            Presentation pres = new Presentation(inPath);
+            pres.save(os, SaveFormat.Pdf);
+            os.flush();
+            os.close();
+            // EPUB, XPS, SWF 相互转换
+            long now = System.currentTimeMillis();
+            logger.info("转换文档："+inPath+"    "+"共耗时：" + ((now - old) / 1000.0) + "秒");
+        } catch (Exception e) {
+            if(os!=null){
+                os.flush();
+                os.close();
+            }
+            file.delete();
+            logger.error("Document Convert Error:"+inPath);
+            logger.error(e.getMessage(),e);
+            throw new Exception("Document Convert Error:"+inPath);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        String sourceFilePath="E:\\PPTTEXT\\2.pptx";
+        String desFilePath="E:\\PPTTEXT\\2.pdf";
+        ppt2pdf(sourceFilePath, desFilePath);
+    }
+
+
+}

adc-da-convert/src/main/java/com/adc/da/convert/common/WordTPdfUtils.java

@@ -0,0 +1,65 @@
+package com.adc.da.convert.common;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+
+import com.adc.da.util.exception.AdcDaBaseException;
+import com.aspose.words.Document;
+import org.aspectj.weaver.ast.Test;
+import com.aspose.words.License;
+import com.aspose.words.SaveFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 采用破解版的Aspire插件转换文件
+ */
+public class WordTPdfUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(WordTPdfUtils.class);
+
+    private static final String myLicense = "<License><Data><Products><Product>Aspose.Total for Java</Product><Product>Aspose.Words for Java</Product></Products><EditionType>Enterprise</EditionType><SubscriptionExpiry>20991231</SubscriptionExpiry><LicenseExpiry>20991231</LicenseExpiry><SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber></Data><Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature></License>";
+
+    public static boolean getLicense() {
+        boolean result = false;
+        try {
+            ByteArrayInputStream is = new ByteArrayInputStream(myLicense.getBytes());
+            License aposeLic = new License();
+            aposeLic.setLicense(is);
+            result = true;
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+        }
+        return result;
+    }
+
+
+    public static void doc2pdf(String inPath, String outPath) throws Exception{
+        if (!getLicense()) { // 验证License 若不验证则转化出的pdf文档会有水印产生
+            return;
+        }
+        File file = new File(outPath); // 新建一个空白pdf文档
+        FileOutputStream os = new FileOutputStream(file);
+        try {
+            long old = System.currentTimeMillis();
+            Document doc = new Document(inPath); // Address是将要被转化的word文档
+            doc.save(os, SaveFormat.PDF);// 全面支持DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF,
+            os.flush();
+            os.close();
+            // EPUB, XPS, SWF 相互转换
+            long now = System.currentTimeMillis();
+            logger.info("转换文档："+inPath+"    "+"共耗时：" + ((now - old) / 1000.0) + "秒");
+        } catch (Exception e) {
+            if(os!=null){
+                os.flush();
+                os.close();
+            }
+            file.delete();
+            logger.error("Document Convert Error:"+inPath);
+            logger.error(e.getMessage(),e);
+            throw new Exception("Document Convert Error:"+inPath);
+        }
+    }
+
+}

adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java

@@ -4,12 +4,15 @@ import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.common.SarTypeEnum;
 import com.adc.da.common.UseModuleEnum;
+import com.adc.da.convert.common.AsposeOfficeConvertUtils;
 import com.adc.da.convert.common.DocConverterPdf;
 import com.adc.da.mq.CreateMQService;
 import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
 import com.adc.da.slrs.otConvertMq.service.IOtConvertMqService;
 import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao;
 import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
+import com.adc.da.slrs.sarLawsFile.dao.SarLawsFileDao;
+import com.adc.da.slrs.sarLawsFile.entity.SarLawsFile;
 import com.adc.da.slrs.sarStandFile.dao.SarStandFileDao;
 import com.adc.da.slrs.sarStandFile.entity.SarStandFile;
 import com.adc.da.sys.util.LoginUserUtil;
@@ -62,6 +65,9 @@ public class SendConvertMQService {
     @Autowired
     private SarBussStandFileDao sarBussStandFileEODao;
 
+    @Autowired
+    private SarLawsFileDao sarLawsFileDao;
+
     private static final Logger logger = LoggerFactory.getLogger(SendConvertMQService.class);
 
         @RabbitListener(bindings = @QueueBinding(
@@ -152,6 +158,7 @@ public class SendConvertMQService {
     public ResponseMessage docUploadConvert(OtConvertMq convertMqEO) throws Exception{
         //保存在数据库中的ID
         String path = localFilePath + convertMqEO.getFilePath();
+        path = path.replace("//","/");
         String convertId = convertMqEO.getId();
         try {
             //进入转换方法中，修改OT_CONVERT表中状态为转换中
@@ -164,24 +171,28 @@ public class SendConvertMQService {
                 String converfilename = path.replaceAll("\\\\", "/");
                 logger.info("*****上传路径:*******"+localFilePath);
                 logger.info("************文件路径：**********" + convertMqEO.getFilePath());
-                logger.info("************接口：**********" + port);
+//                logger.info("************接口：**********" + port);
                 logger.info("*****上传路径替换，加入文件名*******"+converfilename);
                 //截取文件类型
                 int index = converfilename.lastIndexOf(".");
                 String fileType = converfilename.substring(index,converfilename.length());
                 String fileOriName = converfilename.substring(0,index);
-                //调用转换类DocConverter,并将需要转换的文件传递给该类的构造方法
-                DocConverterPdf d = new DocConverterPdf(converfilename,fileType);
-                d.setConvertHost(convertHost);
-                //调用conver方法开始转换，先执行doc2pdf()将office文件转换为pdf;再执行pdf2swf()将pdf转换为swf;
-                File getPdf = d.conver(fileType);
-                //调用getswfPath()方法，打印转换后的swf文件路径
-                String dPath = d.getpdfPath();
-                logger.info("*****转换后的pdf文件路径*******"+dPath);
+//                //调用转换类DocConverter,并将需要转换的文件传递给该类的构造方法
+//                DocConverterPdf d = new DocConverterPdf(converfilename,fileType);
+//                d.setConvertHost(convertHost);
+//                //调用conver方法开始转换，先执行doc2pdf()将office文件转换为pdf;再执行pdf2swf()将pdf转换为swf;
+//                File getPdf = d.conver(fileType);
+//                //调用getswfPath()方法，打印转换后的swf文件路径
+//                String dPath = d.getpdfPath();
+                String savePdfFileName = converfilename.substring(0, converfilename.lastIndexOf("."));
+                String savePdfPath = savePdfFileName+".pdf";
+                AsposeOfficeConvertUtils.convertOfficeFileToPDF(fileType,converfilename,savePdfPath);
+                File pdfFile = new File(savePdfPath);
+                logger.info("*****转换后的pdf文件路径*******"+savePdfPath);
                 //判断是否转换成功，修改数据状态
-                if(!dPath.isEmpty() && getPdf.length()>0){
+                if(!savePdfPath.isEmpty() && pdfFile.length()>0){
                     // 上传转换后文件
-                    String pdfId = attFileEOService.saveFileAttId(getPdf);
+                    String pdfId = attFileEOService.saveFileAttId(pdfFile);
                     logger.info("////////转换后文件id"+pdfId);
                     int count = 0;
                     if("0".equals(convertMqEO.getAddOrUp())){
@@ -212,11 +223,11 @@ public class SendConvertMQService {
                     convertMqEO.setModifyTime(new Date());
                     convertMqEO.setMqState(2);
                     convertMqEOService.updateById(convertMqEO);
-                    if(convertMqEO.getAgainNum()<=5){
-                        throw new Exception("转换失败");
-                    }
+//                    if(convertMqEO.getAgainNum()<=5){
+//                        throw new Exception("转换失败");
+//                    }
                 }
-                return Result.success(dPath);
+                return Result.success(savePdfPath);
             } else {
                 logger.error("转换时未获取到文件路径！");
                 return Result.error("文件存储失败，请重试");
@@ -228,7 +239,7 @@ public class SendConvertMQService {
             convertMqEO.setId(convertId);
             convertMqEO.setMqState(2);
             convertMqEOService.updateById(convertMqEO);
-            this.restartUploadConvert(convertMqEO);
+//                this.restartUploadConvert(convertMqEO);
             return Result.error("r0072", "文件转换失败，请重试");
         }
     }
@@ -270,14 +281,14 @@ public class SendConvertMQService {
             lawsFile.setModifyTime(new Date());
             lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue());
             countSuccess = sarStandFileEODao.updateByPrimaryKeySelective(lawsFile);
-        } else if (SarTypeEnum.LAWS.getValue().equals(convertMq.getConvertType())) {
-//            SarLawsFile lawsFile = new SarLawsFile();
-//            lawsFile.setId(convertMq.getPdfId());
-//            lawsFile.setAttId(pdfId);
-//            lawsFile.setOriAttId(convertMq.getOriAttId());
-//            lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue());
-//            lawsFile.setModifyTime(new Date());
-//            countSuccess = sarLawsFileEODao.updateByPrimaryKeySelective(lawsFile);
+        } else if (SarTypeEnum.LAWS_STAND.getValue().equals(convertMq.getConvertType())) {
+            SarLawsFile lawsFile = new SarLawsFile();
+            lawsFile.setId(convertMq.getPdfId());
+            lawsFile.setAttId(pdfId);
+            lawsFile.setOriAttId(convertMq.getOriAttId());
+            lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue());
+            lawsFile.setModifyTime(new Date());
+            countSuccess = sarLawsFileDao.updateByPrimaryKeySelective(lawsFile);
         } else if (SarTypeEnum.BUSINESS.getValue().equals(convertMq.getConvertType())) {
             SarBussStandFile lawsFile = new SarBussStandFile();
             lawsFile.setId(convertMq.getPdfId());
@@ -336,21 +347,21 @@ public class SendConvertMQService {
             lawsFile.setFileName(fileOriName+".pdf");
             lawsFile.setFileSuffix("pdf");
             countSuccess = sarStandFileEODao.insertSelective(lawsFile);
-        } else if (SarTypeEnum.LAWS.getValue().equals(convertMq.getConvertType())) {
-//            SarLawsFile lawsFile = new SarLawsFile();
-//            lawsFile.setId(UUID.randomUUID(20));
-//            lawsFile.setLawsId(convertMq.getLawsId());
-//            lawsFile.setResId(convertMq.getResId());
-//            lawsFile.setAttId(pdfId);
-//            lawsFile.setOriAttId(convertMq.getOriAttId());
-//            lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue());
-//            lawsFile.setValidFlag("0");
-//            lawsFile.setCreationTime(new Date());
-//            lawsFile.setModifyTime(new Date());
-//            lawsFile.setLawsFileClassify(convertMq.getLawsFileClassify());
-//            lawsFile.setFileName(fileOriName+".pdf");
-//            lawsFile.setFileSuffix("pdf");
-//            countSuccess = sarLawsFileEODao.insertSelective(lawsFile);
+        } else if (SarTypeEnum.LAWS_STAND.getValue().equals(convertMq.getConvertType())) {
+            SarLawsFile lawsFile = new SarLawsFile();
+            lawsFile.setId(UUID.randomUUID(20));
+            lawsFile.setLawsId(convertMq.getLawsId());
+            lawsFile.setResId(convertMq.getResId());
+            lawsFile.setAttId(pdfId);
+            lawsFile.setOriAttId(convertMq.getOriAttId());
+            lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue());
+            lawsFile.setValidFlag(0);
+            lawsFile.setCreationTime(new Date());
+            lawsFile.setModifyTime(new Date());
+            lawsFile.setLawsFileClassify(convertMq.getLawsFileClassify());
+            lawsFile.setFileName(fileOriName+".pdf");
+            lawsFile.setFileSuffix("pdf");
+            countSuccess = sarLawsFileDao.insertSelective(lawsFile);
         } else if (SarTypeEnum.BUSINESS.getValue().equals(convertMq.getConvertType())) {
             SarBussStandFile lawsFile = new SarBussStandFile();
             lawsFile.setId(UUID.randomUUID(20));

adc-da-convert/src/main/resources/license.xml

@@ -0,0 +1,14 @@
+<License>
+    <Data>
+        <Products>
+            <Product>Aspose.Total for Java</Product>
+            <Product>Aspose.Words for Java</Product>
+        </Products>
+        <EditionType>Enterprise</EditionType>
+        <SubscriptionExpiry>20991231</SubscriptionExpiry>
+        <LicenseExpiry>20991231</LicenseExpiry>
+        <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+    </Data>
+    <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=
+    </Signature>
+</License>

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/**");

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

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
@@ -25,6 +23,9 @@ public class Analysis {
 
     private static final Logger logger = LoggerFactory.getLogger(Contrast.class);
 
+    private int sortColumn=0;
+
+
     public void run(MultipartFile file, MultipartFile sort) throws IOException {
 
         InputStream inputStream = file.getInputStream();
@@ -37,20 +38,20 @@ public class Analysis {
         for (Row row : sheet) {
             if (row.getCell(1)!=null){
                 //获取表1的标准号
-                String value = row.getCell(1).toString().trim();
+                String value = row.getCell(1).toString();
                 Cell sortCell = row.createCell(11);
-                Cell sortNumber = row.createCell(12);
-                Cell sortYear = row.createCell(13);
+                Cell numberCell = row.createCell(12);
+                Cell yearCell = row.createCell(13);
 
                 sortCell.setCellType(CellType.STRING);
-                sortNumber.setCellType(CellType.STRING);
-                sortYear.setCellType(CellType.STRING);
+                numberCell.setCellType(CellType.STRING);
+                yearCell.setCellType(CellType.STRING);
 
                 List<String> collect = sortSet.stream()
                         .filter(item ->{
                             int length = item.length();
                             if (value.length()>length){
-                                return value.substring(0, length).contains(item.trim());
+                                return value.substring(0, length).contains(item);
                             }else return false;
                         })
                         .collect(Collectors.toList());
@@ -65,8 +66,8 @@ public class Analysis {
 //                    pattern.matcher(standId).matches()
                     if (value.length()>=length+5){
                         sortCell.setCellValue(collect.get(0));
-                        sortNumber.setCellValue(value.substring(length,value.length()-5));
-                        sortYear.setCellValue(value.substring(value.length()-4));
+                        numberCell.setCellValue(value.substring(length,value.length()-5));
+                        yearCell.setCellValue(value.substring(value.length()-4));
                     }
                 }else if (collect.size()>1){
                     String maxLenSort="";
@@ -83,26 +84,37 @@ public class Analysis {
 
 
                         sortCell.setCellValue(maxLenSort);
-                        sortNumber.setCellValue(value.substring(length,value.length()-5));
-                        sortYear.setCellValue(value.substring(value.length()-4));
+                        numberCell.setCellValue(value.substring(length,value.length()-5));
+                        yearCell.setCellValue(value.substring(value.length()-4));
                     }
 
                 } else {
                     logger.info("-");
 
                     sortCell.setCellValue("-");
-                    sortNumber.setCellValue("-");
-                    sortYear.setCellValue("-");
+                    numberCell.setCellValue("-");
+                    yearCell.setCellValue("-");
                 }
             }
         }
-        File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\拆分标准号-海外.xlsx");
+        File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\拆分标准号-企标.xlsx");
         FileOutputStream os = new FileOutputStream(result);
         workbook.write(os);
 //        HashMap<String, String> map = new HashMap<>();
 
     }
 
+
+    public void setSortColumn(int sortColumn){
+        this.sortColumn=sortColumn;
+    }
+
+    /**
+     * 获取标准类别set集合
+     * @param file
+     * @return
+     * @throws IOException
+     */
     private HashSet<String> getSet(MultipartFile file) throws IOException {
         InputStream inputStream = file.getInputStream();
         XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
@@ -114,8 +126,8 @@ public class Analysis {
         HashSet<String> stringHashSet= new HashSet<>();
 
         for (Row row : sheet) {
-            if (row.getCell(0)!=null){
-                stringHashSet.add(row.getCell(0).toString().trim());
+            if (row.getCell(sortColumn)!=null){
+                stringHashSet.add(row.getCell(sortColumn).toString());
             }
         }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Contrast.java

@@ -0,0 +1,77 @@
+package com.adc.da.slrs.ImportExcelDatas.comment;
+
+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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.HashSet;
+
+@Component
+public class Contrast {
+    private static final Logger logger = LoggerFactory.getLogger(Contrast.class);
+
+    public void run(MultipartFile file,MultipartFile sort) throws IOException {
+
+        InputStream inputStream = file.getInputStream();
+        XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
+
+        XSSFSheet sheet = workbook.getSheetAt(0);
+
+        HashSet<String> set = getSet(sort);
+        for (Row row : sheet) {
+            if (row.getCell(0)!=null){
+                //获取表1的标准号
+                String value = row.getCell(0).toString().trim();
+                Cell cell = row.createCell(11);
+
+                //对比在表2中是否存在
+                if (set.contains(value.trim())){
+                    logger.info("*");
+                    cell.setCellType(CellType.STRING);
+                    cell.setCellValue("1");
+                }else {
+                    logger.info("-");
+                    cell.setCellType(CellType.STRING);
+                    cell.setCellValue("0");
+                }
+            }
+        }
+        File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\海外对比全数据.xlsx");
+        FileOutputStream os = new FileOutputStream(result);
+        workbook.write(os);
+//        HashMap<String, String> map = new HashMap<>();
+
+    }
+
+    private HashSet<String> getSet(MultipartFile file) throws IOException {
+        InputStream inputStream = file.getInputStream();
+        XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
+
+        XSSFSheet sheet = workbook.getSheetAt(0);
+
+//        int lastNum = sheet.getLastRowNum();
+
+        HashSet<String> stringHashSet= new HashSet<>();
+
+        for (Row row : sheet) {
+            if (row.getCell(1)!=null){
+                stringHashSet.add(row.getCell(1).toString().trim());
+            }
+        }
+
+        return stringHashSet;
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/PathMatcher.java

@@ -0,0 +1,120 @@
+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.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+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 {
+        InputStream inputStream = target.getInputStream();
+        XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
+
+        XSSFSheet mySheet = workbook.getSheetAt(0);
+
+        HashMap<String, String> fileMap = getFileMap(attach);
+
+
+        for (Row row : mySheet) {
+            if (row.getCell(1) == null || row.getCell(10) == null) {
+                logger.info("+");
+                continue;
+            }
+
+
+            String latter = row.getCell(1).getStringCellValue().trim();//标准号
+
+            String[] fileIdArray = row.getCell(10).getStringCellValue().trim().split(",");//文档id
+
+            HashMap<String, String> idMapPath = new HashMap<>(); //文件id和路径的键值对
+
+
+
+
+            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");
+        FileOutputStream os = new FileOutputStream(file);
+        workbook.write(os);
+
+
+    }
+
+
+    private HashMap<String, String> getFileMap(MultipartFile excel) throws IOException {
+
+        InputStream inputStream = excel.getInputStream();
+
+        XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
+
+        XSSFSheet sheet = workbook.getSheetAt(0);
+
+        HashMap<String, String> resultMap = new HashMap<>();
+        for (Row row : sheet) {
+
+            String value = row.getCell(0).getStringCellValue();
+
+            String[] strArray = value.split(",");
+
+            StringBuilder builder = new StringBuilder();
+            builder.append(strArray[1].trim())  //文档id
+                    .append(strArray[2].trim()); //标准号
+
+
+            String path = strArray[3];
+
+            resultMap.put(builder.toString(), path);
+
+        }
+
+        return resultMap;
+
+
+    }
+
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/StandMatcher.java

@@ -0,0 +1,201 @@
+package com.adc.da.slrs.ImportExcelDatas.comment;
+
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.apache.poi.ss.usermodel.CellType.NUMERIC;
+
+public class StandMatcher {
+
+
+    private static final Logger logger = LoggerFactory.getLogger(StandMatcher.class);
+
+
+    public void run(MultipartFile target,MultipartFile attach) throws IOException {
+        InputStream inputStream = target.getInputStream();
+        XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
+
+        XSSFSheet sheet = workbook.getSheetAt(0);
+
+        Map<String, String> matchSet = getMatchSet(attach);
+
+        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(3));//发布日期
+            String  impl= convertCellValueToString(row.getCell(4));//实施日期
+            String  state = convertCellValueToString(row.getCell(2));//状态
+            String  replace= convertCellValueToString(row.getCell(5));//代替标准号
+
+
+
+
+            StringBuilder strBuilder = new StringBuilder();
+            strBuilder.append(letter)
+                    .append(publish)
+                    .append(impl)
+                    .append(state)
+                    .append(replace);
+            String str = strBuilder.toString();
+
+            if (matchSet.containsKey(str)){
+                Cell cell = row.createCell(10); //再第10列存放文件id
+                cell.setCellType(CellType.STRING);
+                cell.setCellValue(matchSet.get(str));
+                logger.info("*");
+            }else {
+                logger.info("-");
+
+            }
+
+        }
+
+        File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\匹配带入文件id-国内-多个文件id.xlsx");
+        FileOutputStream os = new FileOutputStream(result);
+        workbook.write(os);
+    }
+
+
+
+
+    private Map<String,String> getMatchSet(MultipartFile excel) throws IOException {
+        InputStream inputStream = excel.getInputStream();
+        XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
+
+        XSSFSheet sheet = workbook.getSheetAt(0);
+
+        Map<String,String> resultSet = new  HashMap<>();
+
+
+        for (Row row : sheet) {
+
+            String letter =convertCellValueToString(row.getCell(0));//标准号
+
+            String  publish = convertCellValueToString(row.getCell(3));//发布日期
+
+            String  impl= convertCellValueToString(row.getCell(4));//实施日期
+
+            String  state = convertCellValueToString(row.getCell(5));//状态
+
+            String  replace= convertCellValueToString(row.getCell(6));//代替标准号
+
+
+
+            StringBuilder strBuilder = new StringBuilder();
+            strBuilder.append(letter)
+                    .append(publish)
+                    .append(impl)
+                    .append(state)
+                    .append(replace);
+
+
+
+            if (row.getCell(7).getCellType()== NUMERIC){
+                String s = row.getCell(7).toString();
+                String fileId =s.substring(0,s.length()-2);//文件id
+                String standStr = strBuilder.toString();
+                if(resultSet.containsKey(standStr)){
+                    String s1 = resultSet.get(standStr);
+
+                    resultSet.replace(standStr,s1+","+fileId);
+                }else {
+                    resultSet.put(standStr,fileId);
+
+                }
+
+            }
+
+        }
+
+
+        return resultSet;
+    }
+
+
+
+
+
+
+    /**
+     * 将单元格内容转化为字符串
+     */
+    private static String convertCellValueToString(Cell cell) {
+        if (null == cell) {
+            return "";
+        }
+        String returnValue = "";
+        switch (cell.getCellType()) {
+            case STRING:  //字符串
+                returnValue = cell.getStringCellValue().trim();
+                break;
+            case NUMERIC: //数字
+
+
+
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    Date tempValue = cell.getDateCellValue();
+                    SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    returnValue = simpleFormat.format(tempValue);
+                }else {
+                    returnValue = String.valueOf(cell.getNumericCellValue());
+                }
+
+
+                returnValue=cell.toString().trim();
+
+
+                break;
+            case BOOLEAN: //布尔
+                boolean booleanCellValue = cell.getBooleanCellValue();
+                returnValue = Boolean.toString(booleanCellValue).trim();
+                break;
+            case BLANK: //空值
+                break;
+            case FORMULA: //公式
+                cell.getCellFormula();
+                break;
+            case ERROR: //故障
+                break;
+            default:
+                break;
+        }
+        return returnValue;
+    }
+    /**
+     * 判断是否为整数，是返回true，否则返回false.
+     */
+    public static boolean isIntegerForDouble(Double num) {
+        double eqs = 1e-10; //精度范围
+        return num - Math.floor(num) < eqs;
+    }
+
+}

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<String,String> standAttrMap = new TreeMap<>();
+    private String standType="";
+
+
+
+    Standard(){
+        /**
+         * 初始化国内外标准属性字段
+         */
+        List<String> 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<String, String> 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<String,String> 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<String,String> 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);
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java

@@ -2,11 +2,9 @@ package com.adc.da.slrs.ImportExcelDatas.controller;
 
 import com.adc.da.base.web.BaseController;
 import com.adc.da.common.ReadExcel;
-import com.adc.da.slrs.ImportExcelDatas.comment.Analysis;
-import com.adc.da.slrs.ImportExcelDatas.comment.Contrast;
-import com.adc.da.slrs.ImportExcelDatas.comment.ExclErrorOut;
-import com.adc.da.slrs.ImportExcelDatas.comment.ExclExport;
+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;
@@ -90,7 +88,7 @@ public class ImportExcelController extends BaseController<ImportDto> {
     }
 
 
-    @ApiOperation("从excl分解")
+    @ApiOperation("从excl分解出标准号")
     @PostMapping("/analysisExcl")
     public void analysisExcl(MultipartFile exclFile,MultipartFile standSort, HttpServletResponse response, HttpServletRequest request) throws IOException {
         /**
@@ -139,19 +137,50 @@ public class ImportExcelController extends BaseController<ImportDto> {
         return importExcelService.isExist(exclFile);
     }
 
-    @ApiOperation("对比")
+    @ApiOperation("对比两个excel表中的标准名称")
     @PostMapping("/contrast")
-    public void contrast(MultipartFile all,MultipartFile excel) throws IOException {
+    public void contrast(MultipartFile targetExcel,MultipartFile excel) throws IOException {
         Contrast contrast = new Contrast();
-        contrast.run(all,excel);
+        contrast.run(targetExcel,excel);
 
     }
 
 
     @ApiOperation("根据标准从excl中分解出标准号,类别,年份")
     @PostMapping("/analysis")
-    public void analysis(MultipartFile exclFile,MultipartFile standSort) throws IOException {
+    public void analysis(MultipartFile targetExcel,MultipartFile attachExcel) throws IOException {
         Analysis analysis = new Analysis();
-        analysis.run(exclFile,standSort);
+        analysis.setSortColumn(1);
+        analysis.run(targetExcel,attachExcel);
     }
+
+
+
+    @ApiOperation("匹配文件id(多个id)")
+    @PostMapping("/matching")
+    public void matching(MultipartFile targetExcel,MultipartFile attachExcel) throws IOException {
+        StandMatcher standMatcher = new StandMatcher();
+        standMatcher.run(targetExcel, attachExcel);
+    }
+
+
+    @ApiOperation("根据文件id和标准号匹配文件路径")
+    @PostMapping("/matchingPath")
+    public void matchingPath(MultipartFile targetExcel,MultipartFile attachExcel) throws IOException {
+
+        PathMatcher pathMatcher = new PathMatcher();
+        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);
+    }
+
+
 }

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

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java

@@ -18,4 +18,9 @@ public interface ImportExcelService extends IService<ImportDto>  {
 
 
     public String isExist(MultipartFile exclFile);
+
+
+
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java

@@ -324,11 +324,14 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         List<DicTypeEO> 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<ImportExcelDao, ImportDt
          */
 
 
-        /*importListMap.get("HWBZ").forEach(item -> {
+        importListMap.get("HWBZ").forEach(item -> {
             if (true ) {
                 String standID = UUIDUtils.randomUUID20();
 
@@ -409,14 +412,14 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
 
 
-        });*/
+        });
 
 
         /**
          * 国内标准
          */
 
-        /*importListMap.get("GNBZ").forEach(item -> {
+        importListMap.get("GNBZ").forEach(item -> {
 
 
             if (true) {
@@ -472,7 +475,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
             }
 
-        });*/
+        });
 
 
         /**

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportStandExcelServiceImpl.java

@@ -0,0 +1,112 @@
+package com.adc.da.slrs.ImportExcelDatas.service.impl;
+
+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.ImportExcelDatas.comment.PathMatcher;
+import com.adc.da.slrs.ImportExcelDatas.comment.Standard;
+import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto;
+import com.adc.da.slrs.ImportExcelDatas.service.IImportStandExcelService;
+import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
+import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
+import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
+import com.adc.da.sys.service.impl.DicTypeEOServiceImpl;
+import com.adc.da.utils.util.InitStandAttrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.gson.Gson;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Service
+public class ImportStandExcelServiceImpl implements IImportStandExcelService {
+
+
+    private static final Logger logger = LoggerFactory.getLogger(PathMatcher.class);
+    @Autowired
+    private ISarStandardsInfoService sarStandardsInfoService;
+
+    @Autowired
+    private Standard standard;
+
+    private List<ImportDto> error = new ArrayList<>();
+
+    private List<ImportDto> 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<SarStandardsInfo> 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";
+
+    }
+
+
+
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java

@@ -0,0 +1,78 @@
+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;
+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;
+
+/**
+* <p>
+    * 企标制修订计划 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-14
+*/
+@RestController
+@Api(description = "|EsRevisePlan|")
+@RequestMapping("api/esRevisePlan/es-revise-plan")
+public class EsRevisePlanController extends BaseController<EsRevisePlan> {
+
+    @Autowired
+    IEsRevisePlanService iEsRevisePlanService;
+
+    @ApiOperation(value = "获取所有企标计划")
+    @GetMapping("getAllPlans")
+    public ResponseMessage<Object> getAllPlans(EsRevisePlan esRevisePlan){
+        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.getAllPlans(esRevisePlan);
+        PageInfo<EsRevisePlan> pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans);
+        return Result.success(pageInfo);
+    }
+
+    @ApiOperation(value = "多条件查询企标计划")
+    @PostMapping("queryAllPlans")
+    public ResponseMessage<Object> queryAllPlans(EsRevisePlan esRevisePlan){
+        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.queryAllPlans(esRevisePlan);
+        PageInfo<EsRevisePlan> pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans);
+        return Result.success(pageInfo);
+    }
+
+    @ApiOperation(value = "获取单个企标计划详情")
+    @GetMapping("getPlanInfo")
+    public ResponseMessage<Object> getPlanInfo(String id){
+        return Result.success(iEsRevisePlanService.getOnePlan(id));
+    }
+
+    @ApiOperation(value = "编辑企标计划")
+    @PostMapping("modPlan")
+    public ResponseMessage<Object> modPlan(EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.modPlan(esRevisePlan));
+    }
+
+    @ApiOperation(value = "添加企标计划")
+    @PostMapping("addPlan")
+    public ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.addPlan(esRevisePlan));
+    }
+
+    @ApiOperation(value = "删除单个企标计划")
+    @GetMapping("delPlan")
+    public ResponseMessage<Object> delPlan(String id){
+        return Result.success(iEsRevisePlanService.delPlan(id));
+    }
+
+    @ApiOperation(value = "批量删除企标计划")
+    @GetMapping("delPlans")
+    public ResponseMessage<Object> delPlans(String ids){
+        return Result.success(iEsRevisePlanService.delPlans(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java

@@ -0,0 +1,28 @@
+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;
+
+/**
+ * <p>
+ * 企标制修订计划 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+public interface EsRevisePlanDao extends BaseMapper<EsRevisePlan> {
+    Integer getTotal();
+    Integer getQueryTotal(EsRevisePlan esRevisePlan);
+    List<EsRevisePlan> selectAll(EsRevisePlan esRevisePlan);//查询所有
+    List<EsRevisePlan> queryAll(EsRevisePlan esRevisePlan);//多条件查询
+    EsRevisePlan selectOne(String id);//查询详情
+
+    int updateOne(EsRevisePlan esRevisePlan);//编辑
+    int insertOne(EsRevisePlan esRevisePlan);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -0,0 +1,60 @@
+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;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+
+/**
+ * <p>
+ * 企标制修订计划
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="EsRevisePlan对象", description="企标制修订计划")
+public class EsRevisePlan extends BasePage {
+
+    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;
+
+}

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;
+
+/**
+ * <p>
+ * 企标制修订计划 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+public interface IEsRevisePlanService extends IService<EsRevisePlan> {
+    List<EsRevisePlan> getAllPlans(EsRevisePlan esRevisePlan);//查询所有
+    List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询
+    EsRevisePlan getOnePlan(String id);//查询详情
+
+    int modPlan(EsRevisePlan esRevisePlan);//编辑
+    int addPlan(EsRevisePlan esRevisePlan);//插入
+    int delPlan(String id);//删除
+    int delPlans(String ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -0,0 +1,69 @@
+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;
+
+/**
+ * <p>
+ * 企标制修订计划 服务实现类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+@Service
+public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevisePlan> implements IEsRevisePlanService {
+
+    @Autowired
+    EsRevisePlanDao esRevisePlanDao;
+
+    @Override
+    public List<EsRevisePlan> getAllPlans(EsRevisePlan esRevisePlan) {
+        Integer count = esRevisePlanDao.getTotal();
+        esRevisePlan.getPager().setRowCount(count);
+        List<EsRevisePlan> esRevisePlans = esRevisePlanDao.selectAll(esRevisePlan);
+        return esRevisePlans;
+    }
+
+    @Override
+    public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) {
+        Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
+        esRevisePlan.getPager().setRowCount(count);
+        List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
+        return esRevisePlans;
+    }
+
+    @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);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java

@@ -0,0 +1,69 @@
+package com.adc.da.slrs.sapMeetInfo.controller;
+
+
+import com.adc.da.slrs.sapMeetInfo.service.ISapMeetingService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.sapMeetInfo.entity.SapMeeting;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* <p>
+    * 流程通过的 标准化活动会议信息表
+standard_activity_pass
+ 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-09
+*/
+@RestController
+@Api(description = "|SapMeeting|")
+@RequestMapping("/api/sapMeetInfo")
+public class SapMeetingController extends BaseController<SapMeeting> {
+
+    @Autowired
+    ISapMeetingService sapMeetingService;
+
+    @ApiOperation(value = "id查询会议信息")
+    @GetMapping("/getOneById")
+    public SapMeeting getOneById(String id){
+        return sapMeetingService.getMeetingById(id);
+    }
+
+    @ApiOperation(value = "获取日历显示会议信息")
+    @GetMapping("/getDateMeeting")
+    public int getDateMeeting(@DateTimeFormat(pattern = "yyyy-MM-dd") Date date, String id,int type){
+        return sapMeetingService.getDateMeeting(date,id,type);
+    }
+
+    @ApiOperation(value = "获取当月")
+    @GetMapping("/getMeetingsByMonth")
+    public List<SapMeeting> getMeetingsByMonth(@DateTimeFormat(pattern = "yyyy-MM-dd") Date date){
+        return sapMeetingService.getMeetingsByMonth(date);
+    }
+
+    @ApiOperation(value = "获取当月，根据标志位type区分 1标准活动和2政策课题")
+    @GetMapping("/getMeetingsByMonthType")
+    public List<SapMeeting> getMeetingsByMonthType(@DateTimeFormat(pattern = "yyyy-MM-dd") Date date,int type){
+        return sapMeetingService.getMeetingsByMonth(date, type);
+    }
+
+    @ApiOperation(value = "获取当天列表")
+    @GetMapping("/getMeetingsByDate")
+    public List<SapMeeting> getMeetingsByDate(@DateTimeFormat(pattern = "yyyy-MM-dd") Date date,int type){
+        return sapMeetingService.getMeetingsByDate(date,type);
+    }
+
+    @ApiOperation(value = "插入会议")
+    @PostMapping("/addMeeting")
+    public int addMeeting(@RequestBody SapMeeting sapMeeting){
+        return sapMeetingService.addMeeting(sapMeeting);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/dao/SapMeetingDao.java

@@ -0,0 +1,43 @@
+package com.adc.da.slrs.sapMeetInfo.dao;
+
+import com.adc.da.slrs.sapMeetInfo.entity.SapMeeting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 流程通过的 标准化活动会议信息表
+standard_activity_pass
+ Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+@Repository
+public interface SapMeetingDao extends BaseMapper<SapMeeting> {
+
+    int insertMeeting(SapMeeting sapMeeting);//参会流程结束--插入
+
+    List<SapMeeting> selectMeetingsByDate(Map map);//根据日期查找-当日所有会议(时间正序)
+    List<SapMeeting> selectMeetingsByMonth(Date date);//根据年，月查找
+    List<SapMeeting> selectMeetingsByMonthType(Map map);//根据年，月查找,type标志位 1标准化活动 2政策课题组
+
+
+    SapMeeting selectMeetingById(String id);
+
+
+    int deleteById(String id);
+
+    int deleteByDate(Date date);
+
+    int updateMeeting(SapMeeting sapMeeting);
+
+    
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java

@@ -0,0 +1,47 @@
+package com.adc.da.slrs.sapMeetInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 流程通过的 标准化活动会议信息表
+standard_activity_pass
+
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+@Data
+@Accessors(chain = true)
+@ToString
+@ApiModel(value="SapMeeting对象", description="流程通过的 标准化活动会议信息表 standard_activity_pass")
+public class SapMeeting{
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;//主键-会议id
+
+    private String title;//会议标题
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date date;//会议开始时间
+
+    private String content;//会议内容大纲
+
+    private int type;//标志位--1标准化活动会议,0政策组会议
+
+    private String attend;//参与人 {id,name} json
+
+    private String files;//附件 json
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/service/ISapMeetingService.java

@@ -0,0 +1,38 @@
+package com.adc.da.slrs.sapMeetInfo.service;
+
+import com.adc.da.slrs.sapMeetInfo.entity.SapMeeting;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 流程通过的 标准化活动会议信息表
+standard_activity_pass
+ 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+public interface ISapMeetingService extends IService<SapMeeting> {
+
+    int addMeeting(SapMeeting sapMeeting);//参会流程结束--插入
+
+    List<SapMeeting> getMeetingsByDate(Date date,int type);//根据日期查找-当日所有会议(时间正序)
+    List<SapMeeting> getMeetingsByMonth(Date date);//根据年，月查找
+    List<SapMeeting> getMeetingsByMonth(Date date,int type);//根据年，月查找
+
+    int getDateMeeting(Date date,String id,int type);
+
+
+    SapMeeting getMeetingById(String id);
+
+    int delById(String id);
+
+    int delByDate(Date date);
+
+    int modMeeting(SapMeeting sapMeeting);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/service/impl/SapMeetingServiceImpl.java

@@ -0,0 +1,112 @@
+package com.adc.da.slrs.sapMeetInfo.service.impl;
+
+import com.adc.da.slrs.sapMeetInfo.entity.SapMeeting;
+import com.adc.da.slrs.sapMeetInfo.dao.SapMeetingDao;
+import com.adc.da.slrs.sapMeetInfo.service.ISapMeetingService;
+import com.adc.da.util.UUIDUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 流程通过的 标准化活动会议信息表
+standard_activity_pass
+ 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+@Service
+public class SapMeetingServiceImpl extends ServiceImpl<SapMeetingDao, SapMeeting> implements ISapMeetingService {
+
+    @Autowired
+    SapMeetingDao sapMeetingDao;
+
+    @Override
+    public int addMeeting(SapMeeting sapMeeting) {
+        sapMeeting.setId(UUIDUtils.randomUUID(30));
+        return sapMeetingDao.insertMeeting(sapMeeting);
+    }
+
+    @Override
+    public List<SapMeeting> getMeetingsByDate(Date date,int type) {
+        Map map = new HashMap();
+        map.put("date",date);
+        map.put("type",type);
+        return sapMeetingDao.selectMeetingsByDate(map);
+    }
+
+    @Override
+    public List<SapMeeting> getMeetingsByMonth(Date date) {
+        List<SapMeeting> sapMeetings = sapMeetingDao.selectMeetingsByMonth(date);
+        return sapMeetings;
+    }
+
+    @Override
+    public List<SapMeeting> getMeetingsByMonth(Date date, int type) {
+        Map map = new HashMap();
+        map.put("date",date);
+        map.put("type",type);
+        return sapMeetingDao.selectMeetingsByMonthType(map);
+    }
+
+    @Override
+    public int getDateMeeting(Date date,String id,int type) {
+        Map map = new HashMap();
+        map.put("type",type);
+        map.put("date",date);
+        List<SapMeeting> sapMeetings = sapMeetingDao.selectMeetingsByDate(map);
+        int rat = 0;//标志位 0无会议;1有会议;2有会议且有自己参会的会议
+        if(sapMeetings.isEmpty()){
+            rat = 1;
+        }else if(hasOwnMeeting(id,sapMeetings)){
+            rat = 2;
+        }
+        return rat;
+    }
+
+    @Override
+    public SapMeeting getMeetingById(String id) {
+        return sapMeetingDao.selectMeetingById(id);
+    }
+
+    @Override
+    public int delById(String id) {
+        return sapMeetingDao.deleteById(id);
+    }
+
+    @Override
+    public int delByDate(Date date) {
+        return  sapMeetingDao.deleteByDate(date);
+    }
+
+    @Override
+    public int modMeeting(SapMeeting sapMeeting) {
+        return sapMeetingDao.updateMeeting(sapMeeting);
+    }
+
+    boolean hasOwnMeeting(String id,List<SapMeeting> sapMeetings){
+        for(SapMeeting sapMeeting : sapMeetings){
+            JSONObject jsonObject = JSONObject.parseObject(sapMeeting.getAttend());
+            String a = jsonObject.getString("id");
+            if(a.contains("[") && a.contains("]")){
+                a.substring(1,a.length()-1);
+            }
+            String[] split = a.trim().split(",");
+            for (String s : split) {
+                if (s.equals(id)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -242,37 +242,42 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
         if(page.getUserId() == null || page.getUserId().equals("")){
             page.setUserId(LoginUserUtil.getUserId());
         }
-        if(StringUtils.isNotBlank(page.getPaixu())){
-            String sql = page.getPaixu()+" "+page.getShunxu();
-            page.setSql(sql);
-        }else{
-            page.setOrderBy("SAR_BUSSIONESS_STAND.MODIFY_TIME DESC");
+
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
         }
         List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
         return Result.success(getPageInfo(page.getPager(), rows));
-//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
-//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-//            String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
-//            if (StringUtils.isNotBlank(advanceStr)) {
-//                page.setAdvanceSearchStr(advanceStr);
-//            } else {
-//                page.setAdvanceSearchStr(null);
-//            }
-//        }
-//        page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time desc nulls last,SAR_BUSSIONESS_STAND.id");
-//        List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
-////        List<String> getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId());
-//        if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
-//            page.setMenuRoleList(getMenuIdList);
-//        } else {
-//            page.setMenuRoleList(null);
-//        }
-//        List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
-//        if (ids != null && !ids.isEmpty()) {
-//            page.setMenuAllChildrenIdList(ids);
-//        }
-//        List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
-//        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
+    private void nowOrderFunc(SarBussionessStandEOPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("tmp_tb.issue_time");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("tmp_tb.put_time");//实施日期
+                break;
+            case 3:
+                page.setOrderByA("tmp_tb.standStatusShow");//文本状态
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
     }
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -278,11 +278,46 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         }else {
             page.setUserId(LoginUserUtil.getUserId());
         }
+
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
+        
         List<SarBussionessStand> getList = sarBussionessStandEODao.getSarBussionessStand(page);
         attrInfoShowExport(getList);
         return getList;
     }
 
+    private void nowOrderFunc(SarBussionessStandEOPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("tmp_tb.issue_time");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("tmp_tb.put_time");//实施日期
+                break;
+            case 3:
+                page.setOrderByA("tmp_tb.standStatusShow");//文本状态
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     public void attrInfoShow (List<SarBussionessStand> sarlist) throws Exception {
         for(SarBussionessStand row : sarlist){
             attrInfoDetails(row);

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<List<IssueTrack>> getIssueTrack(IssueTrackVo wrapper){
-        List<IssueTrack> issueTrack = issueTrackService.getIssueTrack(wrapper);
+    public ResponseMessage<IPage<IssueTrack>> getIssueTrack(IssueTrackVo wrapper){
+        IPage<IssueTrack> issueTrack = issueTrackService.getIssueTrack(wrapper);
         return Result.success(issueTrack);
     }
 

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

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<String> idList);
 
-    public List<IssueTrack> getIssueTrack(IssueTrackVo objVo);
+    public IPage<IssueTrack> getIssueTrack(IssueTrackVo objVo);
 
     public boolean updateIssueTrack(IssueTrack obj);
 }

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<IssueTrackDao, IssueTrack> 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<IssueTrackDao, IssueTrack
     }
 
     @Override
-    public List<IssueTrack> getIssueTrack(IssueTrackVo objVo) {
-        List<IssueTrack> result=new ArrayList<>();
-        if (objVo==null){
-            result=this.list();
+    public IPage<IssueTrack> getIssueTrack(IssueTrackVo objVo) {
+
+        IPage<IssueTrack> trackPage = new Page<>(objVo.getPage(), objVo.getPageSize());
+
+        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
+
+        if (objVo.getPage()!=null && objVo.getPageSize()!=null){
+            trackPage=new Page<>(objVo.getPage(),objVo.getPageSize());
         }else {
-            QueryWrapper<IssueTrack> 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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsFile/controller/SarLawsFileController.java

@@ -1,12 +1,22 @@
 package com.adc.da.slrs.sarLawsFile.controller;
 
 
+import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.att.service.IAttFileEOService;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarLawsFile.service.ISarLawsFileService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.adc.da.slrs.sarLawsFile.entity.SarLawsFile;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     *  前端控制器
@@ -17,7 +27,31 @@ import com.adc.da.base.web.BaseController;
 */
 @RestController
 @Api(description = "|SarLawsFile|")
-@RequestMapping("/sarLawsFile/sar-laws-file")
+@RequestMapping("/${restPath}/lawss/sarLawsFile")
 public class SarLawsFileController extends BaseController<SarLawsFile> {
+    @Autowired
+    private IAttFileEOService attFileEOService;
 
+    @Autowired
+    private ISarLawsFileService iSarLawsFileService;
+
+    @ApiOperation(value = "|SarBussStandFileEO|查询转换后的文档详情")
+    @GetMapping("/queryConvertAtt")
+    /*@RequiresPermissions("lawss:sarLawsFile:list")*/
+    public ResponseMessage<SarLawsFile> queryConvertAtt(String attId) throws Exception {
+        List<SarLawsFile> getList = iSarLawsFileService.selectFileByAttId(attId);
+        SarLawsFile sarBussStandFileEO = new SarLawsFile();
+        if(getList != null && !getList.isEmpty()){
+            sarBussStandFileEO = getList.get(0);
+            AttFileEO attFileEO = attFileEOService.getFileInfo(attId);
+            if(attFileEO != null){
+                sarBussStandFileEO.setFileOldName(attFileEO.getOldFileName());
+            }
+//            readStandOrLawsLogService.sendReadSOLLog("BUSS",sarBussStandFileEO);
+            return Result.success(sarBussStandFileEO);
+        } else {
+            return Result.success(null);
+        }
+
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsFile/service/ISarLawsFileService.java

@@ -3,6 +3,8 @@ package com.adc.da.slrs.sarLawsFile.service;
 import com.adc.da.slrs.sarLawsFile.entity.SarLawsFile;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISarLawsFileService extends IService<SarLawsFile> {
 
+    List<SarLawsFile> selectFileByAttId(String attId) throws Exception;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsFile/service/impl/SarLawsFileServiceImpl.java

@@ -6,6 +6,8 @@ import com.adc.da.slrs.sarLawsFile.service.ISarLawsFileService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class SarLawsFileServiceImpl extends ServiceImpl<SarLawsFileDao, SarLawsFile> implements ISarLawsFileService {
 
+    @Override
+    public List<SarLawsFile> selectFileByAttId(String attId) throws Exception{
+        return this.baseMapper.selectFileByAttId(attId);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java

@@ -77,22 +77,13 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
         if (null != page.getNowOrderBy()) {
             switch (page.getNowOrderBy()) {
                 case 1:
-                    page.setOrderByA("a.issueTime");//发布日期
+                    page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                     break;
                 case 2:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期
+                    page.setOrderByA("XCXSSRQLAWS");
                     break;
                 case 3:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期
-                    break;
-                case 4:
-                    page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态
-                    break;
-                case 5:
-                    page.setOrderByA("paixu");
-                    break;
-                case 6:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.SSRQ");
+                    page.setOrderByA("standStatusShow");//文本状态
                     break;
                 default:
                     page.setNowOrder(null);
@@ -105,6 +96,7 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
                         break;
                     case 2:
                         page.setOrder1("asc");
+                        break;
                     default:
                         page.setOrder1(null);
                         break;
@@ -131,44 +123,10 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
     @GetMapping("/pageLaws")
     /*@RequiresPermissions("lawss:sarLawsInfo:page")*/
     public ResponseMessage<PageInfo<SarLawsStandInfo>> pageLaws(SarLawsStandInfoPage page) throws Exception {
-        if (null != page.getNowOrderBy()) {
-            switch (page.getNowOrderBy()) {
-                case 1:
-                    page.setOrderByA("a.issueTime");//发布日期
-                    break;
-                case 2:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期
-                    break;
-                case 3:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期
-                    break;
-                case 4:
-                    page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态
-                    break;
-                case 5:
-                    page.setOrderByA("paixu");
-                    break;
-                case 6:
-                    page.setOrderByA("SAR_LAWS_ATTR_INFO.SSRQ");
-                    break;
-                default:
-                    page.setNowOrder(null);
-                    break;
-            }
-            if (null != page.getNowOrder()) {
-                switch (page.getNowOrder()) {
-                    case 1:
-                        page.setOrder1("desc");
-                        break;
-                    case 2:
-                        page.setOrder1("asc");
-                    default:
-                        page.setOrder1(null);
-                        break;
-                }
-            }
-        }
 
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
 
         if (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
             List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
@@ -184,6 +142,36 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+    private void nowOrderFunc(SarLawsStandInfoPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("XCXSSRQLAWS");//实施日期
+                break;
+            case 3:
+                page.setOrderByA("standStatusShow");//文本状态
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     @ApiOperation(value = "|SarLawsStandInfo|详情")
     @GetMapping("/getStandInfoById")
     //@RequiresPermissions("lawss:sarStandardsInfo:get")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java

@@ -268,10 +268,10 @@ public class SarLawsStandInfoPage extends BasePage {
     @TableField(exist = false)
     private Integer nowOrderBy;
     @TableField(exist = false)
-    private String orderByA = "a.issue_time";
+    private String orderByA = "";
     @TableField(exist = false)
     private String orderBy1 = "SAR_LAWS_STAND_INFO.issue_time";
     @TableField(exist = false)
-    private String order1 = "desc";
+    private String order1 = "";
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java

@@ -436,11 +436,46 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
         }else {
             page.setUserId(LoginUserUtil.getUserId());
         }
+
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
+
         List<SarLawsStandInfo> rows = this.baseMapper.getSarStandardsExportInfo(page);
         attrInfoShowExport(rows);
         return rows;
     }
 
+    private void nowOrderFunc(SarLawsStandInfoPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("XCXSSRQLAWS");//实施日期
+                break;
+            case 3:
+                page.setOrderByA("standStatusShow");//文本状态
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     public void attrInfoShow (List<SarLawsStandInfo> sarlist) throws Exception {
         for(SarLawsStandInfo row : sarlist){
             attrInfoDetails(row);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java

@@ -6,6 +6,7 @@ import com.adc.da.http.Result;
 import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
 import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssueVo;
 import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -91,10 +92,15 @@ public class BusinessDeptIssueController extends BaseController {
             }
             String fileName = URLEncoder.encode(issue.getFileName(), "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-//            List<SarStandUnqualified> data=sarStandUnqualifiedService.getStandUnqualifiedExcelData(standUnqualifiedExcelVO);
+
+
+            /**
+             * 重写了get方法,无法使用net.sf.json.JSONObject转换对象
+             */
+//            net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(issue.getExportContent());
+//            BusinessDeptIssueVo businessDeptIssueVo = (BusinessDeptIssueVo) net.sf.json.JSONObject.toBean(jsonObject, BusinessDeptIssueVo.class);
 
             JSONObject jsonObject = JSONObject.parseObject(issue.getExportContent());
-
             BusinessDeptIssueVo businessDeptIssueVo = JSONObject.toJavaObject(jsonObject, BusinessDeptIssueVo.class);
             IPage<BusinessDeptIssue> page = iBusinessDeptIssueService.getBusinessDeptIssue(businessDeptIssueVo);
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -92,46 +92,10 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     @GetMapping("/getSarStandardsInfoPage")
     //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
     public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPage(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
-        int isNull = -1;
         if (null != page.getNowOrderBy()) {
-            switch (page.getNowOrderBy()) {
-                case 1:
-                    page.setOrderByA("ISSUE_TIME");//发布日期
-                    break;
-                case 2:
-                    page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
-                    break;
-                case 3:
-                    page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
-                    break;
-                case 4:
-                    page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态
-                    break;
-                case 5:
-                    page.setOrderByA("paixu");
-                    break;
-                case 6:
-                    page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ");
-                    break;
-                default:
-                    page.setNowOrder(null);
-                    break;
-            }
-            if (null != page.getNowOrder()) {
-                switch (page.getNowOrder()) {
-                    case 1:
-                        page.setOrder1("desc");
-                        break;
-                    case 2:
-                        page.setOrder1("asc");
-                    default:
-                        page.setOrder1(null);
-                        break;
-                }
-            }
+            nowOrderFunc(page);
         }
 
-
         if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
             List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
             String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
@@ -142,40 +106,6 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
             }
         }
 
-
-
-
-
-//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
-//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-//            int i = 0;
-//            for (SarAdvanceSearchVO sarAdvanceSearchVO:searchList){
-//                if ("SVPPS".equals(sarAdvanceSearchVO.getField()) && StringUtils.isBlank(sarAdvanceSearchVO.getValue())){
-//                    isNull = i;
-//                }
-//                i++;
-//            }
-//            if (-1 != isNull) {
-//                searchList.remove(isNull);
-//            }
-//            if (isNull == 0 && searchList.size() > 0){
-//                searchList.get(0).setConnect("");
-//            }
-//            String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
-//            if (null != advanceStr) {
-//                advanceStr = advanceStr.replace("stand_number", "concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',SAR_STANDARDS_INFO.STAND_YEAR)");
-//            }
-//            if (-1 != isNull && StringUtils.isBlank(advanceStr)){
-//                advanceStr = advanceStr + " SVPPS is null";
-//            }else if (-1 != isNull && StringUtils.isNotBlank(advanceStr)){
-//                advanceStr = advanceStr + " and SVPPS is null";
-//            }
-//            if (StringUtils.isNotBlank(advanceStr)) {
-//                page.setAdvanceSearchStr(advanceStr);
-//            } else {
-//                page.setAdvanceSearchStr(null);
-//            }
-//        }
         if(page.getUserId() == null || page.getUserId().equals("")){
             page.setUserId(LoginUserUtil.getUserId());
         }
@@ -183,6 +113,45 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+    private void nowOrderFunc(SarStandardsInfoEOPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("ISSUE_TIME");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("ZCCSSRQ");//新车型实施日期
+                break;
+            case 3:
+                page.setOrderByA("XCXSSRQ");//在产车实施日期
+                break;
+            case 4:
+                page.setOrderByA("standTextStatusShow");//文本状态
+                break;
+            case 5:
+                page.setOrderByA("paixu");
+                break;
+            case 6:
+                page.setOrderByA("SSRQ");
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
     @GetMapping("/getSarStandardsInfoPageBak")
     //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java

@@ -120,6 +120,10 @@ public class SarBussionessStandEOPage extends BasePage {
     private String paixu;
     private String shunxu;
     private String sql;
+    private Integer nowOrder;
+    private Integer nowOrderBy;
+    private String orderByA = "";
+    private String order1 = "";
 
     // 新增字段
     private String FZRQBUSS;
@@ -144,6 +148,38 @@ public class SarBussionessStandEOPage extends BasePage {
     private String GLWJBUSS;
     private String XCSJBUSS;
 
+    public Integer getNowOrder() {
+        return nowOrder;
+    }
+
+    public void setNowOrder(Integer nowOrder) {
+        this.nowOrder = nowOrder;
+    }
+
+    public Integer getNowOrderBy() {
+        return nowOrderBy;
+    }
+
+    public void setNowOrderBy(Integer nowOrderBy) {
+        this.nowOrderBy = nowOrderBy;
+    }
+
+    public String getOrderByA() {
+        return orderByA;
+    }
+
+    public void setOrderByA(String orderByA) {
+        this.orderByA = orderByA;
+    }
+
+    public String getOrder1() {
+        return order1;
+    }
+
+    public void setOrder1(String order1) {
+        this.order1 = order1;
+    }
+
     public String getFZRQBUSS() {
         return FZRQBUSS;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -84,9 +84,9 @@ public class SarStandardsInfoEOPage extends BasePage {
     private String productId;
     private Integer nowOrder;
     private Integer nowOrderBy;
-    private String orderByA = "a.issue_time";
+    private String orderByA = "";
     private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
-    private String order1 = "desc";
+    private String order1 = "";
 
 //    zhaokaiyao
     private String textStatus;//文本状态

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1613,11 +1613,53 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }else {
             page.setUserId(LoginUserUtil.getUserId());
         }
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
         List<SarStandardsInfo> getList = dao.getSarStandardsExportInfo(page);
         attrInfoShowExport(getList);
         return getList;
     }
 
+    private void nowOrderFunc(SarStandardsInfoEOPage page) {
+        switch (page.getNowOrderBy()) {
+            case 1:
+                page.setOrderByA("ISSUE_TIME");//发布日期
+                break;
+            case 2:
+                page.setOrderByA("ZCCSSRQ");//新车型实施日期
+                break;
+            case 3:
+                page.setOrderByA("XCXSSRQ");//在产车实施日期
+                break;
+            case 4:
+                page.setOrderByA("text_status");//文本状态
+                break;
+            case 5:
+                page.setOrderByA("paixu");
+                break;
+            case 6:
+                page.setOrderByA("SSRQ");
+                break;
+            default:
+                page.setNowOrder(null);
+                break;
+        }
+        if (null != page.getNowOrder()) {
+            switch (page.getNowOrder()) {
+                case 1:
+                    page.setOrder1("desc");
+                    break;
+                case 2:
+                    page.setOrder1("asc");
+                    break;
+                default:
+                    page.setOrder1(null);
+                    break;
+            }
+        }
+    }
+
     public ResponseMessage<SarStandardsInfo> importSarStandardsInfoData(List<Map<String, String>> dataList, String standType, String menuId, String filepath) {
 //此处需要做各种验证，数据库操作
         try {

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

@@ -0,0 +1,71 @@
+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;
+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;
+
+import java.util.List;
+
+/**
+* <p>
+    * 采购费用信息统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdCgfy|")
+@RequestMapping("/wgdCensusLeo/wgd-cgfy")
+public class WgdCgfyController extends BaseController<WgdCgfy> {
+
+    @Autowired
+    IWgdCgfyService iWgdCgfyService;
+
+    @GetMapping("getAllCgfys")
+    public ResponseMessage<Object> getAllWgdCgfys(){//查询所有
+        return Result.success(iWgdCgfyService.getAllWgdCgfys());
+    }
+
+    @PostMapping("queryAllCgfys")
+    public ResponseMessage<Object> queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询
+        List<WgdCgfy> wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy);
+        PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getCgfyById")
+    public ResponseMessage<Object> getWgdCgfyById(String id) {//查询详情
+        return Result.success(iWgdCgfyService.getWgdCgfyById(id));
+    }
+
+    @PostMapping("modCgfy")
+    ResponseMessage<Object> updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑
+        return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy));
+    }
+
+    @PostMapping("addCgfy")
+    ResponseMessage<Object> insertWgdCgfy(WgdCgfy WgdCgfy) {//插入
+        return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy));
+    }
+
+    @GetMapping("delCgfy")
+    ResponseMessage<Object> deleteWgdCgfy(String id){//删除
+        return Result.success(iWgdCgfyService.deleteWgdCgfy(id));
+    }
+
+    @GetMapping("delCgfys")
+    ResponseMessage<Object> deleteWgdCgfys(String ids){//批量删除
+        return Result.success(iWgdCgfyService.deleteWgdCgfys(ids));
+    }
+}

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

@@ -0,0 +1,70 @@
+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;
+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;
+
+import java.util.List;
+
+/**
+* <p>
+    * 翻译费用信息统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdFyfy|")
+@RequestMapping("/wgdCensusLeo/wgd-fyfy")
+public class WgdFyfyController extends BaseController<WgdFyfy> {
+    @Autowired
+    IWgdFyfyService iWgdFyfyService;
+
+    @GetMapping("getAllFyfys")
+    public ResponseMessage<Object> getAllWgdFyfys(){//查询所有
+        return Result.success(iWgdFyfyService.getAllWgdFyfys());
+    }
+
+    @PostMapping("queryAllFyfys")
+    public ResponseMessage<Object> queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询
+        List<WgdFyfy> wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy);
+        PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getFyfyById")
+    public ResponseMessage<Object> getWgdFyfyById(String id) {//查询详情
+        return Result.success(iWgdFyfyService.getWgdFyfyById(id));
+    }
+
+    @PostMapping("modFyfy")
+    ResponseMessage<Object> updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑
+        return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy));
+    }
+
+    @PostMapping("addFyfy")
+    ResponseMessage<Object> insertWgdFyfy(WgdFyfy WgdFyfy) {//插入
+        return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy));
+    }
+
+    @GetMapping("delFyfy")
+    ResponseMessage<Object> deleteWgdFyfy(String id){//删除
+        return Result.success(iWgdFyfyService.deleteWgdFyfy(id));
+    }
+
+    @GetMapping("delFyfys")
+    ResponseMessage<Object> deleteWgdFyfys(String ids){//批量删除
+        return Result.success(iWgdFyfyService.deleteWgdFyfys(ids));
+    }
+}

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

@@ -0,0 +1,70 @@
+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 io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 标准制修订补助资金收支统计收入表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdSrb|")
+@RequestMapping("/wgdCensusLeo/wgd-srb")
+public class WgdSrbController extends BaseController<WgdSrb> {
+    @Autowired
+    IWgdSrbService iWgdSrbService;
+
+    @GetMapping("getAllSrbs")
+    public ResponseMessage<Object> getAllWgdSrbs(){//查询所有
+        return Result.success(iWgdSrbService.getAllWgdSrbs());
+    }
+
+    @PostMapping("queryAllSrbs")
+    public ResponseMessage<Object> queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询
+        List<WgdSrb> wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb);
+        PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getSrbById")
+    public ResponseMessage<Object> getWgdSrbById(String id) {//查询详情
+        return Result.success(iWgdSrbService.getWgdSrbById(id));
+    }
+
+    @PostMapping("modSrb")
+    ResponseMessage<Object> updateWgdSrb(WgdSrb WgdSrb) {//编辑
+        return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb));
+    }
+
+    @PostMapping("addSrb")
+    ResponseMessage<Object> insertWgdSrb(WgdSrb WgdSrb) {//插入
+        return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb));
+    }
+
+    @GetMapping("delSrb")
+    ResponseMessage<Object> deleteWgdSrb(String id){//删除
+        return Result.success(iWgdSrbService.deleteWgdSrb(id));
+    }
+
+    @GetMapping("delSrbs")
+    ResponseMessage<Object> deleteWgdSrbs(String ids){//批量删除
+        return Result.success(iWgdSrbService.deleteWgdSrbs(ids));
+    }
+}

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

@@ -0,0 +1,70 @@
+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;
+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;
+
+import java.util.List;
+
+/**
+* <p>
+    * 参与外部协会会议统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdWbtj|")
+@RequestMapping("/wgdCensusLeo/wgd-wbtj")
+public class WgdWbtjController extends BaseController<WgdWbtj> {
+    @Autowired
+    IWgdWbtjService iWgdWbtjService;
+
+    @GetMapping("getAllWbtjs")
+    public ResponseMessage<Object> getAllWgdWbtjs(){//查询所有
+        return Result.success(iWgdWbtjService.getAllWgdWbtjs());
+    }
+
+    @PostMapping("queryAllWbtjs")
+    public ResponseMessage<Object> queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询
+        List<WgdWbtj> wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj);
+        PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getWbtjById")
+    public ResponseMessage<Object> getWgdWbtjById(String id) {//查询详情
+        return Result.success(iWgdWbtjService.getWgdWbtjById(id));
+    }
+
+    @PostMapping("modWbtj")
+    ResponseMessage<Object> updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑
+        return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj));
+    }
+
+    @PostMapping("addWbtj")
+    ResponseMessage<Object> insertWgdWbtj(WgdWbtj WgdWbtj) {//插入
+        return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj));
+    }
+
+    @GetMapping("delWbtj")
+    ResponseMessage<Object> deleteWgdWbtj(String id){//删除
+        return Result.success(iWgdWbtjService.deleteWgdWbtj(id));
+    }
+
+    @GetMapping("delWbtjs")
+    ResponseMessage<Object> deleteWgdWbtjs(String ids){//批量删除
+        return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids));
+    }
+}

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

@@ -0,0 +1,70 @@
+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;
+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;
+
+import java.util.List;
+
+/**
+* <p>
+    * 参与外部标准制修订信息统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdWbxd|")
+@RequestMapping("/wgdCensusLeo/wgd-wbxd")
+public class WgdWbxdController extends BaseController<WgdWbxd> {
+    @Autowired
+    IWgdWbxdService iWgdWbxdService;
+
+    @GetMapping("getAllWbxds")
+    public ResponseMessage<Object> getAllWgdWbxds(){//查询所有
+        return Result.success(iWgdWbxdService.getAllWgdWbxds());
+    }
+
+    @PostMapping("queryAllWbxds")
+    public ResponseMessage<Object> queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询
+        List<WgdWbxd> wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd);
+        PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getWbxdById")
+    public ResponseMessage<Object> getWgdWbxdById(String id) {//查询详情
+        return Result.success(iWgdWbxdService.getWgdWbxdById(id));
+    }
+
+    @PostMapping("modWbxd")
+    ResponseMessage<Object> updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑
+        return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd));
+    }
+
+    @PostMapping("addWbxd")
+    ResponseMessage<Object> insertWgdWbxd(WgdWbxd WgdWbxd) {//插入
+        return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd));
+    }
+
+    @GetMapping("delWbxd")
+    ResponseMessage<Object> deleteWgdWbxd(String id){//删除
+        return Result.success(iWgdWbxdService.deleteWgdWbxd(id));
+    }
+
+    @GetMapping("delWbxds")
+    ResponseMessage<Object> deleteWgdWbxds(String ids){//批量删除
+        return Result.success(iWgdWbxdService.deleteWgdWbxds(ids));
+    }
+}

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

@@ -0,0 +1,70 @@
+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 io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 标准制修订补助资金收支统计支出表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdZcb|")
+@RequestMapping("/wgdCensusLeo/wgd-zcb")
+public class WgdZcbController extends BaseController<WgdZcb> {
+    @Autowired
+    IWgdZcbService iWgdZcbService;
+
+    @GetMapping("getAllZcbs")
+    public ResponseMessage<Object> getAllWgdZcbs(){//查询所有
+        return Result.success(iWgdZcbService.getAllWgdZcbs());
+    }
+
+    @PostMapping("queryAllZcbs")
+    public ResponseMessage<Object> queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询
+        List<WgdZcb> wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb);
+        PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getZcbById")
+    public ResponseMessage<Object> getWgdZcbById(String id) {//查询详情
+        return Result.success(iWgdZcbService.getWgdZcbById(id));
+    }
+
+    @PostMapping("modZcb")
+    ResponseMessage<Object> updateWgdZcb(WgdZcb WgdZcb) {//编辑
+        return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb));
+    }
+
+    @PostMapping("addZcb")
+    ResponseMessage<Object> insertWgdZcb(WgdZcb WgdZcb) {//插入
+        return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb));
+    }
+
+    @GetMapping("delZcb")
+    ResponseMessage<Object> deleteWgdZcb(String id){//删除
+        return Result.success(iWgdZcbService.deleteWgdZcb(id));
+    }
+
+    @GetMapping("delZcbs")
+    ResponseMessage<Object> deleteWgdZcbs(String ids){//批量删除
+        return Result.success(iWgdZcbService.deleteWgdZcbs(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java

@@ -0,0 +1,26 @@
+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;
+
+/**
+ * <p>
+ * 采购费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdCgfyDao extends BaseMapper<WgdCgfy> {
+    Integer getQueryTotal(WgdCgfy WgdCgfy);//总数
+    List<WgdCgfy> selectAll();//查询所有
+    List<WgdCgfy> queryAll(WgdCgfy wgdCgfy);//多条件查询
+    WgdCgfy selectOne(String id);//查询详情
+
+    int updateOne(WgdCgfy wgdCgfy);//编辑
+    int insertOne(WgdCgfy wgdCgfy);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java

@@ -0,0 +1,32 @@
+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;
+
+/**
+ * <p>
+ * 翻译费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdFyfyDao extends BaseMapper<WgdFyfy> {
+    Integer getQueryTotal(WgdFyfy WgdFyfy);//总数
+
+    List<WgdFyfy> selectAll();//查询所有
+
+    List<WgdFyfy> queryAll(WgdFyfy wgdFyfy);//多条件查询
+
+    WgdFyfy selectOne(String id);//查询详情
+
+    int updateOne(WgdFyfy wgdFyfy);//编辑
+
+    int insertOne(WgdFyfy wgdFyfy);//插入
+
+    int deleteOne(String id);//删除
+
+    int deleteBatch();//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java

@@ -0,0 +1,26 @@
+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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计收入表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdSrbDao extends BaseMapper<WgdSrb> {
+    Integer getQueryTotal(WgdSrb WgdSrb);//总数
+    List<WgdSrb> selectAll();//查询所有
+    List<WgdSrb> queryAll(WgdSrb wgdSrb);//多条件查询
+    WgdSrb selectOne(String id);//查询详情
+
+    int updateOne(WgdSrb wgdSrb);//编辑
+    int insertOne(WgdSrb wgdSrb);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java

@@ -0,0 +1,26 @@
+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;
+
+/**
+ * <p>
+ * 参与外部协会会议统计 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdWbtjDao extends BaseMapper<WgdWbtj> {
+    Integer getQueryTotal(WgdWbtj WgdWbtj);//总数
+    List<WgdWbtj> selectAll();//查询所有
+    List<WgdWbtj> queryAll(WgdWbtj wgdWbtj);//多条件查询
+    WgdWbtj selectOne(String id);//查询详情
+
+    int updateOne(WgdWbtj wgdWbtj);//编辑
+    int insertOne(WgdWbtj wgdWbtj);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java

@@ -0,0 +1,26 @@
+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;
+
+/**
+ * <p>
+ * 参与外部标准制修订信息统计 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdWbxdDao extends BaseMapper<WgdWbxd> {
+    Integer getQueryTotal(WgdWbxd WgdWbxd);//总数
+    List<WgdWbxd> selectAll();//查询所有
+    List<WgdWbxd> queryAll(WgdWbxd wgdWbxd);//多条件查询
+    WgdWbxd selectOne(String id);//查询详情
+
+    int updateOne(WgdWbxd wgdWbxd);//编辑
+    int insertOne(WgdWbxd wgdWbxd);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java

@@ -0,0 +1,26 @@
+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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdZcbDao extends BaseMapper<WgdZcb> {
+    Integer getQueryTotal(WgdZcb WgdZcb);//总数
+    List<WgdZcb> selectAll();//查询所有
+    List<WgdZcb> queryAll(WgdZcb wgdZcb);//多条件查询
+    WgdZcb selectOne(String id);//查询详情
+
+    int updateOne(WgdZcb wgdZcb);//编辑
+    int insertOne(WgdZcb wgdZcb);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

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

@@ -0,0 +1,48 @@
+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;
+
+/**
+ * <p>
+ * 采购费用信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdCgfy对象", description="采购费用信息统计")
+public class WgdCgfy extends BasePage {
+
+    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;
+
+
+}

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

@@ -0,0 +1,56 @@
+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;
+
+/**
+ * <p>
+ * 翻译费用信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdFyfy对象", description="翻译费用信息统计")
+public class WgdFyfy extends BasePage {
+
+    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 = "翻译完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String time;
+
+
+}

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

@@ -0,0 +1,49 @@
+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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计收入表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表")
+public class WgdSrb extends BasePage {
+
+    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 = "入账时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String data;
+
+
+}

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

@@ -0,0 +1,73 @@
+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;
+
+/**
+ * <p>
+ * 参与外部协会会议统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计")
+public class WgdWbtj extends BasePage {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "主办单位")
+    private String host;
+
+    @ApiModelProperty(value = "会议名称")
+    private String meeting;
+
+    @ApiModelProperty(value = "会议时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    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;
+
+
+}

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

@@ -0,0 +1,99 @@
+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;
+
+/**
+ * <p>
+ * 参与外部标准制修订信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计")
+public class WgdWbxd extends BasePage {
+
+    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 = "发布日期")
+    @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 = "颁布机构")
+    private String body;
+
+    @ApiModelProperty(value = "牵头起草单位")
+    private String drafting;
+
+    @ApiModelProperty(value = "备案时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    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;
+
+
+}

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

@@ -0,0 +1,44 @@
+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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表")
+public class WgdZcb extends BasePage {
+
+    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;
+
+
+}

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

@@ -0,0 +1,25 @@
+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;
+
+/**
+ * <p>
+ * 采购费用信息统计 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdCgfyService extends IService<WgdCgfy> {
+    List<WgdCgfy> getAllWgdCgfys();//查询所有
+    List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy);//多条件查询
+    WgdCgfy getWgdCgfyById(String id);//查询详情
+
+    int updateWgdCgfy(WgdCgfy wgdCgfy);//编辑
+    int insertWgdCgfy(WgdCgfy wgdCgfy);//插入
+    int deleteWgdCgfy(String id);//删除
+    int deleteWgdCgfys(String ids);//批量删除
+}

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

@@ -0,0 +1,25 @@
+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;
+
+/**
+ * <p>
+ * 翻译费用信息统计 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdFyfyService extends IService<WgdFyfy> {
+    List<WgdFyfy> getAllWgdFyfys();//查询所有
+    List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy);//多条件查询
+    WgdFyfy getWgdFyfyById(String id);//查询详情
+
+    int updateWgdFyfy(WgdFyfy wgdFyfy);//编辑
+    int insertWgdFyfy(WgdFyfy wgdFyfy);//插入
+    int deleteWgdFyfy(String id);//删除
+    int deleteWgdFyfys(String ids);//批量删除
+}

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

@@ -0,0 +1,25 @@
+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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计收入表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdSrbService extends IService<WgdSrb> {
+    List<WgdSrb> getAllWgdSrbs();//查询所有
+    List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb);//多条件查询
+    WgdSrb getWgdSrbById(String id);//查询详情
+
+    int updateWgdSrb(WgdSrb wgdSrb);//编辑
+    int insertWgdSrb(WgdSrb wgdSrb);//插入
+    int deleteWgdSrb(String id);//删除
+    int deleteWgdSrbs(String ids);//批量删除
+}

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

@@ -0,0 +1,25 @@
+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;
+
+/**
+ * <p>
+ * 参与外部协会会议统计 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdWbtjService extends IService<WgdWbtj> {
+    List<WgdWbtj> getAllWgdWbtjs();//查询所有
+    List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj);//多条件查询
+    WgdWbtj getWgdWbtjById(String id);//查询详情
+
+    int updateWgdWbtj(WgdWbtj wgdWbtj);//编辑
+    int insertWgdWbtj(WgdWbtj wgdWbtj);//插入
+    int deleteWgdWbtj(String id);//删除
+    int deleteWgdWbtjs(String ids);//批量删除
+}

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

@@ -0,0 +1,25 @@
+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;
+
+/**
+ * <p>
+ * 参与外部标准制修订信息统计 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdWbxdService extends IService<WgdWbxd> {
+    List<WgdWbxd> getAllWgdWbxds();//查询所有
+    List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd);//多条件查询
+    WgdWbxd getWgdWbxdById(String id);//查询详情
+
+    int updateWgdWbxd(WgdWbxd wgdWbxd);//编辑
+    int insertWgdWbxd(WgdWbxd wgdWbxd);//插入
+    int deleteWgdWbxd(String id);//删除
+    int deleteWgdWbxds(String ids);//批量删除
+}

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

@@ -0,0 +1,25 @@
+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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdZcbService extends IService<WgdZcb> {
+    List<WgdZcb> getAllWgdZcbs();//查询所有
+    List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb);//多条件查询
+    WgdZcb getWgdZcbById(String id);//查询详情
+
+    int updateWgdZcb(WgdZcb wgdZcb);//编辑
+    int insertWgdZcb(WgdZcb wgdZcb);//插入
+    int deleteWgdZcb(String id);//删除
+    int deleteWgdZcbs(String ids);//批量删除
+}

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

@@ -0,0 +1,65 @@
+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;
+
+/**
+ * <p>
+ * 采购费用信息统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> implements IWgdCgfyService {
+
+    @Autowired
+    WgdCgfyDao wgdCgfyDao;
+
+    @Override
+    public List<WgdCgfy> getAllWgdCgfys() {
+        return wgdCgfyDao.selectAll();
+    }
+
+    @Override
+    public List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy) {
+        Integer count = wgdCgfyDao.getQueryTotal(wgdCgfy);
+        wgdCgfy.getPager().setRowCount(count);
+        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();
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 翻译费用信息统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> implements IWgdFyfyService {
+
+    @Autowired
+    WgdFyfyDao wgdFyfyDao;
+
+    @Override
+    public List<WgdFyfy> getAllWgdFyfys() {
+        return wgdFyfyDao.selectAll();
+    }
+
+    @Override
+    public List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy) {
+        Integer count = wgdFyfyDao.getQueryTotal(wgdFyfy);
+        wgdFyfy.getPager().setRowCount(count);
+        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();
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
+import com.adc.da.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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计收入表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements IWgdSrbService {
+
+    @Autowired
+    WgdSrbDao wgdSrbDao;
+
+    @Override
+    public List<WgdSrb> getAllWgdSrbs() {
+        return wgdSrbDao.selectAll();
+    }
+
+    @Override
+    public List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb) {
+        Integer count = wgdSrbDao.getQueryTotal(wgdSrb);
+        wgdSrb.getPager().setRowCount(count);
+        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();
+    }
+}

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

@@ -0,0 +1,65 @@
+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;
+
+/**
+ * <p>
+ * 参与外部协会会议统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> implements IWgdWbtjService {
+
+    @Autowired
+    WgdWbtjDao wgdWbtjDao;
+
+    @Override
+    public List<WgdWbtj> getAllWgdWbtjs() {
+        return wgdWbtjDao.selectAll();
+    }
+
+    @Override
+    public List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj) {
+        Integer count = wgdWbtjDao.getQueryTotal(wgdWbtj);
+        wgdWbtj.getPager().setRowCount(count);
+        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();
+    }
+}

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

@@ -0,0 +1,65 @@
+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;
+
+/**
+ * <p>
+ * 参与外部标准制修订信息统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> implements IWgdWbxdService {
+
+    @Autowired
+    WgdWbxdDao wgdWbxdDao;
+
+    @Override
+    public List<WgdWbxd> getAllWgdWbxds() {
+        return wgdWbxdDao.selectAll();
+    }
+
+    @Override
+    public List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd) {
+        Integer count = wgdWbxdDao.getQueryTotal(wgdWbxd);
+        wgdWbxd.getPager().setRowCount(count);
+        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();
+    }
+}

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

@@ -0,0 +1,65 @@
+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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements IWgdZcbService {
+
+    @Autowired
+    WgdZcbDao wgdZcbDao;
+
+    @Override
+    public List<WgdZcb> getAllWgdZcbs() {
+        return wgdZcbDao.selectAll();
+    }
+
+    @Override
+    public List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb) {
+        Integer count = wgdZcbDao.getQueryTotal(wgdZcb);
+        wgdZcb.getPager().setRowCount(count);
+        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();
+    }
+}

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

@@ -0,0 +1,81 @@
+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;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 协会费用信息统计 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdAssocCost|")
+@RequestMapping("api/wgdCensusZ/wgd-assoc-cost")
+public class WgdAssocCostController extends BaseController<WgdAssocCost> {
+
+    @Autowired
+    IWgdAssocCostService iWgdAssocCostService;
+
+    @ApiOperation("查询所有信息")
+    @GetMapping("getAllAssocCosts")
+    public ResponseMessage<Object> getAllWgdAssocCosts(WgdAssocCost page){//查询所有
+        List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.getAllWgdAssocCosts(page);
+        PageInfo<WgdAssocCost> pageInfo = getPageInfo(page.getPager(), wgdAssocCosts);
+        return Result.success(pageInfo);
+    }
+
+    @ApiOperation("多条件查询")
+    @PostMapping("queryAllAssocCosts")
+    public ResponseMessage<Object> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询
+        List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost);
+        PageInfo<WgdAssocCost> pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts);
+        return Result.success(pageInfo);
+    }
+
+    @ApiOperation("查询详情")
+    @GetMapping("getAssocCostById")
+    public ResponseMessage<Object> getWgdAssocCostById(String id) {//查询详情
+        return Result.success(iWgdAssocCostService.getWgdAssocCostById(id));
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("modAssocCost")
+    ResponseMessage<Object> updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑
+        return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost));
+    }
+
+    @ApiOperation("插入")
+    @PostMapping("addAssocCost")
+    ResponseMessage<Object> insertWgdAssocCost(WgdAssocCost wgdAssocCost) {//插入
+        return Result.success(iWgdAssocCostService.insertWgdAssocCost(wgdAssocCost));
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("delAssocCost")
+    ResponseMessage<Object> deleteWgdAssocCost(String id){//删除
+        return Result.success(iWgdAssocCostService.deleteWgdAssocCost(id));
+    }
+
+    @ApiOperation("批量删除")
+    @GetMapping("delAssocCosts")
+    ResponseMessage<Object> deleteWgdAssocCosts(String ids){//批量删除
+        return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids));
+    }
+}

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

@@ -0,0 +1,70 @@
+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;
+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;
+
+/**
+* <p>
+    * 协会信息数据统计 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdAssocInfo|")
+@RequestMapping("api/wgdCensusZ/wgd-assoc-info")
+public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
+    @Autowired
+    IWgdAssocInfoService iWgdAssocInfoService;
+
+    @GetMapping("getAllAssocInfos")
+    public ResponseMessage<Object> getAllWgdAssocInfos(){//查询所有
+        return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos());
+    }
+
+    @PostMapping("queryAllAssocInfos")
+    public ResponseMessage<Object> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询
+        List<WgdAssocInfo> wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo);
+        PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getAssocInfoById")
+    public ResponseMessage<Object> getWgdAssocInfoById(String id) {//查询详情
+        return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id));
+    }
+
+    @PostMapping("modAssocInfo")
+    ResponseMessage<Object> updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
+        return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo));
+    }
+
+    @PostMapping("addAssocInfo")
+    ResponseMessage<Object> insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
+        return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo));
+    }
+
+    @GetMapping("delAssocInfo")
+    ResponseMessage<Object> deleteWgdAssocInfo(String id){//删除
+        return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id));
+    }
+
+    @GetMapping("delAssocInfos")
+    ResponseMessage<Object> deleteWgdAssocInfos(String ids){//批量删除
+        return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids));
+    }
+}

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

@@ -0,0 +1,70 @@
+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;
+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;
+
+/**
+* <p>
+    * 委员信息数据统计 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdCommiInfo|")
+@RequestMapping("api/wgdCensusZ/wgd-commi-info")
+public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
+    @Autowired
+    IWgdCommiInfoService iWgdCommiInfoService;
+
+    @GetMapping("getAllCommiInfos")
+    public ResponseMessage<Object> getAllWgdCommiInfos(){//查询所有
+        return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos());
+    }
+
+    @PostMapping("queryAllCommiInfos")
+    public ResponseMessage<Object> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询
+        List<WgdCommiInfo> wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo);
+        PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getCommiInfoById")
+    public ResponseMessage<Object> getWgdCommiInfoById(String id) {//查询详情
+        return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id));
+    }
+
+    @PostMapping("modCommiInfo")
+    ResponseMessage<Object> updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
+        return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo));
+    }
+
+    @PostMapping("addCommiInfo")
+    ResponseMessage<Object> insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
+        return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo));
+    }
+
+    @GetMapping("delCommiInfo")
+    ResponseMessage<Object> deleteWgdCommiInfo(String id){//删除
+        return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id));
+    }
+
+    @GetMapping("delCommiInfos")
+    ResponseMessage<Object> deleteWgdCommiInfos(String ids){//批量删除
+        return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids));
+    }
+}

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

@@ -0,0 +1,70 @@
+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;
+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;
+
+/**
+* <p>
+    * 参与外部标准制修订费用统计 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdExReviseCost|")
+@RequestMapping("api/wgdCensusZ/wgd-ex-revise-cost")
+public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
+    @Autowired
+    IWgdExReviseCostService iWgdExReviseCostService;
+
+    @GetMapping("getAllExReviseCosts")
+    public ResponseMessage<Object> getAllWgdExReviseCosts(){//查询所有
+        return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts());
+    }
+
+    @PostMapping("queryAllExReviseCosts")
+    public ResponseMessage<Object> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询
+        List<WgdExReviseCost> wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost);
+        PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getExReviseCostById")
+    public ResponseMessage<Object> getWgdExReviseCostById(String id) {//查询详情
+        return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id));
+    }
+
+    @PostMapping("modExReviseCost")
+    ResponseMessage<Object> updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
+        return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost));
+    }
+
+    @PostMapping("addExReviseCost")
+    ResponseMessage<Object> insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
+        return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost));
+    }
+
+    @GetMapping("delExReviseCost")
+    ResponseMessage<Object> deleteWgdExReviseCost(String id){//删除
+        return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id));
+    }
+
+    @GetMapping("delExReviseCosts")
+    ResponseMessage<Object> deleteWgdExReviseCosts(String ids){//批量删除
+        return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids));
+    }
+}

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

@@ -0,0 +1,68 @@
+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;
+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;
+
+
+/**
+* <p>
+    * 参会费用信息统计 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdMeetCost|")
+@RequestMapping("api/wgdCensusZ/wgd-meet-cost")
+public class WgdMeetCostController extends BaseController<WgdMeetCost> {
+    @Autowired
+    IWgdMeetCostService iWgdMeetCostService;
+
+    @GetMapping("getAllMeetCosts")
+    public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
+        return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
+    }
+
+    @PostMapping("queryAllMeetCosts")
+    public ResponseMessage<Object> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询
+        PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost));
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("getMeetCostById")
+    public ResponseMessage<Object> getWgdMeetCostById(String id) {//查询详情
+        return Result.success(iWgdMeetCostService.getWgdMeetCostById(id));
+    }
+
+    @PostMapping("modMeetCost")
+    ResponseMessage<Object> updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
+        return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost));
+    }
+
+    @PostMapping("addMeetCost")
+    ResponseMessage<Object> insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
+        return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost));
+    }
+
+    @GetMapping("delMeetCost")
+    ResponseMessage<Object> deleteWgdMeetCost(String id){//删除
+        return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id));
+    }
+
+    @GetMapping("delMeetCosts")
+    ResponseMessage<Object> deleteWgdMeetCosts(String ids){//批量删除
+        return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java

@@ -0,0 +1,32 @@
+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;
+
+/**
+ * <p>
+ * 协会费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdAssocCostDao extends BaseMapper<WgdAssocCost> {
+    Integer getTotal();//总数
+    Integer getQueryTotal(WgdAssocCost wgdAssocCost);//总数
+    List<WgdAssocCost> selectAll(WgdAssocCost page);//查询所有
+    List<WgdAssocCost> queryAll(WgdAssocCost wgdAssocCost);//多条件查询
+    WgdAssocCost selectOne(String id);//查询详情
+
+    int updateOne(WgdAssocCost wgdAssocCost);//编辑
+    int insertOne(WgdAssocCost wgdAssocCost);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] ids);//批量删除
+
+}
+

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java

@@ -0,0 +1,28 @@
+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;
+
+/**
+ * <p>
+ * 协会信息数据统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdAssocInfoDao extends BaseMapper<WgdAssocInfo> {
+    Integer getQueryTotal(WgdAssocInfo WgdAssocInfo);//总数
+    List<WgdAssocInfo> selectAll();//查询所有
+    List<WgdAssocInfo> queryAll(WgdAssocInfo wgdAssocInfo);//多条件查询
+    WgdAssocInfo selectOne(String id);//查询详情
+
+    int updateOne(WgdAssocInfo wgdAssocInfo);//编辑
+    int insertOne(WgdAssocInfo wgdAssocInfo);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java

@@ -0,0 +1,29 @@
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 委员信息数据统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdCommiInfoDao extends BaseMapper<WgdCommiInfo> {
+    Integer getQueryTotal(WgdCommiInfo WgdCommiInfo);//总数
+    List<WgdCommiInfo> selectAll();//查询所有
+    List<WgdCommiInfo> queryAll(WgdCommiInfo wgdCommiInfo);//多条件查询
+    WgdCommiInfo selectOne(String id);//查询详情
+
+    int updateOne(WgdCommiInfo wgdCommiInfo);//编辑
+    int insertOne(WgdCommiInfo wgdCommiInfo);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java

@@ -0,0 +1,29 @@
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 参与外部标准制修订费用统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdExReviseCostDao extends BaseMapper<WgdExReviseCost> {
+    Integer getQueryTotal(WgdExReviseCost WgdExReviseCost);//总数
+    List<WgdExReviseCost> selectAll();//查询所有
+    List<WgdExReviseCost> queryAll(WgdExReviseCost wgdExReviseCost);//多条件查询
+    WgdExReviseCost selectOne(String id);//查询详情
+
+    int updateOne(WgdExReviseCost wgdExReviseCost);//编辑
+    int insertOne(WgdExReviseCost wgdExReviseCost);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java

@@ -0,0 +1,29 @@
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 参会费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdMeetCostDao extends BaseMapper<WgdMeetCost> {
+    Integer getQueryTotal(WgdMeetCost WgdMeetCost);//总数
+    List<WgdMeetCost> selectAll();//查询所有
+    List<WgdMeetCost> queryAll(WgdMeetCost wgdMeetCost);//多条件查询
+    WgdMeetCost selectOne(String id);//查询详情
+
+    int updateOne(WgdMeetCost wgdMeetCost);//编辑
+    int insertOne(WgdMeetCost wgdMeetCost);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}

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

@@ -0,0 +1,49 @@
+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;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 协会费用信息统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdAssocCost对象", description="协会费用信息统计")
+public class WgdAssocCost extends BasePage {
+
+    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;
+
+
+}

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

@@ -0,0 +1,145 @@
+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;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 协会信息数据统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计")
+public class WgdAssocInfo extends BasePage {
+
+    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;
+
+
+}

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

@@ -0,0 +1,77 @@
+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;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 委员信息数据统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计")
+public class WgdCommiInfo extends BasePage {
+
+    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;
+
+
+}

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

@@ -0,0 +1,43 @@
+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;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 参与外部标准制修订费用统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计")
+public class WgdExReviseCost extends BasePage {
+
+    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;
+
+
+}

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

@@ -0,0 +1,50 @@
+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;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 参会费用信息统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdMeetCost对象", description="参会费用信息统计")
+public class WgdMeetCost extends BasePage {
+
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java

@@ -0,0 +1,28 @@
+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;
+
+/**
+ * <p>
+ * 协会费用信息统计 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface IWgdAssocCostService extends IService<WgdAssocCost> {
+    List<WgdAssocCost> getAllWgdAssocCosts(WgdAssocCost page);//查询所有
+    List<WgdAssocCost> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost);//多条件查询
+    WgdAssocCost getWgdAssocCostById(String id);//查询详情
+
+    int updateWgdAssocCost(WgdAssocCost wgdAssocCost);//编辑
+    int insertWgdAssocCost(WgdAssocCost wgdAssocCost);//插入
+    int deleteWgdAssocCost(String id);//删除
+    int deleteWgdAssocCosts(String ids);//批量删除
+}

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;
+
+/**
+ * <p>
+ * 协会信息数据统计 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface IWgdAssocInfoService extends IService<WgdAssocInfo> {
+    List<WgdAssocInfo> getAllWgdAssocInfos();//查询所有
+    List<WgdAssocInfo> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo);//多条件查询
+    WgdAssocInfo getWgdAssocInfoById(String id);//查询详情
+
+    int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//编辑
+    int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//插入
+    int deleteWgdAssocInfo(String id);//删除
+    int deleteWgdAssocInfos(String ids);//批量删除
+}