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

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

@@ -13,6 +13,7 @@ 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -32,6 +33,7 @@ import java.util.List;
  */
 @Component
 @EnableScheduling
+@Slf4j
 public class ProcessTimer {
 
     @Autowired
@@ -179,7 +181,7 @@ public class ProcessTimer {
                 busMes.setJson(jsonObject.toJSONString());
                 busMes.setUserId(jsonObject.getString("revisionId"));
                 Wrapper<String> wrapper=workFlowFeignClient.completeTaskByUserId(busMes);
-                System.out.println("dasda");
+                log.info("政策课题组会后流程已发起");
             }
         }
     }

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

@@ -28,6 +28,9 @@ public class ActDefineStartMap {
 
         // 政策入库
         map.put("laws1","lawsLibraryWkflow");
+        //政策征求意见, 认证重点法规/政策  流程
+        map.put("laws2","PolicyCommentProcessWorkFlow");
+        map.put("laws3","KCSTPReviewProcessWorkFlow");
 
         //张超然
         map.put("20","StandardApplyMeetProcess");

adc-da-activiti/src/main/java/com/adc/da/workFlow/common/ExportExcel.java

@@ -0,0 +1,99 @@
+package com.adc.da.workFlow.common;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import sun.awt.SunHints;
+
+
+import java.util.List;
+import java.util.Map;
+
+public class ExportExcel<T> {
+
+    private String header;
+
+    private static String[] property;
+    Workbook workbook=new XSSFWorkbook();
+
+    public void setProperty(String property){
+        this.property=property.split(",");
+    }
+
+    public void setHeader(String header){
+        this.header=header;
+    }
+
+    public Workbook getWorkBook(T dataJson) throws Exception {
+        JSONArray dataArray = JSONObject.parseArray(dataJson.toString());
+
+        CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+
+
+        Sheet sheet = workbook.createSheet();
+        sheet.setDefaultColumnWidth(25);
+
+        createHeader(sheet,header);
+
+        createData(sheet,dataArray);
+
+        return workbook;
+    }
+
+
+    public static void createHeader(Sheet sheet, String header){
+
+        Row rowHeader = sheet.createRow(0);//开始创建标题行
+        if (StringUtils.isNotBlank(header)) {
+            String[] headerArr = header.split(",");
+            for (int i=0;i < headerArr.length; i++) {
+
+                rowHeader.createCell(i).setCellValue(headerArr[i]);
+
+            }
+        }
+    }
+
+
+
+    public static void createData(Sheet sheet, List<?> data) throws Exception{
+
+        if (data != null && !data.isEmpty()) {
+            for (int i=0;i < data.size(); i++) {
+
+                Row row = sheet.createRow(i+1);
+
+                int sheetNum = 0;
+
+                JSONObject datumJson  =(JSONObject)data.get(i);
+                /**
+                 * 遍历jsonObject值填入一行的单元格中
+                 */
+                for (String s : property) {
+                    String value = datumJson.getString(s);
+                    row.createCell(sheetNum).setCellValue(value);
+                    sheetNum++;
+                }
+//                Class cls = importDto.getClass();
+//                Field[] fields = cls.getDeclaredFields();
+//                for (Field field : fields) {
+//                    field.setAccessible(true);
+//                    if (field.get(importDto)!=null){
+//                        String value = field.get(importDto).toString();
+//                        row.createCell(sheetNum).setCellValue(value);
+//                    }else {
+//                        row.createCell(sheetNum).setCellValue("");
+//                    }
+//                    sheetNum++;
+//                }
+            }
+        }
+    }
+
+
+
+
+}

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java

@@ -0,0 +1,69 @@
+package com.adc.da.workFlow.controller;
+
+import com.adc.da.common.ReadExcel;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.workFlow.common.ExportExcel;
+import com.adc.da.workFlow.service.PolicyWorkFlowService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+@RestController
+@RequestMapping("/${restPath}/policy/activiti")
+@Api(tags = "政策征求意见和重点法规或政策认证流程")
+public class PolicyWorkFlowController {
+
+
+    /**
+     * 政策征求意见导出
+     */
+    @PostMapping("/exportExcel")
+    @ApiOperation("导出政策征求意见为excel")
+    public void exportExcel(@RequestBody String dataJson, HttpServletResponse response, HttpServletRequest request) throws Exception {
+        JSONObject data = JSONObject.parseObject(dataJson);
+        JSONArray info = data.getJSONArray("dataList");
+
+
+        ExportExcel exportExcel = new ExportExcel();
+        exportExcel.setHeader("章节编号,章节名称,修改前,修改后,修改理由,原因,提出部门,提出人");
+        exportExcel.setProperty("chapterNumber,chapterName,oldText,newText,changeReason,reason,department,responUserName");
+        Workbook workbook=exportExcel.getWorkBook(info);
+
+
+        response.setContentType("application/vnd.ms-excel");
+        response.setHeader("Content-Disposition",
+                "attachment; filename=" +  ReadExcel.encodeFileName("政策征求意见"+".xlsx",request));
+//        response.setContentType("application/force-download");
+        ServletOutputStream outputStream = response.getOutputStream();
+        workbook.write(outputStream);
+        outputStream.flush();
+
+    }
+
+
+
+    @Autowired
+    private PolicyWorkFlowService policyWorkFlowService;
+
+    /**
+     * 政策征求意见导出
+     */
+    @PostMapping("/enterIssue")
+    @ApiOperation("纳入重点问题管控")
+    public ResponseMessage enterIssue(@RequestBody String json){
+        boolean result = policyWorkFlowService.enterIssue(json);
+
+        return Result.success(result);
+    }
+
+}

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -524,13 +524,22 @@ public class WorkFlowController {
                             map.put("flag","未完成");
                         }
                         if(map.get("comment")!=null && !map.get("comment").toString().equals("")){
-                            if(map.get("comment").toString().equals("0")){
-                                map.put("comment","同意");
-                            }else if(map.get("comment").toString().equals("1")){
-                                map.put("comment","不同意");
-                            }else{
-                                map.put("comment",map.get("commentText").toString());
+                            String comment = map.get("comment").toString();
+                            switch (comment){
+                                case "0":
+                                    map.put("comment","同意");
+                                    break;
+                                case "1":
+                                    map.put("comment","不同意");
+                                    break;
+                                default:
+                                    String commentText="";
+                                    map.put("comment",comment+map.get("commentText"));
                             }
+
+                        }else if (map.get("commentText")!=null && !"".equals(map.get("commentText"))){
+                            map.put("comment",map.get("commentText").toString());
+
                         }
                         ProcessDetailExport user = JSON.parseObject(JSON.toJSONString(map), ProcessDetailExport.class);
                         exportDatas.add(user);

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java

@@ -0,0 +1,45 @@
+package com.adc.da.workFlow.service;
+
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService;
+import com.adc.da.util.UUIDUtils;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class PolicyWorkFlowService  {
+
+    @Autowired
+    private IBusinessDeptIssueService businessDeptIssueService;
+
+
+    public boolean enterIssue(String json){
+        boolean count=false; //是否成功
+        JSONObject dataJsonObj = JSONObject.parseObject(json);
+
+        if ("1".equals(dataJsonObj.getString("department"))) {
+            JSONArray dataList = dataJsonObj.getJSONArray("dataList");
+
+            /**
+             * 把json对象转换未实体对象
+             */
+            List<BusinessDeptIssue> data = dataList
+                    .stream()
+                    .map(jsonObj -> {
+
+                        BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class);
+                        businessDeptIssue.setId(UUIDUtils.randomUUID20());
+                        return businessDeptIssue;
+                    }).collect(Collectors.toList());
+            count=businessDeptIssueService.saveBatch(data);
+
+        }
+
+        return count;
+    }
+}

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

@@ -53,7 +53,7 @@ public class WaterMarkUtil {
                 under.setGState(gs);
                 under.restoreState();
                 under.beginText();
-                under.setFontAndSize(base, 13);
+                under.setFontAndSize(base, 25);
                 under.setTextMatrix(30, 30);
                 under.setColorFill(BaseColor.LIGHT_GRAY);
                 for (int y = 0; y < 10; y++) {

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -40,6 +40,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     addInterceptor.excludePathPatterns("/api/person/userInfo/getByUserInfoCode");
     addInterceptor.excludePathPatterns("/api/att/attFile/upload");
     addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel");
+    addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel");
     //pcms项目数据下发开放接口
     addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save");
     addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save");
@@ -72,6 +73,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
     //OCR回调存储文件
     addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult");
 
+    addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/exportStandAttrInfoExcel");
+
 
 //    //测试接口使用
 //    addInterceptor.excludePathPatterns("/api/**");

adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java

@@ -21,7 +21,7 @@ public class IDMUtil {
     private final String app_secret = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe";
     private final String access_url = "http://sso.foton.com.cn/oauth2.0/accessTokenByJson";
     private final String profile_ur = "http://sso.foton.com.cn/oauth2.0/profileByJson";
-    private final String redirect_url = "https://slrs.foton.com.cn";
+    private final String redirect_url = "https://srms.foton.com.cn";
 
     public String idmLogin(String code){
         try{

adc-da-main/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
 #spring.datasource.url = jdbc:mysql://10.96.10.54/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
 spring.datasource.password = root

adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java

@@ -267,6 +267,7 @@ public class SeniorSearchInfoEO extends BasePage {
     private String lawsLabel;
     private String lawsRemark;
     private String CYSDLAWS;
+    private String NYLXCLASS;
 
 
 

adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java

@@ -7,7 +7,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
@@ -32,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -172,7 +175,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
             }else {
                 boolQueryBuilder.must(boolQueryShould);
             }
-            searchRequestBuilder.setQuery(boolQueryBuilder);
+            searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true);
             //在结果中检索
             if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword()) && StringUtils.isNotBlank(searchInfoEO.getIsHigh())) {
                 QueryBuilder multiQuery = queryInResult(searchInfoEO);
@@ -282,8 +285,12 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                 if (StringUtils.isNotBlank(searchInfoEO.getType())) {
                     boolQueryShould.must(QueryBuilders.wildcardQuery("type.keyword", "*"+searchInfoEO.getType()+"*"));
                 }
-                if (StringUtils.isNotBlank(searchInfoEO.getStandType())) {
-                    boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*"));
+                if (StringUtils.isNotBlank(searchInfoEO.getStandType()) && StringUtils.isNotBlank(searchInfoEO.getSelectIndex())) {
+                    if(searchInfoEO.getSelectIndex().equals("bussstand")){
+                        boolQueryShould.must(QueryBuilders.wildcardQuery("type.keyword", "*"+searchInfoEO.getStandType()+"*"));
+                    }else {
+                        boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*"));
+                    }
                 }
                 if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
                     boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*"));
@@ -310,7 +317,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                 boolQueryBuilder.must(multiQuery);
             }
 
-            searchRequestBuilder.setQuery(boolQueryBuilder);
+            searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true);
 
             // 获取查询到的结果
             result = countStandSearchResult(searchRequestBuilder,searchInfoEO);
@@ -386,6 +393,12 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                 collectAttrMap.put("CYSDLAWS",array);
             }
 
+            if(searchInfoEO.getNYLXCLASS() != null && StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){
+                List<String> fieldList = Arrays.asList(searchInfoEO.getNYLXCLASS() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
+                JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList));
+                collectAttrMap.put("NYLXCLASS",array);
+            }
+
         }
 
         List<String> fieldList = getStringField(searchInfoEO);
@@ -394,6 +407,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
             // 关键字查询属性字段
             String keyWordField = field + ".keyword";
             String keyWordField2 = field + "Name.keyword";
+            if(field.equals("NYLX")){
+                field = field+"CLASS";
+            }
             if(collectAttrMap.containsKey(field)){
                 List<String> fields = new ArrayList<>();
                 Object json= new JSONTokener(collectAttrMap.get(field).toString()).nextValue();
@@ -471,19 +487,32 @@ public class SearchCenterServiceImpl implements SearchCenterService {
 
     private List<String> getStringField(SeniorSearchInfoEO searchInfoEO) {
         String fieldInfo = InitStandAttrSearchUtil.queryField;
+        List<String> fieldTimeInfo = InitStandAttrSearchUtil.timeFieldList;
         String fieldLawsInfo = InitStandAttrSearchUtil.queryFieldLaws;
+        List<String> fieldLawsTimeInfo = InitStandAttrSearchUtil.timeFieldListLaws;
         String fieldBussInfo = InitStandAttrSearchUtil.queryFieldBuss;
+        List<String> fieldBussTimeInfo = InitStandAttrSearchUtil.timeFieldListBuss;
+        if(!fieldBussTimeInfo.isEmpty()){
+            fieldBussTimeInfo.add("FSRQBUSS");
+        }
         List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
         List<String> fieldLawsInfoList = Arrays.asList(fieldLawsInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
         List<String> fieldBussInfoList = Arrays.asList(fieldBussInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
         List<String> fieldList = new ArrayList<>();
         if(StringUtils.isNotBlank(searchInfoEO.getSelectIndex())){
+            fieldInfoList =  fieldInfoList.stream().filter(s -> !fieldTimeInfo.contains(s)).collect(Collectors.toList());
+            fieldLawsInfoList =  fieldLawsInfoList.stream().filter(s -> !fieldLawsTimeInfo.contains(s)).collect(Collectors.toList());
+            fieldBussInfoList =  fieldBussInfoList.stream().filter(s -> !fieldBussTimeInfo.contains(s)).collect(Collectors.toList());
             if(searchInfoEO.getSelectIndex().equals("stand")){
                 fieldList.addAll(fieldInfoList);
             }else if(searchInfoEO.getSelectIndex().equals("bussstand")){
                 fieldList.addAll(fieldBussInfoList);
             }else if(searchInfoEO.getSelectIndex().equals("laws")){
                 fieldList.addAll(fieldLawsInfoList);
+            }else if(searchInfoEO.getSelectIndex().equals("fulltextserch")){
+                fieldList.addAll(fieldInfoList);
+                fieldList.addAll(fieldBussInfoList);
+                fieldList.addAll(fieldLawsInfoList);
             }
         }
         return fieldList;
@@ -503,11 +532,11 @@ public class SearchCenterServiceImpl implements SearchCenterService {
             if(list.size() > 1){
                 BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder();
                 list.forEach(s -> {
-                    boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+s+" "+"*"));
+                    boolQueryBuilderShould.should(QueryBuilders.termQuery("standSort.keyword", s));
                 });
                 boolQueryBuilder.must(boolQueryBuilderShould);
             }else {
-                boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*"));
+                boolQueryBuilder.must(QueryBuilders.termQuery("standSort.keyword", searchInfoEO.getStandSort()));
             }
         }
         if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) {
@@ -670,7 +699,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
 
         // 高级搜索项，只针对标准
         if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
-            boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*"));
+            boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+"*"));
         }
         if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) {
             boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandCode()+"*"));
@@ -723,9 +752,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         List<String> fieldList = getStringField(searchInfoEO);
         List<String> fieldNameList = new ArrayList<>();
         String[] standStr = {"content","standSort","standNumber","standYear","stand_name","standEnName","standNatureName",
-                "textStatusName","isRelateAccessName","numbershow","standSystem"};
+                "textStatusName","isRelateAccessName","numbershow","standSystem","NYLXCLASS","CLLX"};
         String[] lawsStr = {"content","lawsType","lawsNumber","lawsName","lawsEnName","lawsNo","issueCompany","lawsTextState","lawsSyqy","lawsSycx","isRelateAccess","lawsYear","lawsNotisyncNum","lawsBulletin","lawsLabel","lawsRemark"};
-        String[] bussstandStr = {"content","standSort","stand_code","standYear","stand_name","standEnName","nameshow","standstateshow","numbershow","textStatusBuss"};
+        String[] bussstandStr = {"content","standSort","stand_code","standYear","stand_name","standEnName","nameshow","standstateshow","numbershow","textStatusBuss","NYLXCLASS","CLLX"};
          for (String field : fieldList) {
             // 关键字查询属性字段
             String keyWordField2 = field + "Name";
@@ -776,22 +805,29 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         // 循环统计各种类型数据
         String[] seniortype;
         if("stand".equals(searchInfoEO.getSelectIndex())) {
-            String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName"};
+            String[] seniortypeStand = {"standSort", "numbershow","statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName","NYLXCLASS"};
             seniortype = seniortypeStand.clone();
         } else if("laws".equals(searchInfoEO.getSelectIndex())){
             String[] seniortypeLaws = {"lawsSyqy","lawsSycx","CYSDLAWS"};
             seniortype = seniortypeLaws.clone();
         } else if ("bussstand".equals(searchInfoEO.getSelectIndex())) {
-            String[] seniortypeBuss = {"textStatusBuss","QCDW"};
+            String[] seniortypeBuss = {"standSort", "numbershow", "statecode","CLLX","textStatus","textStatusName","NYLXCLASS"};
             seniortype = seniortypeBuss.clone();
         } else {
             String[] seniortypeMsg = {"module"};
             seniortype = seniortypeMsg.clone();
         }
+        String standType = searchInfoEO.getStandType();
+        String[] standVerify = {"GB","GB/T","QC/T","JT","JB","GA","GJB","HJ"};
+        String[] standEnVerify = {"ECE","EU","EC","EEC","ISO","IEC","GTR","CFR",
+                "JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN","ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"};
+        String[] bussStandVerify = {"Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M","Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"};
+        List<String> list = new ArrayList<>();
+
         Map<String, Object> map = new HashMap<>();
         for (int i = 0; i < seniortype.length; i++) {
             //分组依靠关键字terms
-            TermsAggregationBuilder aggregationBuilders = AggregationBuilders.terms("by_" + seniortype[i]).field(seniortype[i] + ".keyword").size(1000);
+            TermsAggregationBuilder aggregationBuilders = AggregationBuilders.terms("by_" + seniortype[i]).field(seniortype[i] + ".keyword").size(100000);
             searchRequestBuilder.addAggregation(aggregationBuilders);
         }
         // 获取查询到的结果
@@ -799,51 +835,100 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         result = SearchResponseToList(response);
         searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value);
         Map<String, Aggregation>  aggmap = response.getAggregations().asMap();
-        if (!result.isEmpty()) {
-            for (int i = 0; i < seniortype.length; i++) {
-                //分组后得到的数据整合
-                Object results =  aggmap.get("by_" + seniortype[i]);
-                if(results instanceof StringTerms){
-                    StringTerms stResult = (StringTerms) results;
-                    Map<String, Object> submap = new HashMap<>();
-                    for (StringTerms.Bucket bucket : stResult.getBuckets()) {
-                        // 多选处理，当前全部允许多选
-                        String keyname = bucket.getKeyAsString();
-                        String[] keynamelist = keyname.split(",");
-                        // 对于属性允许多选，此处做出处理
-                        if(keynamelist.length>0){
-                            for (String itemkeyname: keynamelist){
-                                // put 之前判断是否已存在该key ,如果不存在，直接放入值，如果存在，需要进行一个累加
-                                if(submap.containsKey(itemkeyname)){
-                                    submap.put(itemkeyname.trim(), (long)submap.get(itemkeyname)+ bucket.getDocCount());
+
+        if(StringUtils.isNotBlank(standType)){
+            if(standType.equals("INLAND")){
+                list = Stream.of(standVerify).collect(Collectors.toList());
+            }else if(standType.equals("bussstand")){
+                list = Stream.of(bussStandVerify).collect(Collectors.toList());
+            }else if(standType.equals("FOREIGN")){
+                list = Stream.of(standEnVerify).collect(Collectors.toList());
+            }
+            if (!result.isEmpty()) {
+                for (int i = 0; i < seniortype.length; i++) {
+                    //分组后得到的数据整合
+                    Object results =  aggmap.get("by_" + seniortype[i]);
+                    if(results instanceof StringTerms){
+                        StringTerms stResult = (StringTerms) results;
+                        Map<String, Object> submap = new HashMap<>();
+                        for (StringTerms.Bucket bucket : stResult.getBuckets()) {
+                            // 多选处理，当前全部允许多选
+                            String keyName = bucket.getKeyAsString();
+                            String[] keyNameList = keyName.split(",");
+                            // 对于属性允许多选，此处做出处理
+                            if(keyNameList.length>0){
+                                for (String itemKeyName: keyNameList){
+                                    // put 之前判断是否已存在该key ,如果不存在，直接放入值，如果存在，需要进行一个累加
+                                    keyNameFilter(standType, list, submap, bucket, itemKeyName);
                                 }
-                                else {
-                                    submap.put(itemkeyname.trim(), bucket.getDocCount());
-                                }
-                            }
-                        }
-                        else {
-                            if(submap.containsKey(keyname)){
-                                submap.put(keyname.trim(), (long)submap.get(keyname)+ bucket.getDocCount());
                             }
                             else {
-                                submap.put(keyname.trim(), bucket.getDocCount());
+                                keyNameFilter(standType, list, submap, bucket, keyName);
                             }
                         }
+                        map.put(seniortype[i], submap);
+                    }
+                    else{
+                        Map<String, Object> submap = new HashMap<>();
+                        map.put(seniortype[i], submap);
                     }
-                    map.put(seniortype[i], submap);
-                }
-                else{
-                    Map<String, Object> submap = new HashMap<>();
-                    map.put(seniortype[i], submap);
-                }
 
+                }
+                if(standType.equals("bussstand")){
+                    map.forEach((s, o) -> {
+                        if(s.equals("numbershow")){
+                            map.put("standSort",o);
+                        }
+                    });
+                }
+                result.get(0).put("groupdata", map);
             }
-            result.get(0).put("groupdata", map);
         }
         return result;
     }
 
+    public static Map<String, Object> objectToMap(Object obj){
+        if(obj == null){
+            return null;
+        }
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        Field[] declaredFields = obj.getClass().getDeclaredFields();
+        try {
+            for (Field field : declaredFields) {
+                field.setAccessible(true);
+                map.put(field.getName(), field.get(obj));
+            }
+        }catch (Exception e){
+            e.getMessage();
+        }
+
+        return map;
+    }
+
+    private void keyNameFilter(String standType, List<String> list, Map<String, Object> submap, StringTerms.Bucket bucket, String keyname) {
+        if(standType.equals("bussstand")){
+            if(!list.isEmpty()){
+                String finalKeyName = keyname;
+                List<String> list1 = list.stream().filter(string-> (finalKeyName.contains(string))).collect(Collectors.toList());
+                if(!list1.isEmpty()){
+                    if(submap.containsKey(list1.get(0))){
+                        submap.put(list1.get(0).trim(), (long)submap.get(list1.get(0).trim())+ bucket.getDocCount());
+                    }else {
+                        submap.put(list1.get(0).trim(), bucket.getDocCount());
+                    }
+                }
+            }
+        }else {
+            if(submap.containsKey(keyname)){
+                submap.put(keyname.trim(), (long)submap.get(keyname)+ bucket.getDocCount());
+            }else {
+                submap.put(keyname.trim(), bucket.getDocCount());
+            }
+        }
+    }
+
     @Override
     public  List<Map<String, Object>> SearchResponseToList(SearchResponse searchResponse) {
         List<Map<String, Object>> sourceList = new ArrayList<Map<String, Object>>();
@@ -1091,6 +1176,17 @@ public class SearchCenterServiceImpl implements SearchCenterService {
             QueryBuilder multiQuery = queryInResult(searchInfoEO);
             boolQueryBuilder.must(multiQuery);
         }
+
+        if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){
+            boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(),
+                    "textContent"
+            ).minimumShouldMatch("100%").field("title",10f));
+        }else if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){
+            boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(),
+                    "textContent"
+            ).minimumShouldMatch("100%").field("title",10f));
+        }
+
         HighlightBuilder hiBuilder=new HighlightBuilder();
         HighlightBuilder.Field highlightTitle = new HighlightBuilder.Field("title");
         hiBuilder.field(highlightTitle);
@@ -1110,7 +1206,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
 
        // boolQueryBuilder.must(QueryBuilders.matchQuery("valid_flag", 0));
 //        boolQueryBuilder.should(boolQueryBuilderShould);
-        searchRequestBuilder.setQuery(boolQueryBuilder);
+        searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true);
         // 获取查询到的结果
         SearchResponse response = searchRequestBuilder.get();
         for (SearchHit searchHit : response.getHits().getHits()) {

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

@@ -23,6 +23,7 @@ public class ExclExport extends ExclErrorOut {
             for (Map.Entry<String,  List<ImportDto>> entry : dataMap.entrySet()) {
                 List<ImportDto> datas = entry.getValue();
                 Sheet sheet = workbook.createSheet(entry.getKey());
+                sheet.setDefaultColumnWidth(25);
                 super.createHeader(workbook,sheet,header);
                 super.createDatas(workbook,sheet,datas);
 

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

@@ -52,13 +52,15 @@ public class ImportExcelController extends BaseController<ImportDto> {
         /**
          * 导入系统
          */
-       List<ImportDto> errorList = importExcelService.storageExclData(mapMap);
+//       List<ImportDto> errorList = importExcelService.storageExclData(mapMap);
 //       mapMap.put("导入后的信息",errorList);
 //        List<ImportDto> guonei= mapMap.get("GNBZ");
 //        List<ImportDto> haiwai = mapMap.get("HWBZ");
 //        List<ImportDto> qibiao = mapMap.get("QYBZ");
 
 
+
+
         /**
          * 生成错误表格
          */
@@ -94,4 +96,47 @@ public class ImportExcelController extends BaseController<ImportDto> {
 
     }
 
+
+    @ApiOperation("从excl中导入标准信息")
+    @PostMapping("/analysisExcl")
+    public void analysisExcl(MultipartFile exclFile,MultipartFile standSort, HttpServletResponse response, HttpServletRequest request) throws IOException {
+        /**
+         * 分解数据
+         */
+        String headStr="标准号,标准类别,内容,标准名称,英文名称,发布时间,实施时间,标准状态,代替标准号,//,//";
+        Map<String, List<ImportDto>> stringListMap = importExcelService.analysisExcl(exclFile,standSort);
+
+
+
+        /**
+         * 生成错误表格
+         */
+        OutputStream os = null;
+        Workbook workbook = null;
+        try {
+
+            String exportName="错误表格";
+            response.setHeader("Content-Disposition",
+                    "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request));
+            response.setContentType("application/force-download");
+            //导出数据
+//            workbook = exclErrorOut.exportDatas(guonei,headStr);
+
+            ExclExport exclExport = new ExclExport();
+            workbook = exclExport.exportData(stringListMap, headStr);
+
+            os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+        } catch (IOException e) {
+            throw new AdcDaBaseException("下载文件失败，请重试");
+        } finally {
+            IOUtils.closeQuietly(os);
+            if (workbook != null) {
+                workbook.close();
+            }
+        }
+    }
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/entity/ImportDto.java

@@ -8,6 +8,10 @@ public class ImportDto extends BaseEntity {
 
 //    标准号
     private String standId;
+//标准类别
+    private String standSort;
+    //
+    private String standIdExcludeSort;
 //    标准名称
     private String standName;
 //    英文名称

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

@@ -14,4 +14,5 @@ public interface ImportExcelService extends IService<ImportDto>  {
 
     public List<ImportDto> storageExclData(Map<String, List<ImportDto>> importListMap);
 
+    public Map<String,List<ImportDto>> analysisExcl(MultipartFile exclFile,MultipartFile standSort);
 }

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

@@ -31,6 +31,7 @@ import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Service
 public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDto> implements ImportExcelService {
@@ -51,9 +52,10 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 //    private SarBussionessStandServiceImpl sarBussionessStandService;
 
 
-    /**
-     * 标准类别
-     */
+
+
+
+
     private final static String GN = "GB,GB/T,QC/T,GJB,JB,JT,HG,YV,SY,SH,GA,HJ,QB,JG,NB,JC,YS/T,FZ/T,TB/T,JJG,SJ/T,T/TBPS" +
             ",NB/T,CJ/T,YS/T,SJ/T,BB/T,SN/T,SB/T,MH/T,DB11,SZDB/Z,HKG,T/ZSA,CSAE,T/CAS,T/CADA,T/CHTS,T/ITS,T/BJQC";
     private final static String QB = "Q/QCBFC,Q/FT,Q/FL,Q/QCFLC,Q/BQB,Q/SGT," +
@@ -205,23 +207,34 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
     //赋值方法
     private ImportDto getImportDto(String[] as) {
         ImportDto importDto = new ImportDto();
-        if (as.length == 8) {
+        String content = as[0];
+        int length = as.length;
+        if (length>6){
+
+            for (String s : sortList) {
+                int sortLength = s.length();//标准类别长度
+                if (s.equals(content.substring(0,sortLength ))){
+                    importDto.setStandSort(s);
+                    importDto.setStandIdExcludeSort(content.substring(sortLength));
+                }
+
+            }
+
+
             importDto.setStandId(null != as[0] ? as[0].trim() : "");
             importDto.setStandName(null != as[1] ? as[1].trim() : "");
             importDto.setStandNameEN(null != as[2] ? as[2].trim() : "");
             importDto.setPublishTime(null != as[3] ? as[3].trim() : "");
             importDto.setImplementedTime(null != as[4] ? as[4].trim() : "");
             importDto.setStandStatus(null != as[5] ? as[5].trim() : "");
-            importDto.setReplaceId(null != as[6] ? as[6].trim() : "");
-        } else if (as.length == 7) {
-            importDto.setStandId(null != as[0] ? as[0].trim() : "");
-            importDto.setStandName(null != as[1] ? as[1].trim() : "");
-            importDto.setStandNameEN(null != as[2] ? as[2].trim() : "");
-            importDto.setPublishTime(null != as[3] ? as[3].trim() : "");
-            importDto.setImplementedTime(null != as[4] ? as[4].trim() : "");
-            importDto.setStandStatus(null != as[5] ? as[5].trim() : "");
-            importDto.setReplaceId("");
+            if (length==7){
+                importDto.setReplaceId("");
+            }else if (length==8){
+                importDto.setReplaceId(null != as[6] ? as[6].trim() : "");
+            }
+
         }
+
         return importDto;
     }
 
@@ -241,7 +254,6 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
                 for (int j = 0; j <= lastNum; j++) {
                     HSSFRow row = sheet.getRow(j);
                     if (null != row) {
-                        System.out.println("正在读取第"+j+"行...");
                         strings.add(row.getCell(0).getStringCellValue());
                     }
                 }
@@ -532,6 +544,60 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         return error;
     }
 
+    private List<String> sortList=new LinkedList<>();
+
+    @Override
+    public Map<String,List<ImportDto>> analysisExcl(MultipartFile exclFile,MultipartFile standSort) {
+        //TODO analy
+
+        if (exclFile == null || exclFile.getSize() == 0) {
+            log.error("文件上传错误，重新上传");
+        }
+        String filename = exclFile.getOriginalFilename();
+        String standSortName=standSort.getOriginalFilename();
+
+        List<String> datas = new ArrayList<>();
+
+
+        if (filename.endsWith(".xls")) {
+            datas = isXls(exclFile);
+        } else {
+            datas = isXlsx(exclFile);
+        }
+
+        if (standSortName.endsWith(".xls")){
+            sortList = isXls(standSort);
+        }else {
+            sortList = isXlsx(standSort);
+        }
+
+        HashMap<String, List<ImportDto>> result = new HashMap<>();
+        LinkedList<ImportDto> exportList = new LinkedList<>();
+        HashSet<String> distinct = new HashSet<>();
+        datas.forEach(data->{
+            System.out.print("#");
+            String[] row = data.split("\\,");
+            if (row.length>7){
+
+                if ((!"".equals(row[0].trim()) || !"".equals(row[1].trim()))&&distinct.add(row[0].trim()+row[1].trim())){
+                    ImportDto importDto = getImportDto(row);
+
+                    if(importDto.getStandId()!=null&&importDto.getStandName()!=null){
+                        exportList.add(importDto);
+
+                    }
+                }
+
+            }
+
+        });
+        result.put("标准数据all_new",exportList);
+
+
+
+        return result;
+    }
+
 
     /**
      * 整理为标准信息实体

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

@@ -220,7 +220,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
             if (StringUtils.isNotBlank(sarBussionessStandEO.getStandYear())) {
                 number += "-" + sarBussionessStandEO.getStandYear();
             }
-            String content = "新增" + number + " 《" + sarBussionessStandEO.getStandName() + "》";
+            String content = "入库" + number + " 《" + sarBussionessStandEO.getStandName() + "》";
             sarUpdLogEOService.createBaseLog(sarBussionessStandEO.getId(),"BUSINESS",content);
             if(elasflag) {
                 attrInfoShowSearchDetails(sarBussionessStandEO,"add");
@@ -279,7 +279,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
             page.setUserId(LoginUserUtil.getUserId());
         }
         List<SarBussionessStand> getList = sarBussionessStandEODao.getSarBussionessStand(page);
-        attrInfoShow(getList);
+        attrInfoShowExport(getList);
         return getList;
     }
 
@@ -332,6 +332,55 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         }
     }
 
+    public void attrInfoShowExport (List<SarBussionessStand> sarlist) throws Exception {
+        for(SarBussionessStand row : sarlist){
+            attrInfoDetailsExport(row);
+            Map<String, Object> getAttrMap = row.getAttrInfoMap();
+            Map<String, Object> getNewMap = new LinkedHashMap<>();
+            if (getAttrMap != null && getAttrMap.size() > 0) {
+                String svppsTip = "";
+                for (Map.Entry<String,Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    String value = "";
+                    if ("SVPPS".equals(name)) {
+                        Object svpps = entry.getValue();
+                        if (svpps != null && StringUtils.isNotBlank(svpps.toString())) {
+                            svppsTip = svpps.toString();
+                        }
+                        if (StringUtils.isNotBlank(svppsTip)) {
+                            svppsTip = sysInfoEOService.getSvppsNamesTipByIds(svppsTip);
+                        }
+                        value = String.valueOf(getAttrMap.get("SVPPSName"));
+                        entry.setValue(value);
+                    } else if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && InitStandAttrUtil.fileFieldListBuss.size() > 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) {
+                        value = entry.getValue().toString();
+                        if (StringUtils.isNotBlank(value)) {
+                            List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
+                            entry.setValue(fileObj);
+                        }
+                    } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
+                        value = entry.getValue().toString();
+                        String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name);
+                        if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) {
+                            if("ZYQCR".equals(name)||"QTQCR".equals(name)){
+                                if(getAttrMap.get(name + "Name")!=null && !getAttrMap.get(name + "Name").equals("")){
+                                    value = String.valueOf(getAttrMap.get(name + "Name"));
+                                }
+                            }else{
+                                value = String.valueOf(getAttrMap.get(name + "Name"));
+                            }
+                        } else {
+                            List<String> valArr = Arrays.asList(value.split(","));
+                            value = dicTypeEODao.getDicNamesByCodes(valArr);
+                        }
+                        entry.setValue(value);
+                    }
+                }
+                getAttrMap.put("SVPPSTips",svppsTip);
+            }
+        }
+    }
+
     public SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception {
         String standId = sarBussionessStandEO.getId();
         SarBussionessStand beforeStandEO = this.baseMapper.selectByPrimaryKey(standId);
@@ -991,6 +1040,54 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         }
     }
 
+    public void attrInfoDetailsExport (SarBussionessStand row) throws Exception {
+        String fieldInfo = InitStandAttrUtil.queryFieldBuss;
+        // 查询属性表数据
+        if (StringUtils.isNotBlank(fieldInfo)) {
+            Map<String, Object> getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId());
+            if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) {
+                // 遍历修改所有clob类型的值
+                for (String clobField : InitStandAttrUtil.clobFieldListBuss) {
+                    Clob clobValue = (Clob) getAttrMap.get(clobField);
+                    String fieldValue = FieldConvertUtil.ClobToString(clobValue);
+                    getAttrMap.put(clobField,fieldValue);
+                }
+            }
+            // 组织机构和人员
+            Map<String,Object> newMap = new HashMap<>();
+            if(getAttrMap != null){
+                for (Map.Entry<String,Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    Object value1 = entry.getValue();
+                    if (value1 != null && value1.toString().equals("\"null\"")){
+                        entry.setValue("");
+                    }
+                    if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
+                        String value = entry.getValue().toString();
+                        String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name);
+                        if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getOrgNamesByIds(value);
+                            newMap.put(name + "Name",value);
+                        } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getUserNamesByIds(value);
+                            newMap.put(name + "Name",value);
+                        } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getRoleNamesByIds(value);
+                            newMap.put(name + "Name",value);
+                        }
+                    }
+                }
+                getAttrMap.putAll(newMap);
+            }
+
+            if (getAttrMap != null && !getAttrMap.isEmpty()) {
+                row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
+            }
+
+            row.setAttrInfoMap(getAttrMap);
+        }
+    }
+
 
 
     @Override

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -82,8 +82,8 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
 
     @ApiOperation("获得下一级的部门和人员")
     @GetMapping("/getNext")
-    public List<TsInstitution> getNext(String institutionId){
-        return tsInstitutionService.getNext(institutionId);
+    public List<TsInstitution> getNext(String institutionId,String userName){
+        return tsInstitutionService.getNext(institutionId,userName);
     }
 
     @ApiOperation("获得第一级部门目录")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java

@@ -27,7 +27,7 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      * 根据部门id查询此部门的子一级人员
      * @return
      */
-    List<TsInstitution> selectNextUser(String institutionId);
+    List<TsInstitution> selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName);
 
 
     List<TsInstitution> selectTreeByIds(@Param("rootIds") List<String> rootIds);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java

@@ -35,7 +35,7 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
      * @param institutionId
      * @return
      */
-    public List<TsInstitution> getNext(String institutionId);
+    public List<TsInstitution> getNext(String institutionId,String userName);
 
     /**
      * 获得第一级的部门

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -204,9 +204,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
      * 通过部门id获得这个部门下的下一级部门
      * @return
      */
-    public List<TsInstitution> getNext(String institutionId){
+    public List<TsInstitution> getNext(String institutionId,String userName){
         List<TsInstitution> tsInstitutions = tsInstitutionDao.selectNextInstitution(institutionId);
-        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUser(institutionId);
+        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUser(institutionId,userName);
 
 
         for(TsInstitution tsInstitution:tsInstitutions){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java

@@ -31,7 +31,7 @@ import java.util.List;
 */
 @RestController
 @Api(description = "|SarLawsMenu|")
-@RequestMapping("/sarLawsMenu/sar-laws-menu")
+@RequestMapping("/${restPath}/lawss/sarLawsMenu")
 public class SarLawsMenuController extends BaseController<SarLawsMenu> {
 
     @Autowired
@@ -63,7 +63,7 @@ public class SarLawsMenuController extends BaseController<SarLawsMenu> {
                 if (getList == null || getList.isEmpty()) {
                     // 查询根节点
                     TsResource sarMenuEO = new TsResource();
-                    sarMenuEO.setSorDivide("BUSINESS_STAND");
+                    sarMenuEO.setSorDivide("LAWS_STAND");
                     List<TsResource> getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO);
                     menuEO.setMenuId(getRootMenu.get(0).getId());
                     menuEO.setId(UUIDUtils.randomUUID20());

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

@@ -127,6 +127,63 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+    @ApiOperation(value = "|SarLawsInfoEO|分页查询")
+    @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 (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+            String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_LAWS_ATTR_INFO");
+            if (StringUtils.isNotBlank(advanceStr)) {
+                page.setAdvanceSearchStr(advanceStr);
+            } else {
+                page.setAdvanceSearchStr(null);
+            }
+        }
+
+        List<SarLawsStandInfo> rows = sarLawsInfoEOService.getSarStandardsInfoPageBak(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
     @ApiOperation(value = "|SarLawsStandInfo|详情")
     @GetMapping("/getStandInfoById")
     //@RequiresPermissions("lawss:sarStandardsInfo:get")

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

@@ -230,6 +230,27 @@ public class SarLawsStandInfoPage extends BasePage {
     private String GLWJBUSS;
     private String XCSJBUSS;
 
+    private String SSRQLAWS;
+    private String XCXSSRQLAWS;
+    private String ZCXSSRQLAWS;
+    private String ZCWBLAWS;
+    private String GCWBLAWS;
+    private String JDWJLAWS;
+    private String FBJGLAWS;
+    private String CYSDLAWS;
+    private String TGRLAWS;
+    private String TGDWLAWS;
+    private String NYLXLAWS;
+    private String YYRZLAWS;
+    private String ZRBMLAWS;
+    private String ZRGCSLAWS;
+    private String DTWJHLAWS;
+    private String BDTWJHLAWS;
+    private String YYBZZCLAWS;
+    private String CHJLLAWS;
+    private String GLWJLAWS;
+
+
     //页面排序
     private String paixu;
     private String shunxu;

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

@@ -36,6 +36,8 @@ public interface ISarLawsStandInfoService extends IService<SarLawsStandInfo> {
 
     List<SarLawsStandInfo> getSarStandardsInfoPage(SarLawsStandInfoPage page) throws Exception;
 
+    List<SarLawsStandInfo> getSarStandardsInfoPageBak(SarLawsStandInfoPage page) throws Exception;
+
     SarLawsStandInfo selectStandardsInfoByKey(String id) throws Exception;
 
     SarLawsStandInfo selectStandardsInfoUpdateByKey(String id) throws Exception;

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

@@ -157,7 +157,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
                 } else {
                     page.setMenuRoleList(null);
                 }
-                List<String> ids = iTsResourceService.getChildMenuList(userId);
+                List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
                 if (ids != null && !ids.isEmpty()) {
                     page.setMenuAllChildrenIdList(ids);
                 }
@@ -170,6 +170,36 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
         return rows;
     }
 
+    @Override
+    public List<SarLawsStandInfo> getSarStandardsInfoPageBak(SarLawsStandInfoPage page) throws Exception {
+        //查询当前登录人角色拥有权限的菜单
+        String userId = UserUtils.getUserId();
+        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(userId)){
+            QueryWrapper<TsResource> qw = new QueryWrapper<>();
+            qw.eq("ID",page.getMenuId());
+            qw.isNull("PARENT_ID");
+            List<TsResource> children = iTsResourceService.list(qw);
+            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+                List<String> getMenuIdList = tsUserService.getResourceUserId(userId);
+                if (!getMenuIdList.isEmpty()) {
+                    page.setMenuRoleList(getMenuIdList);
+                } else {
+                    page.setMenuRoleList(null);
+                }
+                List<String> ids = iTsResourceService.getChildMenuList(userId);
+                if (ids != null && !ids.isEmpty()) {
+                    page.setMenuAllChildrenIdList(ids);
+                }
+            }
+        }
+        Integer rowCount = this.baseMapper.getSarStandardsInfoCount(page);
+        page.getPager().setRowCount(rowCount);
+        List<SarLawsStandInfo> rows = this.baseMapper.getSarStandardsInfoPage(page);
+        attrInfo(rows);
+        return rows;
+    }
+
+
     /***
      * @Description: 处理属性表数据
      * @Param: [sarlist]
@@ -268,6 +298,54 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
         }
     }
 
+    public void attrInfoDetailsExport (SarLawsStandInfo row) throws Exception {
+        String fieldInfo = InitStandAttrUtil.queryFieldLaws;
+        // 查询属性表数据
+        if (StringUtils.isNotBlank(fieldInfo)) {
+            Map<String, Object> getAttrMap = sarLawsAttrInfoDao.selectLawsFieldAndData(fieldInfo,row.getId());
+            if (InitStandAttrUtil.clobFieldListLaws != null && !InitStandAttrUtil.clobFieldListLaws.isEmpty()) {
+                // 遍历修改所有clob类型的值
+                for (String clobField : InitStandAttrUtil.clobFieldListLaws) {
+                    Clob clobValue = (Clob) getAttrMap.get(clobField);
+                    String fieldValue = FieldConvertUtil.ClobToString(clobValue);
+                    getAttrMap.put(clobField,fieldValue);
+                }
+            }
+            // 组织机构和人员
+            Map<String,Object> newMap = new HashMap<>();
+            if(getAttrMap != null){
+                for (Map.Entry<String,Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    Object value1 = entry.getValue();
+                    if (value1 != null && value1.toString().equals("\"null\"")){
+                        entry.setValue("");
+                    }
+                    if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) {
+                        String value = entry.getValue().toString();
+                        String selVal = InitStandAttrUtil.selectFieldMapLaws.get(name);
+                        if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getOrgNamesByIds(value);
+                            newMap.put(name + "Name",value);
+                        } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getUserNamesByIds(value);
+                            newMap.put(name + "Name",value);
+                        } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getRoleNamesByIds(value);
+                            newMap.put(name + "Name",value);
+                        }
+                    }
+                }
+                getAttrMap.putAll(newMap);
+            }
+
+            if (getAttrMap != null && !getAttrMap.isEmpty()) {
+                row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
+            }
+
+            row.setAttrInfoMap(getAttrMap);
+        }
+    }
+
     private Map<String, Object> transformUpperCase(Map<String, Object> orgMap) {
         Map<String, Object> resultMap = new HashMap<>();
 
@@ -352,14 +430,14 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
                 }
             }
         }
-        page.setOrderBy("SAR_LAWS_ATTR_INFO.issue_time is null,SAR_LAWS_ATTR_INFO.issue_time desc,SAR_LAWS_ATTR_INFO.id");
+//        page.setOrderBy("SAR_LAWS_ATTR_INFO.issue_time is null,SAR_LAWS_ATTR_INFO.issue_time desc,SAR_LAWS_ATTR_INFO.id");
         if(userId != null){
             page.setUserId(userId);
         }else {
             page.setUserId(LoginUserUtil.getUserId());
         }
         List<SarLawsStandInfo> rows = this.baseMapper.getSarStandardsExportInfo(page);
-        attrInfoShow(rows);
+        attrInfoShowExport(rows);
         return rows;
     }
 
@@ -402,6 +480,45 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
         }
     }
 
+    public void attrInfoShowExport (List<SarLawsStandInfo> sarlist) throws Exception {
+        for(SarLawsStandInfo row : sarlist){
+            attrInfoDetailsExport(row);
+            Map<String, Object> getAttrMap = row.getAttrInfoMap();
+            Map<String, Object> getNewMap = new LinkedHashMap<>();
+            if (getAttrMap != null && getAttrMap.size() > 0) {
+                String svppsTip = "";
+                for (Map.Entry<String,Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    String value = "";
+                   if (entry.getValue() != null && InitStandAttrUtil.fileFieldListLaws != null && InitStandAttrUtil.fileFieldListLaws.size() > 0 && InitStandAttrUtil.fileFieldListLaws.contains(name)) {
+                        value = entry.getValue().toString();
+                        if (StringUtils.isNotBlank(value)) {
+                            List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
+                            entry.setValue(fileObj);
+                        }
+                    } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) {
+                        value = entry.getValue().toString();
+                        String selVal = InitStandAttrUtil.selectFieldMapLaws.get(name);
+                        if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) {
+                            if("ZYQCR".equals(name)||"QTQCR".equals(name)){
+                                if(getAttrMap.get(name + "Name")!=null && !getAttrMap.get(name + "Name").equals("")){
+                                    value = String.valueOf(getAttrMap.get(name + "Name"));
+                                }
+                            }else{
+                                value = String.valueOf(getAttrMap.get(name + "Name"));
+                            }
+                        } else {
+                            List<String> valArr = Arrays.asList(value.split(","));
+                            value = dicTypeEODao.getDicNamesByCodes(valArr);
+                        }
+                        entry.setValue(value);
+                    }
+                }
+                getAttrMap.put("SVPPSTips",svppsTip);
+            }
+        }
+    }
+
     @Override
     public SarLawsStandInfoPage updateStandardsMenu(SarLawsStandInfoPage standardsInfoEO) {
         SarLawsMenu sarStandMenuEO = new SarLawsMenu();
@@ -477,6 +594,8 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
             createStandAttrInfo(sarLawsStandInfo);
             // 根据代替标准号 ，修改代替标准号标准中的，被代替标准号
 //            updateReplaceConnect(sarLawsStandInfo);
+            updateCiteStand(sarLawsStandInfo, null, "DTWJHLAWS", "BDTWJHLAWS");
+
             //修改收藏分享编号名称
             updateCollectAndShare(sarLawsStandInfo);
             // 记录修改日志
@@ -856,7 +975,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
             if (StringUtils.isNotBlank(sarLawsStandInfo.getLawsNumber())) {
                 number = sarLawsStandInfo.getLawsNumber();
             }
-            String content = "新增" + number + " 《" + sarLawsStandInfo.getLawsName() + "》";
+            String content = "入库" + number + " 《" + sarLawsStandInfo.getLawsName() + "》";
             sarUpdLogEOService.createBaseLog(sarLawsStandInfo.getId(), sarLawsStandInfo.getLawsType() + "_Laws", content);
             if(elasflag) {
                 // 消息队列

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java

@@ -61,6 +61,13 @@ public class TsResourceController extends BaseController<TsResource> {
         return Result.success(tsResources);
     }
 
+    @ApiOperation("查询有权限资源")
+    @GetMapping("/getListStand")
+    public ResponseMessage<List<TsResource>> getListStand(TsResource tsResource){
+        List<TsResource> tsResources=tsResourceService.getListStand(tsResource);
+        return Result.success(tsResources);
+    }
+
 //    @ApiOperation("查询所有资源")
 //    @GetMapping("/getDefault")
 //    public ResponseMessage<List<TsResource>> getDefault(){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarResource.dao;
 
 import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 import java.util.HashMap;
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
  * @author zyl
  * @since 2021-06-30
  */
+@Repository
 public interface TsResourceDao extends BaseMapper<TsResource> {
 
     List<TsResource> queryMenuByDis(TsResource sarMenuEO);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java

@@ -36,6 +36,8 @@ public interface ITsResourceService extends IService<TsResource> {
 
     List<TsResource> getList(TsResource tsResource);
 
+    List<TsResource> getListStand(TsResource tsResource);
+
     List<String> getDefaultByName();
 
     ResponseMessage<Object> addResource(TsResource tsResource);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java

@@ -151,6 +151,10 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
             tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide());
         }
         tsResourceQueryWrapper.isNull("PARENT_ID");
+        List<String> list = new ArrayList<>();
+        list.add("INLAND_STAND");
+        list.add("FOREIGN_STAND");
+        tsResourceQueryWrapper.notIn("SOR_DIVIDE",list);
         tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
         List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
         for(TsResource TsResource:TsResources){
@@ -181,7 +185,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
                 TsResources=dao.selectList(tsResourceQueryWrapper);
 
                 for(TsResource TsResource:TsResources){
-                    TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList)));
+                    TsResource.setChildren(recursionGetListChildren((tsResource.getSorDivide()),(TsResource),(getMenuIdList)));
                 }
             }
         }
@@ -189,6 +193,29 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
         return TsResources;
     }
 
+    /**
+     * 查询有权限菜单
+     * @param tsResource
+     */
+    @Override
+    public List<TsResource> getListStand(TsResource tsResource) {
+        List<TsResource> TsResources = new ArrayList<>();
+
+        QueryWrapper<TsResource> queryWrapper =new QueryWrapper<>();
+        if(tsResource.getSorDivide()!=null){
+            queryWrapper.eq("sor_divide",tsResource.getSorDivide());
+        }
+        queryWrapper.isNull("PARENT_ID");
+        queryWrapper.orderByAsc("DISPLAY_SEQ");
+        TsResources=dao.selectList(queryWrapper);
+
+        for(TsResource TsResource:TsResources){
+            TsResource.setChildren(recursionGetListChildrenStand((tsResource.getSorDivide()),(TsResource)));
+        }
+
+        return TsResources;
+    }
+
     @Override
     public List<String> getDefaultByName() {
         List<String> menusNames=new ArrayList<>();
@@ -287,14 +314,32 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
      * @param parent：父节点
      * @return List<TsResource>
      */
-    private List<TsResource> recursionGetListChildren(TsResource parent,List<String> getMenuIdList){
+    private List<TsResource> recursionGetListChildren(String sorDivide,TsResource parent,List<String> getMenuIdList){
         QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
         TsResourceQueryWrapper.eq("PARENT_ID",parent.getId());
-        TsResourceQueryWrapper.in("ID",getMenuIdList);
+        if(StringUtils.isNotBlank(sorDivide)){
+            TsResourceQueryWrapper.in("ID",getMenuIdList);
+        }
         TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
         List<TsResource> children=dao.selectList(TsResourceQueryWrapper);
         for(TsResource TsResource:children){
-            TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList)));
+            TsResource.setChildren(recursionGetListChildren((sorDivide),(TsResource),(getMenuIdList)));
+        }
+        return children;
+    }
+
+    /**
+     * 递归调用获取子节点
+     * @param parent：父节点
+     * @return List<TsResource>
+     */
+    private List<TsResource> recursionGetListChildrenStand(String sorDivide,TsResource parent){
+        QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
+        TsResourceQueryWrapper.eq("PARENT_ID",parent.getId());
+        TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
+        List<TsResource> children=dao.selectList(TsResourceQueryWrapper);
+        for(TsResource TsResource:children){
+            TsResource.setChildren(recursionGetListChildrenStand((sorDivide),(TsResource)));
         }
         return children;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -54,6 +54,12 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
         return Result.success("200",map);
     }
 
+    @GetMapping("/solostar")
+    @ApiOperation("车型/项目库")
+    public ResponseMessage queryMaintenanceProjectsolostar() {
+        return Result.success("200",sarStandProjectLibraryService.solostar());
+    }
+
     @GetMapping("/queryProjectConfirm")
     @ApiOperation("车型/项目库-清单标准确认流程用")
     public ResponseMessage queryMaintenanceProjectConfirm(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,SarStandProjectLibraryDto sarDto) {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java

@@ -21,8 +21,10 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         void deleteByIds(@Param("ids") List<StandProjectRelationDto> ids);
         void batchInsert(@Param("list") List<StandProjectRelationDto> list);
         List<SarStandProjectLibrary> selectPages(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
+        List<String> selectPagessolostar(@Param("flag")int flag,@Param("type")String type);
         Integer selectCount(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
         List<SarStandProjectLibrary> selectPagesWorkFlow(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
+        List<String> selectPagesWorkFlowsolostar(@Param("flag")int flag,@Param("type")String type);
         Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
         List<String> getAllStands();
         List<String> getAllStand();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java

@@ -6,12 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface SarStandProjectLibraryService {
     IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
+    List<String> queryMaintenanceProjectsolostar(String type);
     IPage<SarStandProjectLibrary> queryMaintenanceProjectWorkFlow(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     IPage<SarStandProjectLibrary> queryMaintenanceProjectConfirm(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
+    List<String> queryNotMaintenanceProjectsolostar(String type);
+    Map<String, Object> solostar();
     List<SarStandProjectLibrary> queryById(String id);
     IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize);
     List<SarStandProjectLibrary> queryByProductLine(String productLine);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -152,6 +152,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         int flag=2;
         return getSarStandProjectLibraryIPage(current, pageSize, sar,flag);
     }
+
+    @Override
+    public List<String> queryMaintenanceProjectsolostar(String type) {
+        int flag=2;
+        return getSarStandProjectLibraryIPagesolostar(flag,type);
+    }
     @Override
     public IPage<SarStandProjectLibrary> queryMaintenanceProjectWorkFlow(int current, int pageSize,
                                                                  SarStandProjectLibraryDto sarDto) {
@@ -240,6 +246,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         int flag=1;
         return getSarStandProjectLibraryIPage(current, pageSize, sar,flag);
     }
+    @Override
+    public List<String> queryNotMaintenanceProjectsolostar(String type) {
+        int flag=1;
+        return getSarStandProjectLibraryIPagesolostar(flag,type);
+    }
+
     @Override
     public List<SarStandProjectLibrary> queryById(String id) {
         QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
@@ -295,8 +307,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         if (ids.isEmpty()) {
             wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'");
         }else {
-            wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'" +
-                    "and  r.STAND_ID in (" + id.substring(0, id.length() - 1) + ")");
+            wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'" );
+//                    "and  r.STAND_ID in (" + id.substring(0, id.length() - 1) + ")");
         }
         Page<SarStandardsInfo> page1 = new Page<>(current, pageSize);
         IPage<SarStandardsInfo> userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1);
@@ -308,8 +320,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         if (ids.isEmpty()){
             wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.project_id ='"+ standId+"'");
         }else {
-            wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.project_id ='" + standId + "' " +
-                    "and  r.STAND_ID in (" + id.substring(0,id.length()-1) + ")");
+            wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.project_id ='" + standId + "' " );
+//                    "and  r.STAND_ID in (" + id.substring(0,id.length()-1) + ")");
         }
         Page<SarStandAttrInfo> page2 = new Page<>(current, pageSize);
         IPage<SarStandAttrInfo> userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2);
@@ -457,4 +469,36 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             return userIPage;
         }
     }
+
+    private List<String> getSarStandProjectLibraryIPagesolostar(int flag,String type) {
+        if (3!=flag) {
+            List<String> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagessolostar(flag,type);
+            return sarStandProjectLibraries;
+        }
+        else {
+            flag=2;
+            List<String> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlowsolostar(flag,type);
+            return sarStandProjectLibraries;
+        }
+    }
+
+
+    @Override
+    public Map<String, Object> solostar() {
+        Map<String, Object> map = new HashMap<String, Object>();
+        List<String> MaintenanceProjectClassification;
+        List<String> MaintenanceProjectStatus;
+        List<String> notMaintenanceProjectClassification;
+        List<String> notMaintenanceProjectStatus;
+        MaintenanceProjectClassification = this.queryMaintenanceProjectsolostar("ProjectClassification");
+        MaintenanceProjectStatus = this.queryMaintenanceProjectsolostar("ProjectStatus");
+        notMaintenanceProjectClassification = this.queryNotMaintenanceProjectsolostar("ProjectClassification");
+        notMaintenanceProjectStatus = this.queryMaintenanceProjectsolostar("ProjectStatus");
+        map.put("MaintenanceProjectClassification",MaintenanceProjectClassification);
+        map.put("MaintenanceProjectStatus",MaintenanceProjectStatus);
+        map.put("notMaintenanceProjectClassification",notMaintenanceProjectClassification);
+        map.put("notMaintenanceProjectStatus",notMaintenanceProjectStatus);
+
+        return map;
+    }
 }

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

@@ -0,0 +1,8 @@
+package com.adc.da.slrs.sarStandUnqualified.controller;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class KeyIssueManagementController {
+    //TODO zky
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java

@@ -0,0 +1,12 @@
+package com.adc.da.slrs.sarStandUnqualified.dao;
+
+
+
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+public interface BusinessDeptIssueDao extends BaseMapper<BusinessDeptIssue> {
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java

@@ -0,0 +1,8 @@
+package com.adc.da.slrs.sarStandUnqualified.dao;
+
+import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface ProductDeptIssueDao extends BaseMapper<ProductDeptIssue> {
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java

@@ -0,0 +1,26 @@
+package com.adc.da.slrs.sarStandUnqualified.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("business_dept_issue")
+public class BusinessDeptIssue {
+
+  private String id;
+  private String lawId;
+  private String productType;
+  private Date implTime;
+  private String implRequire;
+  private String conformSituation;
+  private String devScheme;
+  private Date sopTime;
+  private String completeSituation;
+  private String timeoutSituation;
+
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java

@@ -0,0 +1,25 @@
+package com.adc.da.slrs.sarStandUnqualified.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("product_dept_issue")
+public class ProductDeptIssue {
+
+  private String id;
+  private String lawId;
+  private String productBusiness;
+  private String platform;
+  private String pojName;
+  private String pojDescription;
+  private String currentNode;
+  private String conceptualState;
+  private Date scheduledIssuanceTime;
+  private String revisedPlan;
+  private String explanation;
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java

@@ -0,0 +1,7 @@
+package com.adc.da.slrs.sarStandUnqualified.service;
+
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IBusinessDeptIssueService extends IService<BusinessDeptIssue> {
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java

@@ -0,0 +1,4 @@
+package com.adc.da.slrs.sarStandUnqualified.service;
+
+public interface IProductDeptIssueService {
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java

@@ -0,0 +1,11 @@
+package com.adc.da.slrs.sarStandUnqualified.service.impl;
+
+import com.adc.da.slrs.sarStandUnqualified.dao.BusinessDeptIssueDao;
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BusinessDeptIssueService extends ServiceImpl<BusinessDeptIssueDao, BusinessDeptIssue> implements IBusinessDeptIssueService  {
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java

@@ -0,0 +1,9 @@
+package com.adc.da.slrs.sarStandUnqualified.service.impl;
+
+import com.adc.da.slrs.sarStandUnqualified.dao.ProductDeptIssueDao;
+import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue;
+import com.adc.da.slrs.sarStandUnqualified.service.IProductDeptIssueService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+public class ProductDeptIssueService extends ServiceImpl<ProductDeptIssueDao,ProductDeptIssue>  implements IProductDeptIssueService {
+}

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

@@ -96,7 +96,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         if (null != page.getNowOrderBy()) {
             switch (page.getNowOrderBy()) {
                 case 1:
-                    page.setOrderByA("issueTime");//发布日期
+                    page.setOrderByA("ISSUE_TIME");//发布日期
                     break;
                 case 2:
                     page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
@@ -240,7 +240,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
 //        if(page.getUserId() == null || page.getUserId().equals("")){
 //            page.setUserId(LoginUserUtil.getUserId());
 //        }
-        List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak(page);
+        List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak1(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Repository
 public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
-    List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page);
+    List<SarStandardsInfo> getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark);
 
     int getSarStandardsInfoCount(SarStandardsInfoEOPage page);
 

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

@@ -23,6 +23,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
     List<SarStandardsInfo> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception;
 
+    List<SarStandardsInfo> getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception;
+
     void createSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception;
 
     int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception;

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

@@ -293,12 +293,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
             if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
-                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
-                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
-                    page.setMenuRoleList(getMenuIdList);
-                } else {
-                    page.setMenuRoleList(null);
-                }
+//                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+//                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);
@@ -307,7 +307,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
         attrInfoCollect(sarlist);
         return sarlist;
     }
@@ -335,7 +335,35 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"999");
+        attrInfo(sarlist);
+        return sarlist;
+    }
+
+    @Override
+    public List<SarStandardsInfo> getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception {
+        //查询当前登录人角色拥有权限的菜单
+        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+            QueryWrapper<TsResource> qw = new QueryWrapper<>();
+            qw.eq("ID",page.getMenuId());
+            qw.isNull("PARENT_ID");
+            List<TsResource> children = iTsResourceService.list(qw);
+            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+                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);
+                }
+            }
+        }
+        Integer rowCount = dao.getSarStandardsInfoCount(page);
+        page.getPager().setRowCount(rowCount);
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
         attrInfo(sarlist);
         return sarlist;
     }
@@ -413,6 +441,53 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
+    public void attrInfoDetailsExport(SarStandardsInfo row) throws Exception {
+        String fieldInfo = InitStandAttrUtil.queryField;
+        // 查询属性表数据
+        if (StringUtils.isNotBlank(fieldInfo)) {
+            Map<String, Object> getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
+            if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) {
+                // 遍历修改所有clob类型的值
+                for (String clobField : InitStandAttrUtil.clobFieldList) {
+                    Clob clobValue = (Clob) getAttrMap.get(clobField);
+                    String fieldValue = FieldConvertUtil.ClobToString(clobValue);
+                    getAttrMap.put(clobField, fieldValue);
+                }
+            }
+            // 组织机构和人员
+            Map<String, Object> newMap = new HashMap<>();
+            if (getAttrMap != null) {
+                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    if ("\"null\"".equals(entry.getValue())) {
+                        entry.setValue("");
+                    }
+                    if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+                        String value = entry.getValue().toString();
+                        String selVal = InitStandAttrUtil.selectFieldMap.get(name);
+                        if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getOrgNamesByIds(value);
+                            newMap.put(name + "Name", value);
+                        } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getUserNamesByIds(value);
+                            newMap.put(name + "Name", value);
+                        } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) {
+                            value = sysInfoEOService.getRoleNamesByIds(value);
+                            newMap.put(name + "Name", value);
+                        }
+                    }
+                }
+                getAttrMap.putAll(newMap);
+            }
+
+            if (getAttrMap != null && !getAttrMap.isEmpty()) {
+                row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
+            }
+
+            row.setAttrInfoMap(getAttrMap);
+        }
+    }
+
     public void attrInfoSearchDetails(SarStandardsInfo row,String type) throws Exception {
         String fieldInfo = InitStandAttrUtil.queryField;
         String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
@@ -604,6 +679,55 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
+    public void attrInfoShowExport(List<SarStandardsInfo> sarlist) throws Exception {
+        for (SarStandardsInfo row : sarlist) {
+            attrInfoDetailsExport(row);
+            Map<String, Object> getAttrMap = row.getAttrInfoMap();
+            Map<String, Object> getNewMap = new LinkedHashMap<>();
+            if (getAttrMap != null && getAttrMap.size() > 0) {
+                String svppsTip = "";
+                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    String value = "";
+                    if ("SVPPS".equals(name)) {
+                        Object svpps = entry.getValue();
+                        if (svpps != null && StringUtils.isNotBlank(svpps.toString())) {
+                            svppsTip = svpps.toString();
+                        }
+                        if (StringUtils.isNotBlank(svppsTip)) {
+                            svppsTip = sysInfoEOService.getSvppsNamesTipByIds(svppsTip);
+                        }
+                        value = String.valueOf(getAttrMap.get("SVPPSName"));
+                        entry.setValue(value);
+                    } else if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) {
+                        value = entry.getValue().toString();
+                        if (StringUtils.isNotBlank(value)) {
+                            List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
+                            entry.setValue(fileObj);
+                        }
+                    } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+                        value = entry.getValue().toString();
+                        if ("GZZXX".equals(name)) {
+                            value = sysInfoEOService.getGroupNamesByIds(value);
+                        } else {
+                            String selVal = InitStandAttrUtil.selectFieldMap.get(name);
+                            if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) {
+                                if (getAttrMap.get(name + "Name") != null) {
+                                    value = String.valueOf(getAttrMap.get(name + "Name"));
+                                }
+                            } else {
+                                List<String> valArr = Arrays.asList(value.split(","));
+                                value = dicTypeEODao.getDicNamesByCodes(valArr);
+                            }
+                        }
+                        entry.setValue(value);
+                    }
+                }
+                getAttrMap.put("SVPPSTips", svppsTip);
+            }
+        }
+    }
+
 
     /***
      * @Description: 新增标准
@@ -655,7 +779,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
                 number += "-" + sarStandardsInfoEO.getStandYear();
             }
-            String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
+            String content = "入库" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
             sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
             if(elasflag) {
                 // 消息队列
@@ -1412,7 +1536,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 standNum = getDelStandInfo.getStandSort() + " " + getDelStandInfo.getStandNumber();
             }
             sarStandardsInfoEOPage.setReplacedStandNum(standNum);
-            List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage);
+            List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage,"0");
             if (getReplacedStands != null && !getReplacedStands.isEmpty()) {
                 for (SarStandardsInfo stand : getReplacedStands) {
                     SarStandardsInfo newStand = new SarStandardsInfo();
@@ -1456,19 +1580,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             page = (SarStandardsInfoEOPage) JSONObject.toBean(jsonObject, SarStandardsInfoEOPage.class);
             page.setStandType(standardsInfoExcelVO.getStandType());
             //查询当前登录人角色拥有权限的菜单
-            List<String> getMenuIdList = new ArrayList<>();
-            if(standardsInfoExcelVO.getUserId() != null){
-                getMenuIdList= tsUserService.getResourceUserId(standardsInfoExcelVO.getUserId());
-            }
-            //            List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
-            if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
-                page.setMenuRoleList(getMenuIdList);
-            } else {
-                page.setMenuRoleList(null);
-            }
-            List<String> ids = sarMenuEOService.getChildMenuList(page.getMenuId());
-            if (ids != null && !ids.isEmpty()) {
-                page.setMenuAllChildrenIdList(ids);
+            if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+                QueryWrapper<TsResource> qw = new QueryWrapper<>();
+                qw.eq("ID",page.getMenuId());
+                qw.isNull("PARENT_ID");
+                List<TsResource> children = iTsResourceService.list(qw);
+                if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+//                    List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+//                    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);
+                    }
+                }
             }
             if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
                 List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class);
@@ -1480,14 +1608,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 }
             }
         }
-        page.setOrderBy("SAR_STANDARDS_INFO.issue_time is null,SAR_STANDARDS_INFO.issue_time desc,SAR_STANDARDS_INFO.id");
         if(standardsInfoExcelVO.getUserId() != null){
             page.setUserId(standardsInfoExcelVO.getUserId());
         }else {
             page.setUserId(LoginUserUtil.getUserId());
         }
         List<SarStandardsInfo> getList = dao.getSarStandardsExportInfo(page);
-        attrInfoShow(getList);
+        attrInfoShowExport(getList);
         return getList;
     }
 
@@ -2640,7 +2767,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //        }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
         attrInfo(sarlist);
         return sarlist;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/controller/WgDeptController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.wgDept.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.wgDept.entity.WgDept;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 集团参与情况 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-04
+*/
+@RestController
+@Api(description = "|WgDept|")
+@RequestMapping("/${restPath}/wgDept")
+public class WgDeptController extends BaseController<WgDept> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/dao/WgDeptDao.java

@@ -0,0 +1,21 @@
+package com.adc.da.slrs.wgDept.dao;
+
+import com.adc.da.slrs.wgDept.entity.WgDept;
+import com.adc.da.slrs.wgDept.entity.WgDeptShow;
+import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 集团参与情况 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface WgDeptDao extends BaseMapper<WgDept> {
+    List<WgDeptShow> researchDatas(@Param(value = "data") String data);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java

@@ -0,0 +1,62 @@
+package com.adc.da.slrs.wgDept.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 集团参与情况
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgDept对象", description="集团参与情况")
+@TableName("wg_dept")
+public class WgDept extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    @TableField("wg_id")
+    private String wgId;
+
+    @ApiModelProperty(value = "我司在工作组排名顺序")
+    @TableField("dept_order")
+    private String deptOrder;
+
+    @ApiModelProperty(value = "我司人员")
+    @TableField("dept_people_id")
+    private String deptPeopleId;
+
+    @ApiModelProperty(value = "身份")
+    @TableField("identity")
+    private String identity;
+
+    @ApiModelProperty(value = "资料")
+    @TableField("joinfile")
+    private String joinfile;
+
+    @ApiModelProperty(value = "前端id")
+    @TableField("join_id")
+    private String joinId;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java

@@ -0,0 +1,75 @@
+package com.adc.da.slrs.wgDept.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgDept对象", description="集团参与情况")
+public class WgDeptShow extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    @TableField("wg_id")
+    private String wgId;
+
+    @ApiModelProperty(value = "我司在工作组排名顺序")
+    @TableField("dept_order")
+    private String deptOrder;
+
+    @ApiModelProperty(value = "我司人员")
+    @TableField("dept_people_id")
+    private String deptPeopleId;
+
+    @ApiModelProperty(value = "身份")
+    @TableField("identity")
+    private String identity;
+
+    @ApiModelProperty(value = "资料")
+    @TableField("joinfile")
+    private String joinfile;
+
+    @ApiModelProperty(value = "中文名")
+    private String name;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "部门Id")
+    private String deptId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/IWgDeptService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.wgDept.service;
+
+import com.adc.da.slrs.wgDept.entity.WgDept;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 集团参与情况 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface IWgDeptService extends IService<WgDept> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/impl/WgDeptServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.wgDept.service.impl;
+
+import com.adc.da.slrs.wgDept.entity.WgDept;
+import com.adc.da.slrs.wgDept.dao.WgDeptDao;
+import com.adc.da.slrs.wgDept.service.IWgDeptService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 集团参与情况 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Service
+public class WgDeptServiceImpl extends ServiceImpl<WgDeptDao, WgDept> implements IWgDeptService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/controller/WgMeetingInfoController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.wgMeetingInfo.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 参会记录及资料 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-04
+*/
+@RestController
+@Api(description = "|WgMeetingInfo|")
+@RequestMapping("/${restPath}/wgMeetingInfo")
+public class WgMeetingInfoController extends BaseController<WgMeetingInfo> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/dao/WgMeetingInfoDao.java

@@ -0,0 +1,22 @@
+package com.adc.da.slrs.wgMeetingInfo.dao;
+
+import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo;
+import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参会记录及资料 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface WgMeetingInfoDao extends BaseMapper<WgMeetingInfo> {
+
+    List<WgMeetingInfo> researchDatas(@Param(value = "data") String data);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/entity/WgMeetingInfo.java

@@ -0,0 +1,77 @@
+package com.adc.da.slrs.wgMeetingInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgMeetingInfo对象", description="参会记录及资料")
+@TableName("wg_meeting_info")
+public class WgMeetingInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    @TableField("wg_id")
+    private String wgId;
+
+    @ApiModelProperty(value = "参会时间")
+    @TableField("meeting_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date meetingTime;
+
+    @ApiModelProperty(value = "会议名称")
+    @TableField("meeting_name")
+    private String meetingName;
+
+
+    @ApiModelProperty(value = "会议报告")
+    @TableField("meeting_report")
+    private String meetingReport;
+
+    @ApiModelProperty(value = "会议资料")
+    @TableField("joinfile")
+    private String joinfile;
+
+    @ApiModelProperty(value = "前端id")
+    @TableField("join_id")
+    private String joinId;
+
+    @ApiModelProperty(value = "人员信息")
+    @TableField(exist = false)
+    private List<String> meetingPeople;
+
+    @TableField(exist = false)
+    private List<WgMeetingUserRelationShow> joinMeetingPeopleInfo;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/IWgMeetingInfoService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.wgMeetingInfo.service;
+
+import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 参会记录及资料 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface IWgMeetingInfoService extends IService<WgMeetingInfo> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/impl/WgMeetingInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.wgMeetingInfo.service.impl;
+
+import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo;
+import com.adc.da.slrs.wgMeetingInfo.dao.WgMeetingInfoDao;
+import com.adc.da.slrs.wgMeetingInfo.service.IWgMeetingInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 参会记录及资料 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Service
+public class WgMeetingInfoServiceImpl extends ServiceImpl<WgMeetingInfoDao, WgMeetingInfo> implements IWgMeetingInfoService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/controller/WgMeetingUserRelationController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.wgMeetingUserRelation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    *  前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-09
+*/
+@RestController
+@Api(description = "|WgMeetingUserRelation|")
+@RequestMapping("/wgMeetingUserRelation")
+public class WgMeetingUserRelationController extends BaseController<WgMeetingUserRelation> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/dao/WgMeetingUserRelationDao.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.wgMeetingUserRelation.dao;
+
+import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation;
+import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+public interface WgMeetingUserRelationDao extends BaseMapper<WgMeetingUserRelation> {
+    List<WgMeetingUserRelationShow> getMeetingPeoples(@Param("meetId") String meetingId);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/entity/WgMeetingUserRelation.java

@@ -0,0 +1,34 @@
+package com.adc.da.slrs.wgMeetingUserRelation.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+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-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgMeetingUserRelation对象", description="")
+public class WgMeetingUserRelation extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "会议id")
+    private String meetingId;
+
+    @ApiModelProperty(value = "人员id")
+    private String userId;
+
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/entity/WgMeetingUserRelationShow.java

@@ -0,0 +1,45 @@
+package com.adc.da.slrs.wgMeetingUserRelation.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
+import com.adc.da.slrs.sarPosition.entity.TsPosition;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgMeetingUserRelation对象", description="")
+public class WgMeetingUserRelationShow extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "会议id")
+    private String meetingId;
+
+    @ApiModelProperty(value = "人员id")
+    private String userId;
+
+    @ApiModelProperty(value = "人员名称")
+    private String name;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/service/IWgMeetingUserRelationService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.wgMeetingUserRelation.service;
+
+import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+public interface IWgMeetingUserRelationService extends IService<WgMeetingUserRelation> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/service/impl/WgMeetingUserRelationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.wgMeetingUserRelation.service.impl;
+
+import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation;
+import com.adc.da.slrs.wgMeetingUserRelation.dao.WgMeetingUserRelationDao;
+import com.adc.da.slrs.wgMeetingUserRelation.service.IWgMeetingUserRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+@Service
+public class WgMeetingUserRelationServiceImpl extends ServiceImpl<WgMeetingUserRelationDao, WgMeetingUserRelation> implements IWgMeetingUserRelationService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/controller/WgNetInfoController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.wgNetInfo.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 工作组秘书联系方式 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-04
+*/
+@RestController
+@Api(description = "|WgNetInfo|")
+@RequestMapping("/${restPath}/wgNetInfo")
+public class WgNetInfoController extends BaseController<WgNetInfo> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/dao/WgNetInfoDao.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.wgNetInfo.dao;
+
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo;
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 工作组秘书联系方式 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface WgNetInfoDao extends BaseMapper<WgNetInfo> {
+
+    List<WgNetInfoDTO> researchDatas(@Param(value = "data") String data);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java

@@ -0,0 +1,48 @@
+package com.adc.da.slrs.wgNetInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgNetInfo对象", description="工作组秘书联系方式")
+@TableName("wg_net_info")
+public class WgNetInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    @TableField("wg_id")
+    private String wgId;
+
+    @ApiModelProperty(value = "人员id")
+    @TableField("net_id")
+    private String netId;
+
+    @ApiModelProperty(value = "前端id")
+    @TableField("join_id")
+    private String joinId;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java

@@ -0,0 +1,64 @@
+package com.adc.da.slrs.wgNetInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgNetInfo对象", description="工作组秘书联系方式")
+@TableName("wg_net_info")
+public class WgNetInfoDTO extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    @TableField("wg_id")
+    private String wgId;
+
+    @ApiModelProperty(value = "人员id")
+    @TableField("net_id")
+    private String netId;
+
+
+    @ApiModelProperty(value = "前端id")
+    @TableField("join_id")
+    private String joinId;
+
+    @ApiModelProperty(value = "中文名")
+    private String name;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/IWgNetInfoService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.wgNetInfo.service;
+
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 工作组秘书联系方式 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface IWgNetInfoService extends IService<WgNetInfo> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/impl/WgNetInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.wgNetInfo.service.impl;
+
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo;
+import com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao;
+import com.adc.da.slrs.wgNetInfo.service.IWgNetInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 工作组秘书联系方式 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Service
+public class WgNetInfoServiceImpl extends ServiceImpl<WgNetInfoDao, WgNetInfo> implements IWgNetInfoService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/controller/WgPayInfoController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.wgPayInfo.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 支付信息 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-04
+*/
+@RestController
+@Api(description = "|WgPayInfo|")
+@RequestMapping("/${restPath}/wgPayInfo")
+public class WgPayInfoController extends BaseController<WgPayInfo> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/dao/WgPayInfoDao.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.wgPayInfo.dao;
+
+import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 支付信息 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface WgPayInfoDao extends BaseMapper<WgPayInfo> {
+    List<WgPayInfo> researchDatas(@Param(value = "data") String data);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java

@@ -0,0 +1,73 @@
+package com.adc.da.slrs.wgPayInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgPayInfo对象", description="支付信息")
+@TableName("wg_pay_info")
+public class WgPayInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    @TableField("wg_id")
+    private String wgId;
+
+    @ApiModelProperty(value = "价格")
+    @TableField("price")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "年份")
+    @TableField("year")
+    private String year;
+
+    @ApiModelProperty(value = "支付状态（0:未支付,1:已支付）")
+    @TableField("status")
+    private String status;
+
+    @ApiModelProperty(value = "是否计划内(0:计划内,1:计划外)")
+    @TableField("inplan")
+    private String inplan;
+
+    @ApiModelProperty(value = "支付方式")
+    @TableField("pay_way")
+    private String payWay;
+
+    @ApiModelProperty(value = "支付资料")
+    @TableField("joinfile")
+    private String joinfile;
+
+    @ApiModelProperty(value = "费用列支")
+    @TableField("pay_info")
+    private String payInfo;
+
+    @ApiModelProperty(value = "前端id")
+    @TableField("join_id")
+    private String joinId;
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/IWgPayInfoService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.wgPayInfo.service;
+
+import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 支付信息 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface IWgPayInfoService extends IService<WgPayInfo> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/impl/WgPayInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.wgPayInfo.service.impl;
+
+import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo;
+import com.adc.da.slrs.wgPayInfo.dao.WgPayInfoDao;
+import com.adc.da.slrs.wgPayInfo.service.IWgPayInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 支付信息 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Service
+public class WgPayInfoServiceImpl extends ServiceImpl<WgPayInfoDao, WgPayInfo> implements IWgPayInfoService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/controller/WgStandorpolicyInfoController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.wgStandorpolicyInfo.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 标准/政策 -信息 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-04
+*/
+@RestController
+@Api(description = "|WgStandorpolicyInfo|")
+@RequestMapping("/${restPath}/wgStandorpolicyInfo")
+public class WgStandorpolicyInfoController extends BaseController<WgStandorpolicyInfo> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java

@@ -0,0 +1,22 @@
+package com.adc.da.slrs.wgStandorpolicyInfo.dao;
+
+import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准/政策 -信息 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface WgStandorpolicyInfoDao extends BaseMapper<WgStandorpolicyInfo> {
+
+    List<WgStandorpolicyInfo> researchDatas(@Param(value = "data") String data);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java

@@ -0,0 +1,62 @@
+package com.adc.da.slrs.wgStandorpolicyInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgStandorpolicyInfo对象", description="标准/政策 -信息")
+@TableName("wg_standorpolicy_info")
+public class WgStandorpolicyInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    private String wgId;
+
+    @ApiModelProperty(value = "政策/标准 类别")
+    private String categary;
+
+    @ApiModelProperty(value = "政策/标准 编号")
+    private String number;
+
+    @ApiModelProperty(value = "政策/标准 年份")
+    private String year;
+
+    @ApiModelProperty(value = "政策标准  名称")
+    private String name;
+
+    @ApiModelProperty(value = "政策/标准 英文名称")
+    private String usname;
+
+    @ApiModelProperty(value = "文本状态")
+    private String status;
+
+    @ApiModelProperty(value = "参与制定情况")
+    private String joinDevelop;
+
+    @ApiModelProperty(value = "相关材料")
+    private String netDatum;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/IWgStandorpolicyInfoService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.wgStandorpolicyInfo.service;
+
+import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 标准/政策 -信息 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface IWgStandorpolicyInfoService extends IService<WgStandorpolicyInfo> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.wgStandorpolicyInfo.service.impl;
+
+import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo;
+import com.adc.da.slrs.wgStandorpolicyInfo.dao.WgStandorpolicyInfoDao;
+import com.adc.da.slrs.wgStandorpolicyInfo.service.IWgStandorpolicyInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 标准/政策 -信息 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Service
+public class WgStandorpolicyInfoServiceImpl extends ServiceImpl<WgStandorpolicyInfoDao, WgStandorpolicyInfo> implements IWgStandorpolicyInfoService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java

@@ -0,0 +1,68 @@
+package com.adc.da.slrs.wgWorkGroup.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
+import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 工作组主表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-04
+*/
+@RestController
+@Api(description = "|WgWorkGroup|")
+@RequestMapping("/${restPath}/wg_work_group")
+public class WgWorkGroupController extends BaseController<WgWorkGroup> {
+
+    @Autowired
+    private IWgWorkGroupService wgWorkGroupService;
+
+    @ApiOperation("添加工作组节点数据")
+    @PostMapping("/add")
+    public ResponseMessage<Object> addResource(@RequestBody WgWorkGroupDTO wgWorkGroup){
+        return Result.success(wgWorkGroupService.saveDatas(wgWorkGroup));
+    }
+
+
+    @ApiOperation("搜索工作组节点数据")
+    @GetMapping("/researchData")
+    public ResponseMessage<WgWorkGroupShowDTO> researchData(@RequestParam(value = "type") String type){
+        return Result.success(wgWorkGroupService.researchData(type));
+    }
+
+    @ApiOperation("删除工作组节点数据")
+    @DeleteMapping("/deleteData")
+    public ResponseMessage<Object> deleteData(@Param(value = "id") String id){
+        return wgWorkGroupService.deleteData(id);
+    }
+
+    @ApiOperation("修改工作组节点数据")
+    @DeleteMapping("/updateData")
+    public ResponseMessage<Object> updateData(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO){
+        return wgWorkGroupService.updateData(wgWorkGroupShowDTO);
+    }
+
+
+
+
+
+
+
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java

@@ -0,0 +1,27 @@
+package com.adc.da.slrs.wgWorkGroup.dao;
+
+import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 工作组主表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface WgWorkGroupDao extends BaseMapper<WgWorkGroup> {
+
+    WgWorkGroupShowDTO researchDatas(@Param(value = "data") List<WgWorkGroupShowDTO> wgWorkGroupShowDTOS,@Param(value = "type")String type);
+
+    List<WgWorkGroupShowDTO> researchDownLevel(@Param(value = "data") String data);
+
+    List<WgWorkGroup> researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroup.java

@@ -0,0 +1,78 @@
+package com.adc.da.slrs.wgWorkGroup.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgWorkGroup对象", description="工作组主表")
+@TableName("wg_work_group")
+public class WgWorkGroup extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "父级id")
+    @TableId("pid")
+    private String pid;
+
+    @ApiModelProperty(value = "编号")
+    @TableId("number")
+    private String number;
+
+    @ApiModelProperty(value = "名称")
+    @TableId("name")
+    private String name;
+
+    @ApiModelProperty(value = "性质（0:标委会,1:分标委,2:工作组,3:政策）")
+    @TableId("nature")
+    private String nature;
+
+    @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)")
+    @TableId("status")
+    private String status;
+
+    @ApiModelProperty(value = "换届时间")
+    @TableField("change_time")
+    private LocalDateTime changeTime;
+
+    @ApiModelProperty(value = "标准化工作领域")
+    @TableField("stander_area")
+    private String standerArea;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("mark")
+    private String mark;
+
+    @ApiModelProperty(value = "0:标准化流程 1:政策课题组")
+    @TableField("type")
+    private String types;
+
+    @ApiModelProperty(value = "层级")
+    @TableField("level")
+    private String level;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupDTO.java

@@ -0,0 +1,87 @@
+package com.adc.da.slrs.wgWorkGroup.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.slrs.wgDept.entity.WgDept;
+import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo;
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo;
+import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo;
+import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 工作组主表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgWorkGroup对象", description="工作组主表")
+public class WgWorkGroupDTO extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "工作组id")
+    private String id;
+
+    @ApiModelProperty(value = "父级id")
+    private String pid;
+
+    @ApiModelProperty(value = "编号")
+    private String number;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "性质（0:标委会,1:分标委,2:工作组,3:政策）")
+    private String nature;
+
+    @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)")
+    private String status;
+
+    @ApiModelProperty(value = "换届时间")
+    private LocalDateTime changeTime;
+
+    @ApiModelProperty(value = "标准化工作领域")
+    private String standerArea;
+
+    @ApiModelProperty(value = "备注")
+    private String mark;
+
+    @ApiModelProperty(value = "0:标准化流程 1:政策课题组")
+    private String types;
+
+    @ApiModelProperty(value = "层级")
+    private String level;
+
+    //支付信息
+    List<WgPayInfo> wgPayInfos;
+
+    //标准政策
+    List<WgStandorpolicyInfo> wgStandorpolicyInfos;
+
+    //集团参与情况
+    List<WgDept> wgDepts;
+
+    //秘书联系方式
+    List<WgNetInfo> wgNetInfos;
+
+    //参会记录及资料
+    List<WgMeetingInfo> wgMeetingInfos;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java

@@ -0,0 +1,86 @@
+package com.adc.da.slrs.wgWorkGroup.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.slrs.wgDept.entity.WgDept;
+import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo;
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo;
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO;
+import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo;
+import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 工作组主表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgWorkGroup对象", description="工作组主表")
+public class WgWorkGroupShowDTO extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "工作组id")
+    private String id;
+
+    @ApiModelProperty(value = "父级id")
+    private String pid;
+
+    @ApiModelProperty(value = "编号")
+    private String number;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "性质（0:标委会,1:分标委,2:工作组,3:政策）")
+    private String nature;
+
+    @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)")
+    private String status;
+
+    @ApiModelProperty(value = "换届时间")
+    private Date changeTime;
+
+    @ApiModelProperty(value = "标准化工作领域")
+    private String standerArea;
+
+    @ApiModelProperty(value = "备注")
+    private String mark;
+
+    @ApiModelProperty(value = "0:标准化流程 1:政策课题组")
+    private String types;
+
+    private String level;
+
+    //支付信息
+    List<WgPayInfo> wgPayInfos;
+
+    //标准政策
+    List<WgStandorpolicyInfo> wgStandorpolicyInfos;
+
+    //集团参与情况
+    List<WgDept> wgDepts;
+
+    //秘书联系方式
+    List<WgNetInfoDTO> wgNetInfos;
+
+    //参会记录及资料
+    List<WgMeetingInfo> wgMeetingInfos;
+
+    List<WgWorkGroupShowDTO> children;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java

@@ -0,0 +1,31 @@
+package com.adc.da.slrs.wgWorkGroup.service;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 工作组主表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+public interface IWgWorkGroupService extends IService<WgWorkGroup> {
+
+    String saveDatas(WgWorkGroupDTO wgWorkGroupDTO);
+
+    WgWorkGroupShowDTO researchData(String type);
+
+    ResponseMessage<Object> deleteData(String id);
+
+    ResponseMessage<Object> updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO);
+
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java

@@ -0,0 +1,185 @@
+package com.adc.da.slrs.wgWorkGroup.service.impl;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.wgDept.service.IWgDeptService;
+import com.adc.da.slrs.wgMeetingInfo.service.IWgMeetingInfoService;
+import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation;
+import com.adc.da.slrs.wgMeetingUserRelation.service.IWgMeetingUserRelationService;
+import com.adc.da.slrs.wgMeetingUserRelation.service.impl.WgMeetingUserRelationServiceImpl;
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo;
+import com.adc.da.slrs.wgNetInfo.service.IWgNetInfoService;
+import com.adc.da.slrs.wgPayInfo.service.IWgPayInfoService;
+import com.adc.da.slrs.wgStandorpolicyInfo.service.IWgStandorpolicyInfoService;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup;
+import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO;
+import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
+import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 工作组主表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-04
+ */
+@Service
+public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGroup> implements IWgWorkGroupService {
+
+    @Autowired
+    private IWgWorkGroupService wgWorkGroupService;
+    @Autowired
+    private IWgDeptService wgDeptService;
+    @Autowired
+    private IWgMeetingInfoService wgMeetingInfoService;
+    @Autowired
+    private IWgNetInfoService wgNetInfoService;
+    @Autowired
+    private IWgPayInfoService wgPayInfoService;
+    @Autowired
+    private IWgStandorpolicyInfoService wgStandorpolicyInfoService;
+    @Autowired
+    private WgWorkGroupDao wgWorkGroupDao;
+    @Autowired
+    private IWgMeetingUserRelationService wgMeetingUserRelationService;
+
+
+    @Transactional
+    @Override
+    public String saveDatas(WgWorkGroupDTO wgWorkGroupDTO) {
+        WgWorkGroup wgWorkGroup=new WgWorkGroup();
+        BeanUtils.copyProperties(wgWorkGroupDTO,wgWorkGroup);
+        //存储集团参与情况
+        boolean flag=true;
+        wgWorkGroup.setId(String.valueOf(UUID.randomUUID()));
+        flag=wgWorkGroupService.save(wgWorkGroup);
+        if (null!=wgWorkGroupDTO.getWgDepts()) {
+            wgWorkGroupDTO.getWgDepts().forEach(wgDept -> {wgDept.setWgId(wgWorkGroup.getId());
+            });
+            flag=wgDeptService.saveBatch(wgWorkGroupDTO.getWgDepts());
+        }
+        //存储会议信息
+        if (null!=wgWorkGroupDTO.getWgMeetingInfos()) {
+            List<WgMeetingUserRelation> wgMeetingUserRelations = new ArrayList<>();
+            wgWorkGroupDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> {
+                wgMeetingInfo.setWgId(wgWorkGroup.getId());
+                wgMeetingInfo.getMeetingPeople().forEach(s -> {
+                    WgMeetingUserRelation wgMeetingUserRelation=new WgMeetingUserRelation();
+                    wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId());
+                    wgMeetingUserRelation.setUserId(s);
+                });
+            });
+            flag = wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations);
+            flag = wgMeetingInfoService.saveBatch(wgWorkGroupDTO.getWgMeetingInfos());
+        }
+        //存储秘书联系方式信息
+        if (null!=wgWorkGroupDTO.getWgNetInfos()) {
+            wgWorkGroupDTO.getWgNetInfos().forEach(wgNetInfo -> {wgNetInfo.setWgId(wgWorkGroup.getId());});
+            flag = wgNetInfoService.saveBatch(wgWorkGroupDTO.getWgNetInfos());
+        }
+        //支付信息
+        if (null!=wgWorkGroupDTO.getWgPayInfos()) {
+            wgWorkGroupDTO.getWgPayInfos().forEach(wgPayInfo -> {wgPayInfo.setWgId(wgWorkGroup.getId());});
+            flag = wgPayInfoService.saveBatch(wgWorkGroupDTO.getWgPayInfos());
+        }
+        //标准政策信息
+        if (null!=wgWorkGroupDTO.getWgStandorpolicyInfos()) {
+            wgWorkGroupDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> {wgStandorpolicyInfo.setWgId(wgWorkGroup.getId());});
+            flag = wgStandorpolicyInfoService.saveBatch(wgWorkGroupDTO.getWgStandorpolicyInfos());
+        }
+        //先存储主数据
+        if (flag ) {
+            return "添加成功";
+        }else {
+            return "数据错误，添加失败";
+        }
+    }
+
+    @Override
+    public WgWorkGroupShowDTO researchData(String type) {
+        //构建最初的节点 用来向下搜索
+        WgWorkGroupShowDTO wgWorkGroupShowDTO=new WgWorkGroupShowDTO();
+        wgWorkGroupShowDTO.setId("root");
+        wgWorkGroupShowDTO.setTypes(type);
+        List<WgWorkGroupShowDTO> wgWorkGroupShowDTOS=new ArrayList<>();
+        wgWorkGroupShowDTOS.add(wgWorkGroupShowDTO);
+        return wgWorkGroupDao.researchDatas(wgWorkGroupShowDTOS,type);
+    }
+
+    @Override
+    public ResponseMessage<Object> deleteData(String id) {
+        List<WgWorkGroup> wgWorkGroupShowDTOS=wgWorkGroupDao.researchDownCheck(id,"1");
+        List<WgWorkGroupShowDTO> wgWorkGroups=wgWorkGroupDao.researchDownLevel(id);
+        if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0 && null!= wgWorkGroups && wgWorkGroups.size()>0){
+            return Result.error("该工作组下存在工作组且处在流程中，无法删除");
+        } else if (null!=wgWorkGroups && wgWorkGroups.size()>0) {
+            return Result.error("该工作组下存在工作组，无法删除");
+        } else if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0){
+            return Result.error("该工作组处在流程中，无法删除");
+        }else {
+            wgWorkGroupService.removeById(id);
+            Map<String, Object> columnMap = new HashMap<>();
+            columnMap.put("wg_id", id);
+            wgStandorpolicyInfoService.removeByMap(columnMap);
+            wgPayInfoService.removeByMap(columnMap);
+            wgNetInfoService.removeByMap(columnMap);
+            wgMeetingInfoService.removeByMap(columnMap);
+            wgDeptService.removeByMap(columnMap);
+            return Result.success("删除成功");
+        }
+    }
+
+    @Override
+    public ResponseMessage<Object> updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) {
+        List<WgWorkGroup> wgWorkGroupShowDTOS=wgWorkGroupDao.researchDownCheck(wgWorkGroupShowDTO.getId(),"1");
+        if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0){
+            return Result.error("工作组处在流程中，无法修改");
+        }else {
+            WgWorkGroup wgWorkGroup=new WgWorkGroup();
+            BeanUtils.copyProperties(wgWorkGroupShowDTO,wgWorkGroup);
+            boolean flag = false;
+            flag=wgWorkGroupService.updateById(wgWorkGroup);
+            if (null!=wgWorkGroupShowDTO.getWgDepts()) {
+                flag = wgDeptService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgDepts());
+            }
+            if (null!=wgWorkGroupShowDTO.getWgMeetingInfos()) {
+                flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos());
+            }
+            if (null!=wgWorkGroupShowDTO.getWgNetInfos()) {
+                 List<WgNetInfo> wgNetInfos=new ArrayList<>();
+                 wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> {
+                     WgNetInfo wgNetInfo=new WgNetInfo();
+                     BeanUtils.copyProperties(wgNetInfoDTO,wgNetInfo);
+                     wgNetInfos.add(wgNetInfo);
+                 });
+                flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos);
+            }
+            if (null!=wgWorkGroupShowDTO.getWgPayInfos()){
+                flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos());
+            }
+            if (null!=wgWorkGroupShowDTO.getWgStandorpolicyInfos()) {
+                flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos());
+            }
+
+            if (flag){
+                return Result.success("更新成功");
+            }else {
+                return Result.error("无法更新");
+            }
+        }
+    }
+
+
+
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java

@@ -91,19 +91,19 @@ public class BussStandExportUtil {
         Map<String,Object> attrValueMap = sarStandardsInfoEO.getAttrInfoMap();
         switch (name) {
             case "企标类别":
-                value = sarStandardsInfoEO.getStandSortShow();
+                value = verifyBean(sarStandardsInfoEO.getStandSortShow());
                 break;
             case "企标编号":
-                value = sarStandardsInfoEO.getStandCode();
+                value = verifyBean(sarStandardsInfoEO.getStandCode());
                 break;
             case "中文名称":
-                value = sarStandardsInfoEO.getStandName();
+                value = verifyBean(sarStandardsInfoEO.getStandName());
                 break;
             case "英文名称":
-                value = sarStandardsInfoEO.getStandEnName();
+                value = verifyBean(sarStandardsInfoEO.getStandEnName());
                 break;
             case "文本状态":
-                value = sarStandardsInfoEO.getStandStatusShow();
+                value = verifyBean(sarStandardsInfoEO.getStandStatusShow());
                 break;
             case "标准实施日期":
                 String putTime="";
@@ -116,10 +116,10 @@ public class BussStandExportUtil {
                 value = putTime;
                 break;
             case "代替企标编号":
-                value = sarStandardsInfoEO.getReplaceStandNum();
+                value = verifyBean(sarStandardsInfoEO.getReplaceStandNum());
                 break;
             case "被代替企标编号":
-                value = sarStandardsInfoEO.getReplacedStandNum();
+                value = verifyBean(sarStandardsInfoEO.getReplacedStandNum());
                 break;
             case "发布日期":
                 String issueTime="";
@@ -149,4 +149,14 @@ public class BussStandExportUtil {
         return value;
     }
 
+    private static String verifyBean(String value){
+        String val = "";
+        if(StringUtils.isNotBlank(value)){
+            val =value;
+        }else {
+            val = "";
+        }
+        return val;
+    }
+
 }

adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java

@@ -91,19 +91,19 @@ public class LawsStandExportUtil {
         Map<String,Object> attrValueMap = sarStandardsInfoEO.getAttrInfoMap();
         switch (name) {
             case "政策分类":
-                value = sarStandardsInfoEO.getLawsType();
+                value = verifyBean(sarStandardsInfoEO.getLawsType());
                 break;
             case "政策编号":
-                value = sarStandardsInfoEO.getLawsNumber();
+                value = verifyBean(sarStandardsInfoEO.getLawsNumber());
                 break;
             case "中文名称":
-                value = sarStandardsInfoEO.getLawsName();
+                value = verifyBean(sarStandardsInfoEO.getLawsName());
                 break;
             case "英文名称":
-                value = sarStandardsInfoEO.getLawsEnName();
+                value = verifyBean(sarStandardsInfoEO.getLawsEnName());
                 break;
             case "政策文号":
-                value = sarStandardsInfoEO.getLawsNo();
+                value = verifyBean(sarStandardsInfoEO.getLawsNo());
                 break;
             case "发文日期":
                 String issueTime="";
@@ -116,11 +116,11 @@ public class LawsStandExportUtil {
                 value = issueTime;
                 break;
             case "发文单位":
-                value = sarStandardsInfoEO.getIssueCompany();
+                value = verifyBean(sarStandardsInfoEO.getIssueCompany());
                 break;
             case "征集意见周期-起始时间":
                 String commentCycleStart="";
-                if (Date.class.equals(sarStandardsInfoEO.getCommentCycleStart().getClass())){
+                if (Date.class.equals(sarStandardsInfoEO.getCommentCycleStart())){
                     commentCycleStart = sdf.format(sarStandardsInfoEO.getCommentCycleStart());
                 }else {
                     commentCycleStart=sarStandardsInfoEO.getCommentCycleStart();
@@ -129,7 +129,7 @@ public class LawsStandExportUtil {
                 break;
             case "征集意见周期-结束时间":
                 String commentCycleEnd="";
-                if (Date.class.equals(sarStandardsInfoEO.getCommentCycleEnd().getClass())){
+                if (Date.class.equals(sarStandardsInfoEO.getCommentCycleEnd())){
                     commentCycleEnd = sdf.format(sarStandardsInfoEO.getCommentCycleEnd());
                 }else {
                     commentCycleEnd=sarStandardsInfoEO.getCommentCycleEnd();
@@ -137,31 +137,31 @@ public class LawsStandExportUtil {
                 value = commentCycleEnd;
                 break;
             case "文本状态":
-                value = sarStandardsInfoEO.getStandStatusShow();
+                value = verifyBean(sarStandardsInfoEO.getStandStatusShow());
                 break;
             case "适用区域":
-                value = sarStandardsInfoEO.getLawsSyqy();
+                value = verifyBean(sarStandardsInfoEO.getLawsSyqy());
                 break;
             case "适用车型":
-                value = sarStandardsInfoEO.getLawsSycx();
+                value = verifyBean(sarStandardsInfoEO.getLawsSycx());
                 break;
             case "是否纳入认证清单":
                 value = sarStandardsInfoEO.getIsRelateAccess() != null ? (sarStandardsInfoEO.getIsRelateAccess().equals("1")?"是":"否"): "";
                 break;
             case "年度":
-                value = sarStandardsInfoEO.getLawsYear();
+                value = verifyBean(sarStandardsInfoEO.getLawsYear());
                 break;
             case "福田转发通知文号":
-                value = sarStandardsInfoEO.getLawsNotisyncNum();
+                value = verifyBean(sarStandardsInfoEO.getLawsNotisyncNum());
                 break;
             case "信息简报":
-                value = sarStandardsInfoEO.getLawsBulletin();
+                value = verifyBean(sarStandardsInfoEO.getLawsBulletin());
                 break;
             case "标签":
-                value = sarStandardsInfoEO.getLawsLabel();
+                value = verifyBean(sarStandardsInfoEO.getLawsLabel());
                 break;
             case "备注":
-                value = sarStandardsInfoEO.getLawsRemark();
+                value = verifyBean(sarStandardsInfoEO.getLawsRemark());
                 break;
             default:
                 String field = attrInfoMap.get(name);
@@ -173,4 +173,14 @@ public class LawsStandExportUtil {
         return value;
     }
 
+    private static String verifyBean(String value){
+        String val = "";
+        if(StringUtils.isNotBlank(value)){
+            val =value;
+        }else {
+            val = "";
+        }
+        return val;
+    }
+
 }

adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java

@@ -101,23 +101,28 @@ public class StandExportUtil {
         Map<String,Object> attrValueMap = sarStandardsInfoEO.getAttrInfoMap();
         switch (name) {
             case "标准性质":
-                value = sarStandardsInfoEO.getStandNatureShow();
+                value = verifyBean(sarStandardsInfoEO.getStandNatureShow());
                 break;
             case "是否纳入认证清单":
-                switch (sarStandardsInfoEO.getIsRelateAccess()){
-                    case "0": value="否"; break;
-                    case "1": value="是"; break;
-                    default:value="";
+                boolean notBlank = StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess());
+                if (notBlank) {
+                    switch (sarStandardsInfoEO.getIsRelateAccess()){
+                        case "0": value="否"; break;
+                        case "1": value="是"; break;
+                        default:value="";
+                    }
+                }else {
+                    value = "";
                 }
                 break;
             case "标准体系":
-                value = sarStandardsInfoEO.getStandSystem();
+                value = verifyBean(sarStandardsInfoEO.getStandSystem());
                 break;
             case "适用区域":
-                value = sarStandardsInfoEO.getCountryShow();
+                value = verifyBean(sarStandardsInfoEO.getCountryShow());
                 break;
             case "标准类别":
-                value = sarStandardsInfoEO.getStandSortShow();
+                value = verifyBean(sarStandardsInfoEO.getStandSortShow());
                 break;
             case "重要度":
                 if (StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess())) {
@@ -130,19 +135,19 @@ public class StandExportUtil {
                 value = sarStandardsInfoEO.getIsRelateAccess();
                 break;
             case "标准编号":
-                value = sarStandardsInfoEO.getStandNumber();
+                value = verifyBean(sarStandardsInfoEO.getStandNumber());
                 break;
             case "标准年份":
-                value = sarStandardsInfoEO.getStandYear();
+                value = verifyBean(sarStandardsInfoEO.getStandYear());
                 break;
             case "中文名称":
-                value = sarStandardsInfoEO.getStandName();
+                value = verifyBean(sarStandardsInfoEO.getStandName());
                 break;
             case "英文名称":
-                value = sarStandardsInfoEO.getStandEnName();
+                value = verifyBean(sarStandardsInfoEO.getStandEnName());
                 break;
             case "文本状态":
-                value = sarStandardsInfoEO.getStandTextStatusShow();
+                value = verifyBean(sarStandardsInfoEO.getStandTextStatusShow());
                 break;
             case "发布日期":
                 if (sarStandardsInfoEO.getIssueTime() != null) {
@@ -154,7 +159,7 @@ public class StandExportUtil {
                 }
                 break;
             case "文本说明":
-                value = sarStandardsInfoEO.getSynopsis();
+                value = verifyBean(sarStandardsInfoEO.getSynopsis());
                 break;
             default:
                 String field = attrInfoMap.get(name);
@@ -166,4 +171,14 @@ public class StandExportUtil {
         return value;
     }
 
+    private static String verifyBean(String value){
+        String val = "";
+        if(StringUtils.isNotBlank(value)){
+            val =value;
+        }else {
+            val = "";
+        }
+        return val;
+    }
+
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -348,6 +348,55 @@
 
 
     <!-- 分页查询条件 -->
+    <sql id="standSort_in">
+        ORDER BY
+        CASE
+            when tmp_tb.stand_code like concat('%', 'Q/FT A', '%')  THEN 0
+            when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1
+            when tmp_tb.stand_code like concat('%', 'Q/FT E', '%') THEN 2
+            when tmp_tb.stand_code like concat('%', 'Q/FT F', '%') THEN 3
+            when tmp_tb.stand_code like concat('%', 'Q/FT G', '%') THEN 4
+            when tmp_tb.stand_code like concat('%', 'Q/FT M', '%') THEN 5
+            when tmp_tb.stand_code like concat('%', 'Q/FT Q', '%') THEN 6
+            when tmp_tb.stand_code like concat('%', 'Q/FT R', '%') THEN 7
+            when tmp_tb.stand_code like concat('%', 'Q/FT S', '%') THEN 8
+            when tmp_tb.stand_code like concat('%', 'Q/FT T', '%') THEN 9
+            when tmp_tb.stand_code like concat('%', 'Q/FT V', '%') THEN 10
+            when tmp_tb.stand_code like concat('%', 'Q/FT X', '%') THEN 11
+            when tmp_tb.stand_code like concat('%', 'Q/FT Y', '%') THEN 12
+            when tmp_tb.stand_code like concat('%', 'Q/FT Z', '%') THEN 13
+            when tmp_tb.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14
+            when tmp_tb.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15
+            when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16
+            ELSE 17
+        END,
+        tmp_tb.stand_sort ASC
+    </sql>
+    <sql id="standSort_out">
+        ORDER BY
+        CASE
+            when tmp_tb.stand_code like concat('%', 'Q/FT A', '%')  THEN 0
+            when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1
+            when tmp_tb.stand_code like concat('%', 'Q/FT E', '%') THEN 2
+            when tmp_tb.stand_code like concat('%', 'Q/FT F', '%') THEN 3
+            when tmp_tb.stand_code like concat('%', 'Q/FT G', '%') THEN 4
+            when tmp_tb.stand_code like concat('%', 'Q/FT M', '%') THEN 5
+            when tmp_tb.stand_code like concat('%', 'Q/FT Q', '%') THEN 6
+            when tmp_tb.stand_code like concat('%', 'Q/FT R', '%') THEN 7
+            when tmp_tb.stand_code like concat('%', 'Q/FT S', '%') THEN 8
+            when tmp_tb.stand_code like concat('%', 'Q/FT T', '%') THEN 9
+            when tmp_tb.stand_code like concat('%', 'Q/FT V', '%') THEN 10
+            when tmp_tb.stand_code like concat('%', 'Q/FT X', '%') THEN 11
+            when tmp_tb.stand_code like concat('%', 'Q/FT Y', '%') THEN 12
+            when tmp_tb.stand_code like concat('%', 'Q/FT Z', '%') THEN 13
+            when tmp_tb.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14
+            when tmp_tb.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15
+            when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16
+            ELSE 17
+        END,
+        tmp_tb.stand_sort ASC,
+        tmp_tb.issue_time is null,tmp_tb.issue_time desc,tmp_tb.id
+    </sql>
     <sql id="SarBussionInfo_Where_Clause">
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
         left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
@@ -585,7 +634,9 @@
         <if test="sql != null and sql != ''" >
             ORDER BY ${sql}
         </if>
-        ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+        ) tmp_tb
+        <include refid="standSort_in"/>
+        limit ${pager.startIndex-1},${pageSize}) a
     </select>
 
     <!--    企标复审使用-->
@@ -626,13 +677,13 @@
 
     <!-- 条件查询后，用于导出标准信息数据-->
     <select id="getSarBussionessStand" resultMap="BaseResultMapExcel" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
-        select <include refid="Base_Column_List_show" />
-        from SAR_BUSSIONESS_STAND
-        <include refid="SarBussionInfo_Where_Clause"/>
-        GROUP BY <include refid="Group_Column_List_show"/>
-        <if test="pager.orderCondition != null and pager.orderCondition != ''" >
-            ${pager.orderCondition}
-        </if>
+        SELECT * FROM (
+            select <include refid="Base_Column_List_show" />
+            from SAR_BUSSIONESS_STAND
+            <include refid="SarBussionInfo_Where_Clause"/>
+            GROUP BY <include refid="Group_Column_List_show"/>
+        ) tmp_tb
+        <include refid="standSort_in"/>
     </select>
 
 

adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml

@@ -37,8 +37,15 @@
 
 <!--    只查询这个部门下的子一级人员-->
     <select id="selectNextUser" resultMap="TsUser">
-        select * from ts_user
+        select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,
+        ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE,
+        ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE,
+        ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname
+        from ts_user
 		WHERE institution_id=#{institutionId}
+		<if test="userName != null and userName != '' ">
+            and ( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') )
+        </if>
     </select>
 
     <select id="selectTreeByIds" resultMap="TsInstitution">

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsMenu/SarLawsMenuMapper.xml

@@ -159,11 +159,14 @@
     <select id="selectMenuByMenuParentId" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
         select <include refid="Base_Column_List"/> from SAR_LAWS_MENU
         where laws_id = #{lawsId} and valid_flag=0
-        and MENU_ID in (select SAR_MENU.id from SAR_MENU where VALID_FLAG=0 start with id=#{menuId} connect by prior id= parent_id)
+        and MENU_ID in
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </select>
 
     <update id="updateByLawsIdAndMenuId" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu" >
-        update SAR_BUSS_STAND_MENU
+        update SAR_LAWS_MENU
         <set >
             <if test="menuId != null" >
                 menu_id = #{menuId},
@@ -179,8 +182,10 @@
     <delete id="deleteByMenuId" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu">
         delete from SAR_LAWS_MENU
         where laws_id = #{lawsId}
-        and MENU_ID in (select SAR_MENU.id from SAR_MENU
-        where VALID_FLAG=0 start with id=#{oldMenuId} connect by prior id= parent_id)
+        and MENU_ID in
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </delete>
     <select id="selectAllMenuByStandId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu">
         select <include refid="Base_Column_List" />

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml

@@ -78,7 +78,7 @@
     </sql>
 
     <sql id="SarStandardsInfo_in_left">
-        left join SAR_STAND_MENU ON SAR_LAWS_STAND_INFO.id = SAR_STAND_MENU.stand_id
+        left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
         where 1=1 and SAR_LAWS_STAND_INFO.valid_flag=0
         <trim suffixOverrides=",">
             <!--                     基本搜索项                         -->
@@ -146,7 +146,7 @@
             </if>
             <!--  目录判断 -->
             <if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null">
-                and SAR_STAND_MENU.MENU_ID in
+                and SAR_LAWS_MENU.MENU_ID in
                 <foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -154,7 +154,7 @@
             </if>
             <!--  新修改需求，根据角色查询有权限的菜单数据-->
             <if test="menuRoleList != null">
-                and SAR_STAND_MENU.MENU_ID in
+                and SAR_LAWS_MENU.MENU_ID in
                 <foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -226,8 +226,8 @@
         AND dicstandTextStatus.dic_id IS NOT NULL
         AND dicstandTextStatus.valid_flag = 0
         )
-        left join SAR_STAND_MENU ON SAR_LAWS_STAND_INFO.id = SAR_STAND_MENU.stand_id
-        left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
+        left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
+        left join TS_RESOURCE on SAR_LAWS_MENU.menu_id = TS_RESOURCE.id
         where SAR_LAWS_STAND_INFO.id = #{id}
     </select>
 
@@ -290,7 +290,7 @@
             a.*,
         dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
         from (select <include refid="Base_Column_List_Show"/>
-        from SAR_LAWS_ATTR_INFO
+        from SAR_LAWS_STAND_INFO
         <include refid="SarStandardsInfo_in_left"/>) a
         <include refid="SarStandardsInfo_out_left"/>
         order by a.issue_time is null,a.issue_time desc,a.id

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml

@@ -159,6 +159,31 @@
 
         limit ${(page-1)*size},${page*size}
     </select>
+
+    <select id="selectPagessolostar" resultType="java.lang.String">
+        SELECT
+        <if test="type == 'ProjectClassification' ">
+            distinct library.project_classification
+        </if>
+        <if test="type == 'ProjectStatus' ">
+            distinct library.project_status
+        </if>
+        FROM
+        sar_stand_project_library as library
+        LEFT JOIN sar_stand_project_team as team
+        ON team.project_code = library.project_number
+        WHERE
+        <if test="flag == 1">
+            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+        </if>
+        <if test="flag == 2">
+            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
+        </if>
+        <if test="flag == 4">
+            1=1
+        </if>
+    </select>
+
     <select id="selectPagesWorkFlow"
             resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
         SELECT
@@ -223,6 +248,36 @@
         limit ${(page-1)*size},${page*size}
 
     </select>
+
+    <select id="selectPagesWorkFlowsolostar"
+            resultType="java.lang.String">
+        SELECT
+        <if test="type == 'ProjectClassification' ">
+            distinct library.project_classification
+        </if>
+        <if test="type == 'ProjectStatus' ">
+            distinct library.project_status
+        </if>
+        FROM
+        sar_stand_project_library as library
+        LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number
+        WHERE
+        (
+        library.id IN (
+        SELECT DISTINCT
+        project_id
+        FROM
+        sar_stand_project_relation
+        WHERE
+        project_id NOT IN (
+        SELECT DISTINCT
+        STAND_ID
+        FROM
+        sar_stand_items
+        )
+        )
+        )
+    </select>
     <select id="selectCountWorkFlow" resultType="java.lang.Integer">
         SELECT
         count(

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -54,6 +54,27 @@
      SAR_STANDARDS_INFO.synopsis, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
      SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,SAR_STANDARDS_INFO.is_relate_access,SAR_STANDARDS_INFO.cite_stand,SAR_STANDARDS_INFO.cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
   </sql>
+    <sql id="Base_Column_List_DIS" >
+        DISTINCT SAR_STANDARDS_INFO.id,
+        SAR_STANDARDS_INFO.stand_type,
+        SAR_STANDARDS_INFO.country,
+        SAR_STANDARDS_INFO.stand_sort,
+        SAR_STANDARDS_INFO.stand_number,
+        SAR_STANDARDS_INFO.stand_year,
+        SAR_STANDARDS_INFO.stand_name,
+        SAR_STANDARDS_INFO.stand_en_name,
+        SAR_STANDARDS_INFO.stand_state,
+        SAR_STANDARDS_INFO.stand_nature,
+        SAR_STANDARDS_INFO.issue_time,
+        SAR_STANDARDS_INFO.put_time,
+        SAR_STANDARDS_INFO.text_status,
+        SAR_STANDARDS_INFO.creation_user,
+        SAR_STANDARDS_INFO.valid_flag,
+        SAR_STANDARDS_INFO.creation_time,
+        SAR_STANDARDS_INFO.modify_time,
+        SAR_STANDARDS_INFO.STAND_SYSTEM,
+        SAR_STANDARDS_INFO.IS_RELATE_ACCESS
+    </sql>
 
     <sql id="Base_Column_List_Show" >
      SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort,
@@ -544,6 +565,264 @@
         </trim>
     </sql>
 
+    <sql id="standSort_in">
+        <if test='page.standType != null and page.standType == "INLAND"'>
+            ORDER BY
+            CASE tmp_tb.stand_sort
+            when 'GB' THEN 0
+            when 'GB/T' THEN 1
+            when 'QC/T' THEN 2
+            when 'JT' THEN 3
+            when 'JB' THEN 4
+            when 'GA' THEN 5
+            when 'GJB' THEN 6
+            when 'HJ' THEN 7
+            ELSE 8
+            END,
+            tmp_tb.stand_sort ASC
+        </if>
+        <if test='page.standType != null and page.standType == "FOREIGN"'>
+            ORDER BY
+            CASE tmp_tb.stand_sort
+            when 'ECE' THEN 0
+            when 'EU' THEN 1
+            when 'EC' THEN 2
+            when 'EEC' THEN 3
+            when 'ISO' THEN 4
+            when 'IEC' THEN 5
+            when 'GTR' THEN 6
+            when 'CFR' THEN 7
+            when 'JASO' THEN 8
+            when 'JIS' THEN 9
+            when 'GSO' THEN 10
+            when 'GOST' THEN 11
+            when 'ΓOCT' THEN 12
+            when 'TP' THEN 13
+            when 'SASO' THEN 14
+            when 'UAE' THEN 15
+            when 'CONTRAN' THEN 16
+            when 'DENATRAN' THEN 17
+            when 'ABNT NBR' THEN 18
+            when 'NBR' THEN 19
+            when 'INMETRO' THEN 20
+            when 'CONAMA' THEN 21
+            when 'Normative Instruction' THEN 22
+            when 'ADR' THEN 23
+            ELSE 24
+            END,
+            tmp_tb.stand_sort ASC
+        </if>
+    </sql>
+    <sql id="standSort_out">
+        <if test='standType != null and standType == "INLAND"'>
+            CASE a.stand_sort
+            when 'GB' THEN 0
+            when 'GB/T' THEN 1
+            when 'QC/T' THEN 2
+            when 'JT' THEN 3
+            when 'JB' THEN 4
+            when 'GA' THEN 5
+            when 'GJB' THEN 6
+            when 'HJ' THEN 7
+            ELSE 8
+            END,
+            a.stand_sort ASC,
+        </if>
+        <if test='standType != null and standType == "FOREIGN"'>
+            CASE a.stand_sort
+            when 'ECE' THEN 0
+            when 'EU' THEN 1
+            when 'EC' THEN 2
+            when 'EEC' THEN 3
+            when 'ISO' THEN 4
+            when 'IEC' THEN 5
+            when 'GTR' THEN 6
+            when 'CFR' THEN 7
+            when 'JASO' THEN 8
+            when 'JIS' THEN 9
+            when 'GSO' THEN 10
+            when 'GOST' THEN 11
+            when 'ΓOCT' THEN 12
+            when 'TP' THEN 13
+            when 'SASO' THEN 14
+            when 'UAE' THEN 15
+            when 'CONTRAN' THEN 16
+            when 'DENATRAN' THEN 17
+            when 'ABNT NBR' THEN 18
+            when 'NBR' THEN 19
+            when 'INMETRO' THEN 20
+            when 'CONAMA' THEN 21
+            when 'Normative Instruction' THEN 22
+            when 'ADR' THEN 23
+            ELSE 24
+            END,
+            a.stand_sort ASC,
+        </if>
+    </sql>
+
+    <sql id="standSort_out_2">
+        <if test='page.standType != null and page.standType == "INLAND"'>
+            CASE a.stand_sort
+            when 'GB' THEN 0
+            when 'GB/T' THEN 1
+            when 'QC/T' THEN 2
+            when 'JT' THEN 3
+            when 'JB' THEN 4
+            when 'GA' THEN 5
+            when 'GJB' THEN 6
+            when 'HJ' THEN 7
+            ELSE 8
+            END,
+            a.stand_sort ASC,
+        </if>
+        <if test='page.standType != null and page.standType == "FOREIGN"'>
+            CASE a.stand_sort
+            when 'ECE' THEN 0
+            when 'EU' THEN 1
+            when 'EC' THEN 2
+            when 'EEC' THEN 3
+            when 'ISO' THEN 4
+            when 'IEC' THEN 5
+            when 'GTR' THEN 6
+            when 'CFR' THEN 7
+            when 'JASO' THEN 8
+            when 'JIS' THEN 9
+            when 'GSO' THEN 10
+            when 'GOST' THEN 11
+            when 'ΓOCT' THEN 12
+            when 'TP' THEN 13
+            when 'SASO' THEN 14
+            when 'UAE' THEN 15
+            when 'CONTRAN' THEN 16
+            when 'DENATRAN' THEN 17
+            when 'ABNT NBR' THEN 18
+            when 'NBR' THEN 19
+            when 'INMETRO' THEN 20
+            when 'CONAMA' THEN 21
+            when 'Normative Instruction' THEN 22
+            when 'ADR' THEN 23
+            ELSE 24
+            END,
+            a.stand_sort ASC,
+        </if>
+    </sql>
+
+    <sql id="SarStandardsInfo_in_left_2">
+        left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+        where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
+        <trim suffixOverrides=",">
+            <!-- 标准分类 国内标准，国外标准  必要搜索项                 -->
+            <if test='page.standType != null and page.standType != "ALL"'>
+                and stand_type = #{page.standType}
+            </if>
+            <!--                     基本搜索项                         -->
+            <!-- 国家、地区 -->
+            <if test="page.country != null and page.country != ''">
+                and country = #{page.country}
+            </if>
+            <!-- 标准编号111 -->
+            <if test="page.standNumber != null and page.standNumber != ''">
+                and (
+                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{page.standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{page.standNumber}),'%')
+                and SAR_STANDARDS_INFO.STAND_YEAR = '')
+                or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
+                )
+            </if>
+            <!-- 标准名称 -->
+            <if test="page.standName != null and page.standName != ''">
+                and stand_name like concat(concat('%',#{page.standName}),'%')
+                or STAND_NUMBER like concat(concat('%',#{page.standName}),'%')
+                or STAND_YEAR like concat(concat('%',#{page.standName}),'%')
+                or STAND_SORT like concat(concat('%',#{page.standName}),'%')
+            </if>
+            <if test="page.standEnName != null and page.standEnName != ''">
+                and stand_en_name like concat(concat('%',#{page.standEnName}),'%')
+            </if>
+            <!-- 标准状态 -->
+            <if test="page.standState != null and page.standState != ''">
+                and stand_state = #{page.standState}
+            </if>
+            <!--                   高级检索项                          -->
+            <!--  标准性质 -->
+            <if test="page.standNature != null and page.standNature != ''">
+                and stand_nature = #{page.standNature}
+            </if>
+            <!--  代替标准  允许输入的时候输入多个-->
+            <if test="page.replaceStandNum != null and page.replaceStandNum != ''">
+                and replace_stand_num like concat(concat('%',#{page.replaceStandNum}),'%')
+            </if>
+            <!--  被代替标准 -->
+            <if test="page.replacedStandNum != null and page.replacedStandNum != ''">
+                and replaced_stand_num like concat(concat('%',#{page.replacedStandNum}),'%')
+            </if>
+            <if test="page.isRelateAccess != null and page.isRelateAccess != ''" >
+                and is_relate_access = #{page.isRelateAccess}
+            </if>
+            <!--  目录判断 -->
+            <if test="page.menuId != null and page.menuId !='nomenu' and page.menuAllChildrenIdList != null">
+                and SAR_STAND_MENU.MENU_ID in
+                <foreach collection="page.menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+
+            </if>
+            <!--  新修改需求，根据角色查询有权限的菜单数据-->
+            <if test="page.menuRoleList != null">
+                and SAR_STAND_MENU.MENU_ID in
+                <foreach collection="page.menuRoleList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <!--            <if test="(menuId == null or menuId =='') and standType =='FOREIGN'">-->
+            <!--                and SAR_STAND_MENU.MENU_ID in (-->
+            <!--                select TS_RESOURCE.id from TS_RESOURCE start with id=(select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null-->
+            <!--                and sor_divide-->
+            <!--                ='FOREIGN_STAND') connect by prior id= parent_id-->
+            <!--                )-->
+            <!--            </if>-->
+            <!-- 导出数据过程中，选择的id -->
+            <if test="page.idlist != null">
+                and SAR_STANDARDS_INFO.id in
+                <foreach collection="page.idlist" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="page.standSort != null and page.standSort != ''" >
+                and SAR_STANDARDS_INFO.stand_sort = #{page.standSort}
+            </if>
+            <!--标准年份-->
+            <if test="page.standYear != null and page.standYear != ''">
+                and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear}
+            </if>
+            <if test="page.issueTime != null and page.issueTime != ''">
+                and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{page.issueTime}
+            </if>
+            <!--内容摘要-->
+            <if test="page.synopsis != null and page.synopsis != ''" >
+                AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0
+            </if>
+
+            <!--文本状态-->
+            <if test="page.textStatus != null and page.textStatus != ''" >
+                and SAR_STANDARDS_INFO.TEXT_STATUS = #{page.textStatus}
+            </if>
+            <!--是否纳入法规清单-->
+            <if test="page.isRelateAccess != null and page.isRelateAccess != ''" >
+                and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{page.isRelateAccess}
+            </if>
+
+            <if test="page.collectMenuId != null and page.collectMenuId != ''">
+                and SAR_STANDARDS_INFO.id in (
+                select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
+                and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
+                and TS_PERSON_COLLECT.user_id=#{page.userId}
+                )
+            </if>
+        </trim>
+    </sql>
+
     <sql id="SarStandardsInfo_in_left">
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
@@ -559,13 +838,9 @@
             </if>
             <!-- 标准编号111 -->
             <if test="standNumber != null and standNumber != ''">
-                and (
+                and
                 (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
                 SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
-                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
-                and SAR_STANDARDS_INFO.STAND_YEAR = '')
-                or (stand_name like concat(concat('%',#{standNumber}),'%'))
-                )
             </if>
             <!-- 标准名称 -->
             <if test="standName != null and standName != ''">
@@ -605,36 +880,6 @@
                 </foreach>
 
             </if>
-            <!-- 游离态标准查询 -->
-            <!-- <if test="menuId != null and menuId =='nomenu' and standType =='INLAND'">
-                and SAR_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide
-                ='INLAND_STAND')
-                &lt;!&ndash;-查询游离态标准，编号和名称是分开的 &ndash;&gt;
-                <if test="standNumber != null">
-                    and ((concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                    SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null)
-                    or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
-                    and SAR_STANDARDS_INFO.STAND_YEAR is null))
-                </if>
-            </if>
-            <if test="menuId != null and menuId =='nomenu' and standType =='FOREIGN'">
-                and SAR_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide
-                ='FOREIGN_STAND')
-                <if test="standNumber != null">
-                    and ((concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                    SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null)
-                    or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
-                    and SAR_STANDARDS_INFO.STAND_YEAR is null))
-                </if>
-            </if> -->
-            <!--  当第一次进入页面未选择记录时-->
-            <!--            <if test="(menuId == null or menuId =='') and standType =='INLAND'">-->
-            <!--                and SAR_STAND_MENU.MENU_ID in (-->
-            <!--                select TS_RESOURCE.id from TS_RESOURCE start with id=(select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null-->
-            <!--                and sor_divide-->
-            <!--                ='INLAND_STAND') connect by prior id= parent_id-->
-            <!--                )-->
-            <!--            </if>-->
             <!--  新修改需求，根据角色查询有权限的菜单数据-->
             <if test="menuRoleList != null">
                 and SAR_STAND_MENU.MENU_ID in
@@ -699,19 +944,19 @@
         )
         left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = a.id and SAR_STAND_ATTR_INFO.valid_flag=0)
         where 1=1
-        <if test='labelMenuId != null and labelMenuId == "gxhbq"'>
+        <if test='page.labelMenuId != null and page.labelMenuId == "gxhbq"'>
             and SAR_STAND_ATTR_INFO.GXHBQ is not null
         </if>
-        <if test='labelMenuId != null and labelMenuId != "gxhbq"'>
-            and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%')
+        <if test='page.labelMenuId != null and page.labelMenuId != "gxhbq"'>
+            and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%')
         </if>
         <!--适用车型-->
-        <if test="applyArctic != null and applyArctic != ''">
-            and SAR_STAND_ATTR_INFO.CLLX = #{applyArctic}
+        <if test="page.applyArctic != null and page.applyArctic != ''">
+            and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
         </if>
         <trim suffixOverrides=",">
-            <if test="advanceSearchStr != null and advanceSearchStr != ''">
-                and (${advanceSearchStr})
+            <if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
+                and (${page.advanceSearchStr})
             </if>
         </trim>
     </sql>
@@ -747,31 +992,20 @@
         (select tmp_tb.*  from
         (
         SELECT
-        DISTINCT SAR_STANDARDS_INFO.id,
-        SAR_STANDARDS_INFO.stand_type,
-        SAR_STANDARDS_INFO.country,
-        SAR_STANDARDS_INFO.stand_sort,
-        SAR_STANDARDS_INFO.stand_number,
-        SAR_STANDARDS_INFO.stand_year,
-        SAR_STANDARDS_INFO.stand_name,
-        SAR_STANDARDS_INFO.stand_en_name,
-        SAR_STANDARDS_INFO.stand_state,
-        SAR_STANDARDS_INFO.stand_nature,
-        SAR_STANDARDS_INFO.issue_time,
-        SAR_STANDARDS_INFO.put_time,
-        SAR_STANDARDS_INFO.text_status,
-        SAR_STANDARDS_INFO.creation_user,
-        SAR_STANDARDS_INFO.valid_flag,
-        SAR_STANDARDS_INFO.creation_time,
-        SAR_STANDARDS_INFO.modify_time,
-        SAR_STANDARDS_INFO.STAND_SYSTEM,
-        SAR_STANDARDS_INFO.IS_RELATE_ACCESS
+        <include refid="Base_Column_List_DIS"/>
         from SAR_STANDARDS_INFO
-        <include refid="SarStandardsInfo_in_left"/>
-        ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+        <include refid="SarStandardsInfo_in_left_2"/>
+        <if test="mark == 999 ">
+            and  sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
+        </if>
+        ) tmp_tb
+        <include refid="standSort_in"/>
+        limit ${page.pager.startIndex-1},${page.pageSize}
+        ) a
         <include refid="SarStandardsInfo_out_left"/>
         order by
-        ${orderByA} ${order1},a.id
+        <include refid="standSort_out_2"/>
+        ${page.orderByA} ${page.order1},a.id
     </select>
     <!--FIELD(SAR_STANDARDS_INFO.issue_time,'已发布'), FIELD(SAR_STANDARDS_INFO.issue_time,'TBD'), FIELD(SAR_STANDARDS_INFO.issue_time,'N/A') ,-->
     <!--if(isnull(SAR_STANDARDS_INFO.issue_time),0,1) desc  ,-->
@@ -901,11 +1135,16 @@
 
     <select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
             parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
-        select<include refid="Base_Column_List_Show"/>
-        from SAR_STANDARDS_INFO
-        <include refid="SarStandardsInfo_Where_Clause"/>
-        GROUP BY <include refid="Group_Column_List_Show"/>
-        order by SAR_STANDARDS_INFO.issue_time is null,SAR_STANDARDS_INFO.issue_time desc,SAR_STANDARDS_INFO.id
+        select a.* from (
+            select<include refid="Base_Column_List_Show"/>
+            from SAR_STANDARDS_INFO
+            <include refid="SarStandardsInfo_Where_Clause"/>
+            GROUP BY <include refid="Group_Column_List_Show"/>
+        ) a
+        order by
+        <include refid="standSort_out"/>
+        a.issue_time is null
+        ,a.issue_time desc,a.id
     </select>
 
     <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">

adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgDept.dao.WgDeptDao">
+
+    <select id="researchDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
+        select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId
+        ,ts_user.INSTITUTION_NAME as deptName
+        from wg_dept
+        left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
+        where wg_dept.wg_id =#{data}
+    </select>
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgMeetingInfo.dao.WgMeetingInfoDao">
+
+    <resultMap id="WgMeetingInfos" type="com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo">
+
+        <id property="id" column="id"/>
+        <result property="wgId" column="wg_id"/>
+        <result property="meetingTime" column="meeting_time"/>
+        <result property="meetingName" column="meeting_name"/>
+        <result property="meetingReport" column="meeting_report"/>
+        <result property="joinfile" column="joinfile"/>
+        <result property="joinId" column="join_id"/>
+        <association property="joinMeetingPeopleInfo" javaType="java.util.List" column="id"
+                     select="com.adc.da.slrs.wgMeetingUserRelation.dao.WgMeetingUserRelationDao.getMeetingPeoples"/>
+    </resultMap>
+
+
+    <select id="researchDatas" resultMap="WgMeetingInfos">
+      select * from  wg_meeting_info where wg_meeting_info.wg_id = #{data}
+    </select>
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgMeetingUserRelation.dao.WgMeetingUserRelationDao">
+
+
+    <select id="getMeetingPeoples"
+            resultType="com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow">
+        select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation
+        left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id
+        where wg_meeting_user_relation.meeting_id = #{meetId}
+    </select>
+</mapper>