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

adc-da-slrs/src/main/java/com/adc/da/common/SarTypeEnum.java

@@ -11,6 +11,7 @@ public enum SarTypeEnum {
 	FOREIGN_STAND("FOREIGN_STAND","国外标准法规"),FOREIGN_LAWS("FOREIGN_LAWS","国外政策"),
 	STAND("STAND","国内外标准法规"),
 	LAWS("LAWS","国内外政策"),
+	LAWS_STAND("LAWS_STAND","国内外政策"),
 	BUSINESS("BUSINESS","企业标准"),
 	BUSS("BUSS","企业标准"),
 	SPLIT("SPLIT","标准拆分"),

adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java

@@ -71,7 +71,7 @@ public class CreateMQService {
         }
 
         //发送消息队列
-        this.rabbitTemplate.convertAndSend("convert-exchange_SQ_GSAR", "convert-key_SQ_GSAR", convertInfo);
+        this.rabbitTemplate.convertAndSend("convert-exchange_SQ_GSAR_RELEASE", "convert-key_SQ_GSAR_RELEASE", convertInfo);
     }
 
 }

adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java

@@ -2,6 +2,7 @@ package com.adc.da.mq;
 
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
+import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo;
 import net.sf.json.JSONObject;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,18 +30,20 @@ public class CreateStandMQService {
         standMap.put("addOrUpdate", addOrUpdate);
 
         //发送消息队列
-        this.rabbitTemplate.convertAndSend("stand-exchange_SQ_GSAR", "stand-key_SQ_GSAR", standMap);
+        this.rabbitTemplate.convertAndSend("stand-exchange_SQ_GSAR_RELEASE", "stand-key_SQ_GSAR_RELEASE", standMap);
     }
 
-    public void sendLawsMQ(SarLawsInfo sarLawsInfoEO, String addOrUpdate) throws Exception{
-        JSONObject json = JSONObject.fromObject(sarLawsInfoEO);
-        String sarLawsInfoStr = json.toString();
+    public void sendLawsMQ(SarLawsStandInfo sarLawsStandInfo, String addOrUpdate) throws Exception{
+//        JSONObject json = JSONObject.fromObject(sarLawsStandInfo);
+        com.alibaba.fastjson.JSONObject object = (com.alibaba.fastjson.JSONObject) com.alibaba.fastjson.JSONObject.toJSON(sarLawsStandInfo);
+
+        String sarLawsInfoStr = object.toString();
         Map<String,Object> lawsMap = new HashMap<String,Object>();
         lawsMap.put("sarLaws", sarLawsInfoStr);
         lawsMap.put("addOrUpdate", addOrUpdate);
 
         //发送消息队列
-        this.rabbitTemplate.convertAndSend("laws-exchange_SQ_GSAR", "laws-key_SQ_GSAR", lawsMap);
+        this.rabbitTemplate.convertAndSend("laws-exchange_SQ_GSAR_RELEASE", "laws-key_SQ_GSAR_RELEASE", lawsMap);
     }
 
     public void sendBussStandMQ(Object sarBussionessStandEO, String addOrUpdate) throws Exception{
@@ -51,7 +54,7 @@ public class CreateStandMQService {
         bussMap.put("addOrUpdate", addOrUpdate);
 
         //发送消息队列
-        this.rabbitTemplate.convertAndSend("buss-exchange_SQ_GSAR", "buss-key_SQ_GSAR", bussMap);
+        this.rabbitTemplate.convertAndSend("buss-exchange_SQ_GSAR_RELEASE", "buss-key_SQ_GSAR_RELEASE", bussMap);
     }
 
 }

adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java

@@ -45,9 +45,9 @@ public class SendBussMQService {
 
 
     @RabbitListener(bindings = @QueueBinding(
-            value = @Queue(value = "createBussMQ_SQ_GSAR", durable = "true"),
-            exchange = @Exchange(value = "buss-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"),
-            key = "buss-key_SQ_GSAR"))
+            value = @Queue(value = "createBussMQ_SQ_GSAR_RELEASE", durable = "true"),
+            exchange = @Exchange(value = "buss-exchange_SQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"),
+            key = "buss-key_SQ_GSAR_RELEASE"))
     public void createMQ(Map<String,Object> bussMap, Message message, Channel channel) throws Exception{
         try{
             try{

adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java

@@ -0,0 +1,324 @@
+package com.adc.da.mq;
+
+import com.adc.da.slrs.otSvpps.service.IOtSvppsService;
+import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
+import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo;
+import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
+import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.adc.da.sys.dao.DicTypeEODao;
+import com.adc.da.utils.util.InitStandAttrUtil;
+import com.alibaba.fastjson.JSON;
+import com.rabbitmq.client.Channel;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
+import org.json.JSONTokener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.Message;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Component
+public class SendLawsMQService {
+
+    @Autowired
+    private ISarStandardsInfoService sarStandardsInfoService;
+
+    @Autowired
+    private SysInfoEOService sysInfoEOService;
+
+    @Autowired
+    private DicTypeEODao dicTypeEODao;
+
+    private static final Logger logger = LoggerFactory.getLogger(SendLawsMQService.class);
+
+
+    @RabbitListener(bindings = @QueueBinding(
+            value = @Queue(value = "createLawsMQ_SQ_GSAR_RELEASE", durable = "true"),
+            exchange = @Exchange(value = "laws-exchange_SQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"),
+            key = "laws-key_SQ_GSAR_RELEASE"))
+    public void createMQ(Map<String,Object> bussMap, Message message, Channel channel) throws Exception{
+        try{
+            try{
+                Thread.sleep(5000);
+                insertOrUpdateBussInfo(bussMap);
+            }catch(InterruptedException e){
+                logger.error(e.toString());
+                Thread.currentThread().interrupt();
+            }
+        } catch (Exception e) {
+            logger.error("搜索中心国内外政策消息队列进入转换前失败！");
+            logger.error(e.getMessage(),e);
+        } finally {
+            Long tag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG);
+            channel.basicAck(tag,false);
+            logger.debug("消息确认成功！！！！！！！！！");
+        }
+    }
+
+    public void insertOrUpdateBussInfo(Map<String,Object> bussMap) throws Exception {
+        String addOrUpdate = bussMap.get("addOrUpdate").toString();
+        String sarBuss = bussMap.get("sarLaws").toString();
+        JSONObject jsonobject = JSONObject.fromObject(sarBuss);
+        SarLawsStandInfo infoEO = com.alibaba.fastjson.JSONObject.parseObject(sarBuss,SarLawsStandInfo.class);
+
+        if(infoEO.getMapItems() == null || infoEO.getMapItems().isEmpty()){
+            if(jsonobject.get("mapItems") != null){
+                infoEO.setMapItems(net.sf.json.JSONObject.fromObject(jsonobject.get("mapItems")));
+            }
+        }
+//        SarLawsStandInfo infoEO = (SarLawsStandInfo) JSONObject.toBean(jsonobject,SarLawsStandInfo.class);
+
+        String FZRQFSRQ = null;
+        if ("updateFromAct".equals(addOrUpdate)){
+            addOrUpdate = "update";
+            FZRQFSRQ = "1";
+        }
+
+        String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
+        Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
+        Map<String,Object> infoMap = infoEO.getAttrInfoCaseMap();
+        Map<String,String> infoEOMapItems = infoEO.getMapItems();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //修改索引信息表
+        // 往索引表中插入数据
+        String baseSearchContent = "";
+        String getCodeName = "";
+        Map<String,Object> saveMap = new HashMap<>();
+        saveMap.put("standType","laws");
+        //发布日期 高级查询
+        saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime()));
+        Date issue_time_data = null;
+        if (StringUtils.isNotBlank(infoEO.getIssueTime())) {
+            try {
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                issue_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00");
+            } catch (ParseException ignored) {
+            }
+        }
+        if (issue_time_data != null) {
+            saveMap.put("issue_time_data",issue_time_data.getTime());
+        }else{
+            saveMap.put("issue_time_data",-1000000000000000000L);
+        }
+
+        //征集意见周期-起始时间
+        saveMap.put("commentCycleStart",dateFormatToStr(infoEO.getCommentCycleStart()));
+        Date commentCycleStart_data = null;
+        if (StringUtils.isNotBlank(infoEO.getCommentCycleStart())) {
+            try {
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                commentCycleStart_data = format.parse(dateFormatToStr(infoEO.getCommentCycleStart())+" 00:00:00");
+            } catch (ParseException ignored) {
+            }
+        }
+        if (commentCycleStart_data != null) {
+            saveMap.put("commentCycleStart_data",commentCycleStart_data.getTime());
+        }else{
+            saveMap.put("commentCycleStart_data",-1000000000000000000L);
+        }
+
+        //征集意见周期-结束时间
+        saveMap.put("commentCycleEnd",dateFormatToStr(infoEO.getCommentCycleEnd()));
+        Date commentCycleEnd_data = null;
+        if (StringUtils.isNotBlank(infoEO.getCommentCycleStart())) {
+            try {
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                commentCycleEnd_data = format.parse(dateFormatToStr(infoEO.getCommentCycleStart())+" 00:00:00");
+            } catch (ParseException ignored) {
+            }
+        }
+        if (commentCycleEnd_data != null) {
+            saveMap.put("commentCycleEnd_data",commentCycleEnd_data.getTime());
+        }else{
+            saveMap.put("commentCycleEnd_data",-1000000000000000000L);
+        }
+
+        saveMap.put("id",infoEO.getId());
+        String lawsTypeName = "";
+        if(infoEO.getLawsTextState() != null && StringUtils.isNotBlank(infoEO.getLawsType())){
+            List<String> valArr = Arrays.asList(infoEO.getLawsType().split(","));
+            lawsTypeName = dicTypeEODao.getDicNamesByCodes(valArr);
+        }
+        saveMap.put("lawsType",infoEO.getLawsType());
+        saveMap.put("lawsTypeName",lawsTypeName);
+        saveMap.put("lawsNumber",infoEO.getLawsNumber());
+        saveMap.put("lawsName",infoEO.getLawsName());
+        saveMap.put("lawsEnName",infoEO.getLawsEnName());
+        saveMap.put("lawsNo",infoEO.getLawsNo());
+        saveMap.put("issueCompany",infoEO.getIssueCompany());
+        String lawsSyqyName = "";
+        if(infoEO.getLawsTextState() != null && StringUtils.isNotBlank(infoEO.getLawsSyqy())){
+            List<String> valArr = Arrays.asList(infoEO.getLawsSyqy().split(","));
+            lawsSyqyName = dicTypeEODao.getDicNamesByCodes(valArr);
+        }
+        saveMap.put("lawsSyqy",infoEO.getLawsSyqy());
+        saveMap.put("lawsSyqyName",lawsSyqyName);
+        String lawsSycxName = "";
+        if(infoEO.getLawsTextState() != null && StringUtils.isNotBlank(infoEO.getLawsSycx())){
+            List<String> valArr = Arrays.asList(infoEO.getLawsSycx().split(","));
+            lawsSycxName = dicTypeEODao.getDicNamesByCodes(valArr);
+        }
+        saveMap.put("lawsSycx",infoEO.getLawsSycx());
+        saveMap.put("lawsSycxName",lawsSycxName);
+        String isRelateAccessName = "";
+        if(infoEO.getIsRelateAccess() != null && StringUtils.isNotBlank(infoEO.getIsRelateAccess())){
+            if(infoEO.getIsRelateAccess().equals("1")){
+                isRelateAccessName = "是";
+            }else {
+                isRelateAccessName = "否";
+            }
+        }
+        saveMap.put("isRelateAccess",infoEO.getIsRelateAccess());
+        saveMap.put("isRelateAccessName",isRelateAccessName);
+        String lawsYearName = "";
+        if(infoEO.getLawsTextState() != null && StringUtils.isNotBlank(infoEO.getLawsYear())){
+            List<String> valArr = Arrays.asList(infoEO.getLawsYear().split(","));
+            lawsYearName = dicTypeEODao.getDicNamesByCodes(valArr);
+        }
+        saveMap.put("lawsYear",infoEO.getLawsYear());
+        saveMap.put("lawsYearName",lawsYearName);
+        saveMap.put("lawsNotisyncNum",infoEO.getLawsNotisyncNum());
+        saveMap.put("lawsBulletin",infoEO.getLawsBulletin());
+        String lawsLabelName = "";
+        if(infoEO.getLawsTextState() != null && StringUtils.isNotBlank(infoEO.getLawsLabel())){
+            List<String> valArr = Arrays.asList(infoEO.getLawsLabel().split(","));
+            lawsLabelName = dicTypeEODao.getDicNamesByCodes(valArr);
+        }
+        saveMap.put("lawsLabel",infoEO.getLawsLabel());
+        saveMap.put("lawsLabelName",lawsLabelName);
+        saveMap.put("lawsRemark",infoEO.getLawsRemark());
+        String lawsTextStateName = "";
+        if(infoEO.getLawsTextState() != null && StringUtils.isNotBlank(infoEO.getLawsTextState())){
+            List<String> valArr = Arrays.asList(infoEO.getLawsTextState().split(","));
+            lawsTextStateName = dicTypeEODao.getDicNamesByCodes(valArr);
+        }
+        saveMap.put("lawsTextState",infoEO.getLawsTextState());
+        saveMap.put("lawsTextStateName",lawsTextStateName);
+        //新加字段
+        saveMap.put("country",infoEO.getCountry());
+        if(StringUtils.isNotEmpty(infoEO.getCountry())){
+            String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getCountry());
+            saveMap.put("countryShow",codeName);
+        }
+        // 自定义属性字段
+        if (attrInfoMap != null && !attrInfoMap.isEmpty()) {
+            attrInfoMap = sysInfoEOService.changeSelectInfo(attrInfoMap, "laws",baseSearchContent);
+            saveMap.putAll(attrInfoMap);
+        }
+
+        saveMap.put("type","laws");
+        saveMap.put("validFlag","0");
+        saveMap.put("content",infoEO.getFileIds());
+
+        String fieldInfo = InitStandAttrUtil.queryFieldLaws;
+        List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
+
+        // 动态存储属性字段
+        for (String field : fieldInfoList) {
+            saveMap.put(field,attrInfoMap.getOrDefault(field,""));
+            String fieldValue = "";
+            String fieldFilter = field.toLowerCase();
+            if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){
+                Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue();
+                if(!json.toString().equals("null")){
+                    fieldValue = infoMap.get(fieldFilter).toString();
+                }
+            }
+            saveMap.put(field+"Name",fieldValue);
+        }
+
+        if(infoEOMapItems != null && !infoEOMapItems.isEmpty()){
+            saveMap.put("mapItems",infoEOMapItems);
+        }
+
+        //当建立代替时，产生的没有文件的问题
+        if (StringUtils.isBlank(String.valueOf(saveMap.get("content")))) {
+            String context = filterStringIsNotBlank(String.valueOf(saveMap.get("ZCWBLAWS")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("GCWBLAWS")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("JDWJLAWS")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("GLWJLAWS")),true);
+            context = context.replace(",,", ",");
+            saveMap.put("content", context);
+        }
+        if("add".equals(addOrUpdate)){
+            sarStandardsInfoService.insertIntoIndexForMap(saveMap);
+        } else {
+            sarStandardsInfoService.updateIntoIndexForMap(saveMap);
+        }
+    }
+
+    private String filterStringIsNotBlank(String str,boolean boo){
+        String f = ",";
+        return (str == null || str.equals("") || str.equals("null")) ? "" : (boo ? str+f : str);
+    }
+
+    private String dateFormatToStr(String dateStr){
+        if(dateStr == null || dateStr.equals("")){
+            return "";
+        }
+        String dateToStr = "";
+        try {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            dateToStr = dateFormat.format(dateFormat.parse(dateStr.trim().substring(0,10)));
+        }catch (Exception e){
+            e.getMessage();
+        }
+        return dateToStr;
+    }
+
+    public Map<String,Object> dealNumberMsg (Map<String,Object> saveMap,SarBussionessStand infoEO,String getCodeName) {
+        /*if(StringUtils.isNotEmpty(infoEO.getStandYear())){
+            String num = getCodeName + " " + infoEO.getStandCode() + "-" + infoEO.getStandYear();
+            saveMap.put("numbershow",num);
+            int index = infoEO.getStandCode().indexOf(".");
+            int index1 = infoEO.getStandCode().indexOf(":");
+            String numberExpNull = "";
+            if(index > -1){
+                numberExpNull = getCodeName + infoEO.getStandCode() + "-" + num.replaceAll(" ","")
+                        + "-" + getCodeName + infoEO.getStandCode().substring(0,index) + "-" +  infoEO.getStandCode().substring(0,index);
+            }else if(index1 > -1){
+                numberExpNull = getCodeName + infoEO.getStandCode() + "-" + num.replaceAll(" ","")
+                        + "-" + getCodeName + infoEO.getStandCode().substring(0,index1) + "-" +  infoEO.getStandCode().substring(0,index1);
+            }else{
+                numberExpNull = getCodeName + infoEO.getStandCode() + "-" + num.replaceAll(" ","");
+            }
+        } else {
+            String number = getCodeName + " " + infoEO.getStandCode();
+            saveMap.put("numbershow",number);
+            String numberExpNull = "";
+            int index = infoEO.getStandCode().indexOf(".");
+            if(index > -1){
+                numberExpNull = getCodeName + infoEO.getStandCode() + "-" + number.replaceAll(" ","")
+                        + "-" + getCodeName + infoEO.getStandCode().substring(0,index) + "-" +  infoEO.getStandCode().substring(0,index);
+            }else{
+                numberExpNull = getCodeName + infoEO.getStandCode() + "-" + number.replaceAll(" ","");
+            }
+            saveMap.put("numberExpNull",numberExpNull);
+        }*/
+        String number = infoEO.getStandCode();
+        saveMap.put("numbershow",number);
+        String numberExpNull = "";
+        int index = infoEO.getStandCode().indexOf(".");
+        if(index > -1){
+            numberExpNull = infoEO.getStandCode() + "-" + number.replaceAll(" ","")
+                    + "-" + infoEO.getStandCode().substring(0,index) + "-" +  infoEO.getStandCode().substring(0,index);
+        }else{
+            numberExpNull = infoEO.getStandCode() + "-" + number.replaceAll(" ","");
+        }
+        saveMap.put("numberExpNull",numberExpNull);
+        return saveMap;
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java

@@ -46,9 +46,9 @@ public class SendStandMQService {
     private static final Logger logger = LoggerFactory.getLogger(SendStandMQService.class);
 
         @RabbitListener(bindings = @QueueBinding(
-            value = @Queue(value = "createStandMQ_SQ_GSAR", durable = "true"),
-            exchange = @Exchange(value = "stand-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"),
-            key = "stand-key_SQ_GSAR"))
+            value = @Queue(value = "createStandMQ_SQ_GSAR_RELEASE", durable = "true"),
+            exchange = @Exchange(value = "stand-exchange_SQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"),
+            key = "stand-key_SQ_GSAR_RELEASE"))
     public void createMQ(Map<String,Object> standMap, Message message, Channel channel) throws Exception{
         try{
             try{

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

@@ -4,6 +4,7 @@ import com.adc.da.base.web.BaseController;
 import com.adc.da.common.ReadExcel;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.slrs.ImportExcelDatas.comment.ExclErrorOut;
+import com.adc.da.slrs.ImportExcelDatas.comment.ExclExport;
 import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto;
 import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService;
 import com.adc.da.slrs.ImportExcelDatas.service.impl.ImportExcelServiceImpl;
@@ -34,7 +35,7 @@ import java.util.Map;
 
 @RestController
 @Api(description = "|SarStandPutTime|")
-@RequestMapping("/ImportExcel")
+@RequestMapping("/api/ImportExcel")
 public class ImportExcelController extends BaseController<ImportDto> {
 
     @Autowired
@@ -43,14 +44,24 @@ public class ImportExcelController extends BaseController<ImportDto> {
     @Autowired
     private ExclErrorOut exclErrorOut;
 
-    @ApiOperation("批量删除用户收藏")
+
+    @ApiOperation("从excl中导入标准信息")
     @PostMapping("/import")
     public void deleteList(MultipartFile file, MultipartFile file2, HttpServletResponse response, HttpServletRequest request) throws IOException {
         Map<String, List<ImportDto>> mapMap=importExcelService.getExcelData(file,file2);
+        /**
+         * 导入系统
+         */
        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");
+
+
+        /**
+         * 生成错误表格
+         */
         OutputStream os = null;
         Workbook workbook = null;
         try {
@@ -61,7 +72,11 @@ public class ImportExcelController extends BaseController<ImportDto> {
             response.setContentType("application/force-download");
             //导出数据
             String headStr="标准号,标准名称,英文名称,发布时间,实施时间,标准状态,代替标准号,附件路径,错误原因";
-            workbook = exclErrorOut.exportDatas(errorList,headStr);
+//            workbook = exclErrorOut.exportDatas(guonei,headStr);
+
+            ExclExport exclExport = new ExclExport();
+            workbook = exclExport.exportData(mapMap, headStr);
+
             os = response.getOutputStream();
             workbook.write(os);
             os.flush();
@@ -75,8 +90,8 @@ public class ImportExcelController extends BaseController<ImportDto> {
         }
 
 
-
 //         return responseMessage;
+
     }
 
 }

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

@@ -2,7 +2,6 @@ package com.adc.da.slrs.ImportExcelDatas.service.impl;
 
 import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.att.vo.AttFileVo;
-import com.adc.da.http.Result;
 import com.adc.da.slrs.ImportExcelDatas.dao.ImportExcelDao;
 import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto;
 import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService;
@@ -10,9 +9,7 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
-import com.adc.da.sys.dao.DicTypeEODao;
 import com.adc.da.sys.entity.DicTypeEO;
-import com.adc.da.sys.entity.DictionaryEO;
 import com.adc.da.sys.service.impl.DicTypeEOServiceImpl;
 import com.adc.da.util.UUIDUtils;
 import com.adc.da.utils.util.InitStandAttrUtil;
@@ -26,13 +23,13 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.InputStream;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
 @Service
@@ -54,7 +51,9 @@ 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," +
@@ -70,6 +69,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
             dates.add("—" + i);
             dates.add("- " + i);
             dates.add("— " + i);
+            dates.add("－" + i);
         }
 
         if (file == null || file.getSize() == 0) {
@@ -118,12 +118,18 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         //中间的Map 判断标准号属于哪种类型
         Map<String, String> middle = new HashMap<>();
         datas.forEach(items -> {
+            System.out.print(".");
             //判断是否是正确的数据
             String[] as = items.split(",");
-            if (!inDate(as[0], dates)) {
+            if( as.length < 8){
+                ImportDto importDto = new ImportDto();
+                importDto.setErrorStr(items);
+                error.add(importDto);
+
+            } else if (!inDate(as[0], dates)  ) {
                 ImportDto importDto = getImportDto(as);
                 error.add(importDto);
-                middle.put(as[0].trim(), "error-" + error.size());
+                middle.put(as[7].trim(), "error-" + error.size());
             } else {
                 //数据二次拆解 针对标准进行拆解
                 String[] step2 = as[0].trim().split(" ");
@@ -131,15 +137,15 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
                 if (isCheck(GNS, step2[0].trim())) {
                     ImportDto importDto = getImportDto(as);
                     InCountry.add(importDto);
-                    middle.put(as[0].trim(), "GNBZ-" + InCountry.size());
+                    middle.put(as[7].trim(), "GNBZ-" + InCountry.size());
                 } else if (isCheck(QBS, step2[0].trim())) {
                     ImportDto importDto = getImportDto(as);
                     QiBiao.add(importDto);
-                    middle.put(as[0].trim(), "QYBZ-" + QiBiao.size());
+                    middle.put(as[7].trim(), "QYBZ-" + QiBiao.size());
                 } else {
                     ImportDto importDto = getImportDto(as);
                     OutCountry.add(importDto);
-                    middle.put(as[0].trim(), "HWBZ-" + OutCountry.size());
+                    middle.put(as[7].trim(), "HWBZ-" + OutCountry.size());
                 }
             }
         });
@@ -151,9 +157,11 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         fujian.forEach(items2 -> {
             String[] fj = items2.split(",");
             if (fj.length > 2) {
-                if (null != middle.get(null != fj[2] ? fj[2].trim() : "")) {
+                if (null != middle.get(null != fj[1] ? fj[1].trim() : "")) {
                     //对应数据位置
-                    String[] location = middle.get(fj[2].trim()).split("-");
+                    String[] location = middle.get(fj[1].trim()).split("-");
+//                    List<ImportDto> importDtos = res.get(location[0]);
+
                     res.get(location[0]).get(Integer.parseInt(location[1]) - 1).setPath(fj[3]);
                 }
             }
@@ -189,10 +197,15 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
     }
 
 
+    /**
+     * 数据数组转换为实体类
+     * @param as
+     * @return
+     */
     //赋值方法
     private ImportDto getImportDto(String[] as) {
         ImportDto importDto = new ImportDto();
-        if (as.length == 7) {
+        if (as.length == 8) {
             importDto.setStandId(null != as[0] ? as[0].trim() : "");
             importDto.setStandName(null != as[1] ? as[1].trim() : "");
             importDto.setStandNameEN(null != as[2] ? as[2].trim() : "");
@@ -200,7 +213,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
             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 == 6) {
+        } 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() : "");
@@ -225,9 +238,10 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
                 HSSFSheet sheet = workbook.getSheetAt(i);
 //                获取有多少行
                 int lastNum = sheet.getLastRowNum();
-                for (int j = 1; j <= lastNum; j++) {
+                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());
                     }
                 }
@@ -248,11 +262,12 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 //            遍历sheet页
             for (int i = 0; i <= sheetNum; i++) {
                 XSSFSheet sheet = workbook.getSheetAt(i);
-//                获取有多少行
+//                获取有多少行 0行开始
                 int lastNum = sheet.getLastRowNum();
-                for (int j = 1; j <= lastNum; j++) {
+                for (int j = 0; j <= lastNum; j++) {
                     XSSFRow row = sheet.getRow(j);
                     if (null != row) {
+                        System.out.println("正在读取第"+j+"行...");
                         strings.add(row.getCell(0).getStringCellValue());
                     }
                 }
@@ -266,9 +281,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
 
 
-    private List<ImportDto> error = new ArrayList<>();
 
-    private List<ImportDto> fileError = new ArrayList<>();
 
     @Autowired
     private ISarStandardsInfoService sarStandardsInfoService;
@@ -278,12 +291,38 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
     @Autowired
     private ISarBussionessStandService sarBussionessStandService;
+
+
+    private List<ImportDto> error = new ArrayList<>();
+
+    private List<ImportDto> fileError = new ArrayList<>();
+
+    private HashSet<String> sarSort = new HashSet<>();
+
+
+
     @Override
     public List<ImportDto> storageExclData(Map<String, List<ImportDto>> importListMap) {
-
+//TODO 利用stream把list变为set
+//        List<DicTypeEO> list = dicTypeEOService.list();
+//        list.stream().flatMap(dicTypeEO -> {
+//            return dicTypeEO;
+//        }.co)
+        List<DicTypeEO> isExist = dicTypeEOService.getTypeIdByDicIdAndTypeName("JKSADFH564S", null, null, null);
+        isExist.forEach(item->{
+            sarSort.add(item.getDicTypeCode());
+        });
 
 
         error = importListMap.get("error");
+
+        AtomicInteger QYBZcount= new AtomicInteger();
+        AtomicInteger QYBZcountUpdate= new AtomicInteger();
+        AtomicInteger HWBZcount= new AtomicInteger();
+        AtomicInteger HWBZcountUpdate= new AtomicInteger();
+        AtomicInteger GNBZcount= new AtomicInteger();
+        AtomicInteger GNBZcountUpdate= new AtomicInteger();
+
         /**
          * 初始化国内外标准属性字段
          */
@@ -296,24 +335,26 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         /**
          * 海外标准
          */
-        importListMap.get("HWBZ").forEach(item -> {
 
-            String standID = UUIDUtils.randomUUID20();
 
-            //使用初始化的属性字段映射 获得key值,value为""
-            Map<String, String> mapField = standAttrMap;
-            SarStandardsInfo ForeignEO = parseImportDtoToStandardsInfo(item,mapField, standID);
+        /*importListMap.get("HWBZ").forEach(item -> {
+            if (true ) {
+                String standID = UUIDUtils.randomUUID20();
 
-            if (ForeignEO != null) {
-                ForeignEO.setValidFlag("0");
-                ForeignEO.setStandType("FOREIGN");
-                QueryWrapper<SarStandardsInfo> standSaveWrapper = new QueryWrapper<>();
-                standSaveWrapper
-                        .eq("STAND_SORT", ForeignEO.getStandSort())
-                        .eq("STAND_NUMBER", ForeignEO.getStandNumber())
-                        .eq("STAND_YEAR", ForeignEO.getStandYear());
+                //使用初始化的属性字段映射 获得key值,value为""
+                Map<String, String> mapField = standAttrMap;
+                SarStandardsInfo ForeignEO = parseImportDtoToStandardsInfo(item,mapField, standID);
 
-                SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper);
+                if (ForeignEO != null) {
+                    ForeignEO.setValidFlag("0");
+                    ForeignEO.setStandType("FOREIGN");
+                    QueryWrapper<SarStandardsInfo> standSaveWrapper = new QueryWrapper<>();
+                    standSaveWrapper
+                            .eq("STAND_SORT", ForeignEO.getStandSort())
+                            .eq("STAND_NUMBER", ForeignEO.getStandNumber())
+                            .eq("STAND_YEAR", ForeignEO.getStandYear());
+
+                    SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper);
 
 
 
@@ -322,6 +363,9 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
                         try {
                             sarStandardsInfoService.updateSarStandardsInfo(ForeignEO);
+                            HWBZcountUpdate.getAndIncrement();
+                            HWBZcount.getAndIncrement();
+                            System.out.println("海外标准执行更新===第: "+HWBZcount+"行");
                         } catch (Exception e) {
                             item.setErrorStr("标准更新失败");
                             error.add(item);
@@ -331,6 +375,8 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
                     } else {
                         try {
                             sarStandardsInfoService.createSarStandardsInfo(ForeignEO);
+                            HWBZcount.getAndIncrement();
+                            System.out.println("海外标准执行新增===第: "+HWBZcount+"行");
                         } catch (Exception e) {
                             item.setErrorStr("标准新增失败");
                             error.add(item);
@@ -340,72 +386,80 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
                     }
 
 
-            } else {
-                item.setErrorStr("标准号无法解析");
-                error.add(item);
+                } else {
+                    item.setErrorStr("标准号无法解析");
+                    error.add(item);
+                }
             }
 
 
-        });
+
+
+
+        });*/
 
 
         /**
          * 国内标准
          */
 
-        importListMap.get("GNBZ").forEach(item -> {
-            String standID = UUIDUtils.randomUUID20();
-            //使用初始化的属性字段映射 获得key值,value为""
-            Map<String, String> mapStandField = standAttrMap;
-            SarStandardsInfo InlandEO = parseImportDtoToStandardsInfo(item, mapStandField,standID);
-
-            if (InlandEO != null) {
+        /*importListMap.get("GNBZ").forEach(item -> {
 
 
-                InlandEO.setValidFlag("0");
-                InlandEO.setStandType("INLAND");
+            if (true) {
+                String standID = UUIDUtils.randomUUID20();
+                //使用初始化的属性字段映射 获得key值,value为""
+                Map<String, String> mapStandField = standAttrMap;
+                SarStandardsInfo InlandEO = parseImportDtoToStandardsInfo(item, mapStandField, standID);
+
+                if (InlandEO != null) {
 
 
-                QueryWrapper<SarStandardsInfo> standSaveWrapper = new QueryWrapper<>();
-                standSaveWrapper
-                        .eq("STAND_SORT", InlandEO.getStandSort())
-                        .eq("STAND_NUMBER", InlandEO.getStandNumber())
-                        .eq("STAND_YEAR", InlandEO.getStandYear());
+                    InlandEO.setValidFlag("0");
+                    InlandEO.setStandType("INLAND");
 
 
-                SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper);
-                if (one != null) {
+                    QueryWrapper<SarStandardsInfo> standSaveWrapper = new QueryWrapper<>();
+                    standSaveWrapper
+                            .eq("STAND_SORT", InlandEO.getStandSort())
+                            .eq("STAND_NUMBER", InlandEO.getStandNumber())
+                            .eq("STAND_YEAR", InlandEO.getStandYear());
 
 
-                    InlandEO.setId(one.getId());
-                    try {
-                        sarStandardsInfoService.updateSarStandardsInfo(InlandEO);
-                    } catch (Exception e) {
-                        item.setErrorStr("国内标准更新失败");
-                        error.add(item);
-                        e.printStackTrace();
+                    SarStandardsInfo one = sarStandardsInfoService.getOne(standSaveWrapper);
+                    if (one != null) {
+
+
+                        InlandEO.setId(one.getId());
+                        try {
+                            sarStandardsInfoService.updateSarStandardsInfo(InlandEO);
+                        } catch (Exception e) {
+                            item.setErrorStr("国内标准更新失败");
+                            error.add(item);
+                            e.printStackTrace();
+                        }
+
+
+                    } else {
+
+
+                        try {
+                            sarStandardsInfoService.createSarStandardsInfo(InlandEO);
+                        } catch (Exception e) {
+                            item.setErrorStr("国内标准新增失败");
+                            error.add(item);
+                            e.printStackTrace();
+                        }
                     }
-
-
                 } else {
-
-
-                    try {
-                        sarStandardsInfoService.createSarStandardsInfo(InlandEO);
-                    } catch (Exception e) {
-                        item.setErrorStr("国内标准新增失败");
-                        error.add(item);
-                        e.printStackTrace();
-                    }
+                    item.setErrorStr("标准号无法解析");
+                    error.add(item);
+                    importListMap.replace("error", error);
                 }
-            } else {
-                item.setErrorStr("标准号无法解析");
-                error.add(item);
-                importListMap.replace("error", error);
+
             }
 
-
-        });
+        });*/
 
 
         /**
@@ -420,38 +474,61 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         listStandBussField.forEach(item->{
             bussAttrMap.put(item,"");
         });
+
         importListMap.get("QYBZ").forEach(item -> {
-            String standId = UUIDUtils.randomUUID20();
-            SarBussionessStand BussEO = parseImportDtoToSarBussionessStand(item, bussAttrMap,standId);
 
-            if (BussEO != null) {
 
-                try {
-                    QueryWrapper<SarBussionessStand> saveWrapper = new QueryWrapper<>();
-                    saveWrapper.eq("STAND_CODE", item.getStandId());
-                    SarBussionessStand one = sarBussionessStandService.getOne(saveWrapper);
-                    if (one != null) {
-                        BussEO.setId(one.getId());
-                        sarBussionessStandService.updateSarBussionessStand(BussEO);
-                    } else {
-                        sarBussionessStandService.createSarBussionessStand(BussEO);
+            if (true){
+//            if (item.getStandId().contains("Q/FT T396—2021") ){
+
+                String standId = UUIDUtils.randomUUID20();
+                SarBussionessStand BussEO = parseImportDtoToSarBussionessStand(item, bussAttrMap,standId);
+
+                if (BussEO != null) {
+
+                    try {
+                        QueryWrapper<SarBussionessStand> saveWrapper = new QueryWrapper<>();
+                        saveWrapper.eq("STAND_CODE", item.getStandId());
+                        SarBussionessStand one = sarBussionessStandService.getOne(saveWrapper);
+                        if (one != null) {
+                            BussEO.setId(one.getId());
+                            sarBussionessStandService.updateSarBussionessStand(BussEO);
+                            QYBZcountUpdate.getAndIncrement();
+                            QYBZcount.getAndIncrement();
+                            System.out.println("企业标准执行更新====第: "+QYBZcount+"行");
+
+                        } else {
+                            sarBussionessStandService.createSarBussionessStand(BussEO);
+                            QYBZcount.getAndIncrement();
+                            System.out.println("企业标准执行新增第: "+QYBZcount+"行");
+                        }
+
+
+                    } catch (Exception e) {
+                        item.setErrorStr("数据格式错误");
+                        error.add(item);
+
+                        e.printStackTrace();
+
                     }
 
-
-                } catch (Exception e) {
-                    item.setErrorStr("数据格式错误");
-                    error.add(item);
-
-                    e.printStackTrace();
-
                 }
-
             }
 
+
         });
 
 
         error.addAll(fileError);
+        System.out.println("执行结束");
+        System.out.println("执行国内标准"+GNBZcount+"条");
+        System.out.println("国内标准执行更新"+GNBZcountUpdate+"条");
+        System.out.println("执行国外标准"+HWBZcount+"条");
+        System.out.println("海外标准执行更新"+HWBZcountUpdate+"条");
+        System.out.println("执行企业标准"+QYBZcount+"条");
+        System.out.println("企业标准执行更新"+QYBZcountUpdate+"条");
+
+
         return error;
     }
 
@@ -464,13 +541,10 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
      * @return
      */
     public SarStandardsInfo parseImportDtoToStandardsInfo(ImportDto importDto,Map<String,String> fieldMap, String standId) {
-
-
         HashMap<String, String> analysis = analysisStandId(importDto);
         if (analysis == null) {
             return null;
         }
-
         SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
         sarStandardsInfoEO.setId(standId);
 
@@ -507,21 +581,21 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         if (importDto.getPath() != null) {
             String path[] = importDto.getPath().split("/");
             String realPath = "";
-            for (int i = 4; i < path.length; i++) {
+            for (int i = 3; i < path.length; i++) {
                 realPath = realPath + "/" + path[i];
 
             }
 
 
             try {
-//              File file = new File("C:\\Users\\22501\\Desktop\\foton\\2021\\" + realPath);
+//              File file = new File("C:\\Users\\22501\\Desktop\\foton\\" + realPath);
 //              File file = new File(importPath + realPath);
-                File file = new File("/home/file/2021/" + realPath);
+                File file = new File("/data/from12/Attach_swf_bak" + realPath);
                 if (file.exists()) {
                     AttFileVo fileInfo = attFileEOService.saveFileInfo(file);
 
                     if (importDto.getImplementedTime() != null) {
-                        fieldMap.put("FBGJBD", fileInfo.getAttId());
+                        fieldMap.put("FBGBJBD", fileInfo.getAttId());
                     } else {
                         fieldMap.put("GLWJ", fileInfo.getAttId());
                     }
@@ -585,16 +659,16 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
             if (importDto.getPath() != null) {
                 String path[] = importDto.getPath().split("/");
                 String realPath = "";
-                for (int i = 4; i < path.length; i++) {
+                for (int i = 3; i < path.length; i++) {
                     realPath = realPath + "/" + path[i];
 
                 }
 
 
                 try {
-//            File file = new File("C:\\Users\\22501\\Desktop\\foton\\2021\\" + realPath);
+//            File file = new File("C:\\Users\\22501\\Desktop\\foton\\" + realPath);
 //            File file = new File(importPath + realPath);
-                    File file = new File("/home/file/2021/" + realPath);
+                    File file = new File("/data/from12/Attach_swf_bak" + realPath);
 
                     if (file.exists()) {
                         AttFileVo fileInfo = attFileEOService.saveFileInfo(file);
@@ -639,12 +713,14 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
      */
     public HashMap<String, String> analysisStandId(ImportDto importDto) {
         HashMap<String, String> result = new HashMap<>();
-        if (importDto.getStandId() == null) {
+        String standId = importDto.getStandId();
+
+        if (standId == null) {
             importDto.setErrorStr("标准号为空");
             error.add(importDto);
             return null;
         } else {
-            String standId = importDto.getStandId();
+//            String standId = importDto.getStandId();
             //格式 非空格字符+空格+非空格字符+‘-’或‘—’或空格+年份  如Q/FT F003—2001
             Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$");
             if (!pattern.matcher(standId).matches()) {
@@ -656,7 +732,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
             String sort = "";
             String number = "";
             String year = "";
-            String[] split = importDto.getStandId().split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割
+            String[] split = standId.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割
 
 
 //      多种格式(╯‵□′)╯︵┻━┻      Q-FL T015-2021  Q/ FL T015-2021 Q/FL T015-2021
@@ -670,25 +746,27 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
             result.put("sort", sort);
             result.put("number", number);
             result.put("year", year);
-            //标准类别不存在,新增标准类别
-            List<DicTypeEO> isExist = dicTypeEOService.getTypeIdByDicIdAndTypeName("JKSADFH564S", null, sort, null);
-            if (isExist == null || isExist.isEmpty() || isExist.size()==0){
-
-                DicTypeEO dicTypeVO = new DicTypeEO();
-                dicTypeVO.setId(null);
-                dicTypeVO.setDicId("JKSADFH564S");
-                dicTypeVO.setDicTypeCode(sort);
-                dicTypeVO.setDicTypeName(sort);
-                dicTypeVO.setShowIndex(1);
-                Integer dicTypeEO = dicTypeEOService.saveDictype(dicTypeVO);
-                if (dicTypeEO>0){
-                    importDto.setErrorStr("标准类别不存在,已新增");
-                }else {
-                    importDto.setErrorStr("标准类别不存在,新增失败");
-                }
-                error.add(importDto);
-            }
-
+            /**
+             *  标准类别不存在,新增标准类别
+             */
+//            List<DicTypeEO> isExist = dicTypeEOService.getTypeIdByDicIdAndTypeName("JKSADFH564S", null, sort, null);
+//            if (!sarSort.contains(sort)){
+//
+//                DicTypeEO dicTypeVO = new DicTypeEO();
+//                dicTypeVO.setId(null);
+//                dicTypeVO.setDicId("JKSADFH564S");
+//                dicTypeVO.setDicTypeCode(sort);
+//                dicTypeVO.setDicTypeName(sort);
+//                dicTypeVO.setShowIndex(1);
+//                Integer dicTypeEO = dicTypeEOService.saveDictype(dicTypeVO);
+//                if (dicTypeEO>0){
+//                    sarSort.add(sort);
+//                    importDto.setErrorStr("标准类别不存在,已新增");
+//                }else {
+//                    importDto.setErrorStr("标准类别不存在,新增失败");
+//                }
+//                error.add(importDto);
+//            }
 
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/SarCompStatusInfo/dao/SarCompStatusInfoDao.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.SarCompStatusInfo.dao;
 
 import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author super_liu
  * @since 2021-06-21
  */
+@Repository
 public interface SarCompStatusInfoDao extends BaseMapper<SarCompStatusInfo> {
 
 }

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

@@ -194,6 +194,16 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
         return Result.success(result);
     }
 
+    @ApiOperation(value = "|SarBussionessStandEO|详情")
+    @GetMapping("/getStandInfoUpdateById")
+    //@RequiresPermissions("lawss:sarStandardsInfo:get")
+    public ResponseMessage<SarBussionessStand> getStandInfoUpdateById(String id) throws Exception {
+        SarBussionessStand result = sarBussionessStandEOService.selectStandardsInfoUpdateByKey(id);
+        String collectId = personCollectEOService.queryCollectByUserAndId(id);
+        result.setCollectId(collectId);
+        return Result.success(result);
+    }
+
     /**
      * 给指定标准配置目录
      * @param standardsInfoEO

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

@@ -30,6 +30,8 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
 
     SarBussionessStand selectStandardsInfoByKey(String id) throws Exception;
 
+    SarBussionessStand selectStandardsInfoUpdateByKey(String id) throws Exception;
+
     SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO);
 
     List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);

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

@@ -35,6 +35,7 @@ import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
@@ -60,6 +61,7 @@ import org.springframework.stereotype.Service;
 import java.sql.Clob;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -218,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");
@@ -277,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;
     }
 
@@ -330,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);
@@ -708,6 +759,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         return sarBussionessStandEO;
     }
 
+    @Override
+    public SarBussionessStand selectStandardsInfoUpdateByKey(String id) throws Exception{
+        List<SarBussionessStand> sarBussionessStandlist = this.baseMapper.selectStandardsInfoByKey(id);
+        SarBussionessStand sarBussionessStandEO = new SarBussionessStand();
+        if(!sarBussionessStandlist.isEmpty()) {
+            List<SarBussionessStand> newStandList = new ArrayList<>();
+            newStandList.add(sarBussionessStandlist.get(0));
+            attrInfo(newStandList);
+            sarBussionessStandEO = newStandList.get(0);
+        }
+        return sarBussionessStandEO;
+    }
+
     public void attrInfoShowDetails(List<SarBussionessStand> sarlist) throws Exception {
         for (SarBussionessStand row : sarlist) {
             attrInfoDetails(row);
@@ -802,7 +866,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page);
         page.getPager().setRowCount(rowCount);
         List<SarBussionessStand> sarlist = this.baseMapper.getBussionessStandInfoPage(page);
-        attrInfo(sarlist);
+        attrInfoCollect(sarlist);
         return sarlist;
     }
 
@@ -817,6 +881,17 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         }
     }
 
+    public void attrInfoCollect (List<SarBussionessStand> sarlist) throws Exception {
+        List<String> collectResIds = sarlist.stream().map(SarBussionessStand::getId).collect(Collectors.toList());
+        Map<String,String> collectMap = personCollectEOService.queryCollectByUserAndIds(collectResIds);
+        for (SarBussionessStand row : sarlist) {
+            if(collectMap != null && collectMap.get(row.getId()) != null){
+                row.setCollectId(collectMap.get(row.getId()));
+            }
+        }
+    }
+
+
     public void attrInfo1 (SarBussionessStand row) throws Exception {
         String fieldInfo = InitStandAttrUtil.queryFieldBuss;
         String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
@@ -839,10 +914,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     public void attrInfoShowSearchDetails(SarBussionessStand row,String type) throws Exception {
         if (row != null) {
             attrInfoSearchDetails(row,type);
-            Map<String, Object> getAttrMap = row.getAttrInfoMap();
+            Map<String, Object> getAttrMap = row.getAttrInfoCaseMap();
             if (getAttrMap != null && getAttrMap.size() > 0) {
                 for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
-                    String name = entry.getKey();
+                    String name = entry.getKey().toUpperCase();
                     String value = "";
                     List<String> valArr = new ArrayList<>();
                     if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
@@ -939,13 +1014,55 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                     if (value1 != null && value1.toString().equals("\"null\"")){
                         entry.setValue("");
                     }
-                    if ("SVPPS".equals(name)) {
-                        Object value = entry.getValue();
-                        if (value != null && StringUtils.isNotBlank(value.toString())) {
-                            value = sysInfoEOService.getSvppsNamesByIds(value.toString());
+                    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);
                         }
-                        newMap.put(name + "Name",value);
-                    } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
+                    }
+                }
+                getAttrMap.putAll(newMap);
+            }
+
+            if (getAttrMap != null && !getAttrMap.isEmpty()) {
+                row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
+            }
+
+            row.setAttrInfoMap(getAttrMap);
+        }
+    }
+
+    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)) {

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

@@ -93,6 +93,14 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
     }
 
 
+    @ApiOperation("通过部门机构名称查询部门树形结构 废弃使用")
+    @GetMapping("/findInstitution")
+    public List<TsInstitution> findInstitution(String institutionName){
+        //TODO 调用业务接口
+        tsInstitutionService.findInstitutionTreeByName(institutionName);
+        return null;
+    }
+
     public static void main(String[] args) {
 //          System.out.println(json);
     }

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

@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarInstitution.dao;
 import com.adc.da.slrs.sarInstitution.entity.InstitutionAndUser;
 import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -29,7 +30,7 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
     List<TsInstitution> selectNextUser(String institutionId);
 
 
-
+    List<TsInstitution> selectTreeByIds(@Param("rootIds") List<String> rootIds);
 
     /**
      * 查询最高级机构及其人员

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java

@@ -11,6 +11,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -73,4 +75,12 @@ public class TsInstitution extends BaseEntity {
         this.parentId = parentId;
         this.name = name;
     }
+
+//    public void addChildren(TsInstitution node){
+//        if (this.children==null){
+//            this.children=Arrays.asList(node);
+//        }else {
+//            this.children.add(node);
+//        }
+//    }
 }

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

@@ -43,5 +43,13 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
      */
     public List<TsInstitution> getFirst();
 
+
+    /**
+     * 根据机构部门名称查询机构树
+     * @param institutionName
+     * @return
+     */
+    public List<TsInstitution> findInstitutionTreeByName(String institutionName);
+
     int clearData();
 }

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

@@ -6,6 +6,7 @@ import com.adc.da.slrs.sarInstitution.entity.SyncInstitution;
 import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
 import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
 import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarInstitution.util.TreeUtil;
 import com.adc.da.sync.service.SyncUserService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -15,8 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,17 +39,21 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
      */
     @Override
     public List<TsInstitution> getInstitution() {
+        List<TsInstitution> institutionList = this.list();//查询所有的的数据
+
         //查询第一层机构
-        List<TsInstitution> institutionRoot=tsInstitutionDao.selectRoot();
-        for(TsInstitution tsInstitution:institutionRoot){
-            tsInstitution.setChildren(recursionGetInstitution(tsInstitution));
-        }
-        return institutionRoot;
+        List<TsInstitution> root=tsInstitutionDao.selectRoot();
+
+        TreeUtil treeUtil = new TreeUtil();
+        List<TsInstitution> institutionTree = treeUtil.treeAsList(institutionList, root);
+
+        return institutionTree;
     }
 
 
 
 
+
     /**
      * 递归获取子机构
      * @param tsInstitution：父机构
@@ -109,21 +114,29 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
      */
     @Override
     public List<TsInstitution> getInstitutionAndUser(String userName) {
-        //查询第一层机构
-        List<TsInstitution> institutionRoot=tsInstitutionDao.selectRootAndUser(userName);
+        List<TsInstitution> tsInstitutions = new ArrayList<>();
 
-        //把查到的数据结构修改,把用户放
-        for(TsInstitution tsInstitution:institutionRoot){
-            tsInstitution.setDisabled(true);
-            tsInstitution.setChildren(  recursionGetInstitutionAndUser(tsInstitution)   );
-            for(TsUserVO user:tsInstitution.getUsers()){
-                if(tsInstitution.getChildren()==null){
-                    tsInstitution.setChildren(new ArrayList<>());
+        //当条件为null时避免查询全部,直接返回第一级
+        if (userName==null||userName==""){
+            tsInstitutions=this.getFirst();
+        }else {
+            //查询第一层机构
+            tsInstitutions=tsInstitutionDao.selectRootAndUser(userName);
+
+            //把查到的数据结构修改,把用户放
+            for(TsInstitution tsInstitution:tsInstitutions){
+                tsInstitution.setDisabled(true);
+//                tsInstitution.setChildren(  recursionGetInstitutionAndUser(tsInstitution)   );
+                for(TsUserVO user:tsInstitution.getUsers()){
+                    if(tsInstitution.getChildren()==null){
+                        tsInstitution.setChildren(new ArrayList<>());
+                    }
+//                    tsInstitution.getChildren().add(user);
                 }
-                tsInstitution.getChildren().add(user);
             }
         }
-        return institutionRoot;
+
+        return tsInstitutions;
     }
 
     /**
@@ -213,6 +226,27 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
        return tsInstitutions;
    }
 
+    @Override
+    public List<TsInstitution> findInstitutionTreeByName(String institutionName) {
+
+        QueryWrapper<TsInstitution> tsInstitutionQuery = new QueryWrapper<>();
+        tsInstitutionQuery.select("id")
+                .like("name",institutionName);
+
+        /**
+         * 查询出id的数据集合并转换成String类型
+         */
+        List<String> rootIds = this.listObjs(tsInstitutionQuery)
+                .stream()
+                .map(item -> item.toString())
+                .collect(Collectors.toList());
+
+        List<TsInstitution> tsInstitutions = tsInstitutionDao.selectTreeByIds(rootIds);
+
+
+        return null;
+    }
+
     @Override
     public int clearData() {
         return tsInstitutionDao.clearData();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/util/TreeUtil.java

@@ -0,0 +1,132 @@
+package com.adc.da.slrs.sarInstitution.util;
+
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Component
+public class TreeUtil {
+
+    public List<TsInstitution> treeAsList(List<TsInstitution> institutionList,List<TsInstitution> rootList){
+
+        //转换为hashSet
+        List<String> root = rootList.stream()
+                .map(item -> item.getId())
+                .collect(Collectors.toList());
+        HashSet<String> rootSet = new HashSet<>(root);
+
+        //获取父节点，0表示父节点
+        List<TsInstitution> tree = institutionList.stream()
+                .filter(e -> rootSet.contains(e.getId()))
+                .map(e -> {
+
+                    List<TsInstitution> childNode = getChildNode(e, institutionList);
+
+                    e.setChildren(new ArrayList<>(childNode));
+                    return e;
+                }).collect(Collectors.toList());
+
+        return tree;
+    }
+
+    /**
+     * 递归查询子节点
+     * @param root
+     * @param contentKnowledgeList
+     * @return
+     */
+    private List<TsInstitution> getChildNode(TsInstitution root, List<TsInstitution> contentKnowledgeList) {
+        List<TsInstitution> childrenList = contentKnowledgeList.stream()
+                .filter(e -> Objects.equals(e.getParentId(), root.getId()))
+                .map(e -> {
+                    List<TsInstitution> childNode = getChildNode(e, contentKnowledgeList);
+                    e.setChildren(new ArrayList<>(childNode));
+                    return e;
+                }
+        ).collect(Collectors.toList());
+        return childrenList;
+    }
+
+
+
+
+//    public List<TsInstitution> getChildAsHash(TsInstitution root, Map<String, TsInstitution> hashInstitution){
+//        String id = root.getId();
+//        if (hashInstitution.containsKey(id)){
+//
+//        }
+//        return null;
+//    }
+
+
+//    //TODO 利用HashMap组装树结构
+//
+//    public List<TsInstitution> treeAsHash(List<TsInstitution> institutionList,List<TsInstitution> rootList) {
+//
+//        Map<String, TsInstitution> idMap = institutionList.stream()
+//                .collect(Collectors.toMap(TsInstitution::getId, tsInstitution -> tsInstitution));
+//
+//        Map<String, TsInstitution> pid_institution = institutionList.stream()
+//                .collect(Collectors.toMap(TsInstitution::getParentId, institution -> institution));
+//
+//        for (TsInstitution institution : rootList) {
+//
+//            String id = institution.getId();
+//            if (pid_institution.containsKey(id)) {
+//                institution.addChildren(pid_institution.get(id));
+//
+//            }
+//
+//        }
+//
+//
+//        Set<String> rootSet = rootList.stream()
+//                .map(TsInstitution::getId)
+//                .collect(Collectors.toSet());
+//
+//        Iterator<TsInstitution> it = institutionList.iterator();
+//
+//        ArrayList<TsInstitution> resultList = new ArrayList<>();
+//
+//
+//        HashMap<String, TsInstitution> id_obj = new HashMap<>();
+//        while (it.hasNext()) {
+//            TsInstitution next = it.next();
+//
+//            String parentId = next.getParentId();
+//            id_obj.put(next.getId(), next);
+//            if (rootSet.contains(parentId)) {
+//                id_obj.put(next.getId(), next);
+//            } else if (id_obj.containsKey(parentId)) {
+//                id_obj.get(parentId).addChildren(next);
+//            }
+//
+//        }
+//        return null ;
+//
+//    }
+
+
+
+//
+//
+//
+//        List<TreeNodeDTO> list = dbMapper.getNodeList();
+//        ArrayList<TreeNodeDTO> rootNodes = new ArrayList<>();
+//        Map<Integer, TreeNodeDTO> map = new HashMap<>();
+//        for (TreeNodeDTO node :list) {
+//            map.put(node.getId(), node);
+//            Integer parentId = node.getParentId();
+//            // 判断是否有父节点 (没有父节点本身就是个父菜单)
+//            if (parentId.equals('0')){
+//                rootNodes.add(node);
+//                // 找出不是父级菜单的且集合中包括其父菜单ID
+//            } else if (map.containsKey(parentId)){
+//                map.get(parentId).getChildren().add(node);
+//            }
+//        }
+//
+//    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java

@@ -143,7 +143,13 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
                         }
                     }
                 }
-                String completedString = builder.delete(builder.length()-1,builder.length()).toString();
+                /**
+                 * 当""时索引异常
+                 */
+                String completedString="";
+                if (!"".equals(builder.toString())){
+                     completedString = builder.delete(builder.length()-1,builder.length()).toString();
+                }
                 list1.setZRBM(completedString);
             }
             else {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/dao/SarLawsAttrInfoDao.java

@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarLawsAttrInfo.entity.SarLawsAttrInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.Map;
 
@@ -15,6 +16,7 @@ import java.util.Map;
  * @author super_liu
  * @since 2021-06-04
  */
+@Repository
 public interface SarLawsAttrInfoDao extends BaseMapper<SarLawsAttrInfo> {
 
     void deleteLawsAttr(@Param("fieldInfo") String fieldInfo);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java

@@ -3,12 +3,16 @@ package com.adc.da.slrs.sarLawsAttrInfo.entity;
 import com.adc.da.base.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import java.util.Date;
+
 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;
 
 /**
  * <p>
@@ -43,68 +47,80 @@ public class SarLawsAttrInfo extends BaseEntity {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("CREATION_TIME")
-    private LocalDateTime creationTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("MODIFY_TIME")
-    private LocalDateTime modifyTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
 
-    @TableField("SYCLLX")
-    private String sycllx;
+    @TableField("SSRQLAWS")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String ssrqlaws;
 
-    @TableField("SVPPS")
-    private String svpps;
+    @TableField("XCXSSRQLAWS")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String xcxssrqlaws;
 
-    @TableField("XCXSSRQ")
-    private String xcxssrq;
+    @TableField("ZCXSSRQLAWS")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String zcxssrqlaws;
 
-    @TableField("ZCCSSRQ")
-    private String zccssrq;
+    @TableField("ZCWBLAWS")
+    private String zcwblaws;
 
-    @TableField("EOPSSRQ")
-    private String eopssrq;
+    @TableField("GCWBLAWS")
+    private String gcwblaws;
 
-    @TableField("XGBM")
-    private String xgbm;
+    @TableField("JDWJLAWS")
+    private String jdwjlaws;
 
-    @TableField("ZRBM")
-    private String zrbm;
+    @TableField("FBJGLAWS")
+    private String fbjglaws;
 
-    @TableField("FO")
-    private String fo;
+    @TableField("CYSDLAWS")
+    private String cysdlaws;
 
-    @TableField("ZRLX")
-    private String zrlx;
+    @TableField("TGRLAWS")
+    private String tgrlaws;
 
-    @TableField("YQLX")
-    private String yqlx;
+    @TableField("TGDWLAWS")
+    private String tgdwlaws;
 
-    @TableField("GXHBQ")
-    private String gxhbq;
+    @TableField("NYLXLAWS")
+    private String nylxlaws;
 
-    @TableField("ZCGCS")
-    private String zcgcs;
+    @TableField("YYRZLAWS")
+    private String yyrzlaws;
 
-    @TableField("GKGLBM")
-    private String gkglbm;
+    @TableField("ZRBMLAWS")
+    private String zrbmlaws;
 
-    @TableField("FBJG")
-    private String fbjg;
+    @TableField("ZRGCSLAWS")
+    private String zrgcslaws;
 
-    @TableField("WSSFCY")
-    private String wssfcy;
+    @TableField("DTWJHLAWS")
+    private String dtwjhlaws;
 
-    @TableField("ZCWB")
-    private String zcwb;
+    @TableField("BDTWJHLAWS")
+    private String bdtwjhlaws;
 
-    @TableField("GCGJ")
-    private String gcgj;
-
-    @TableField("GLWJ")
-    private String glwj;
+    @TableField("YYBZZCLAWS")
+    private String yybzzclaws;
 
     @TableField("XGLC")
     private String xglc;
 
+    @TableField("CHJLLAWS")
+    private String chjllaws;
+
+    @TableField("GLWJLAWS")
+    private String glwjlaws;
+
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/service/ISarLawsAttrInfoService.java

@@ -13,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISarLawsAttrInfoService extends IService<SarLawsAttrInfo> {
 
+    String selectFieldValByLawsId(String field,String standId);
+
+    int updateLawsInfo(String standId,String field,String value);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/service/impl/SarLawsAttrInfoServiceImpl.java

@@ -17,4 +17,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class SarLawsAttrInfoServiceImpl extends ServiceImpl<SarLawsAttrInfoDao, SarLawsAttrInfo> implements ISarLawsAttrInfoService {
 
+    @Override
+    public String selectFieldValByLawsId (String field,String standId) {
+        return this.baseMapper.selectFieldValByLawsId(field,standId);
+    }
+
+    @Override
+    public int updateLawsInfo(String standId,String field,String value){
+        return this.baseMapper.updateLawsInfo(standId,field,value);
+    }
 }

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

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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsFile/dao/SarLawsFileDao.java

@@ -0,0 +1,40 @@
+package com.adc.da.slrs.sarLawsFile.dao;
+
+import com.adc.da.slrs.sarLawsFile.entity.SarLawsFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Repository
+public interface SarLawsFileDao extends BaseMapper<SarLawsFile> {
+
+    List<SarLawsFile> selectFileBylawsId(String lawsId);
+
+    List<SarLawsFile> selectFileBylawsIdAndId(SarLawsFile laws);
+
+    List<SarLawsFile> selectFileByAttId(String attId);
+
+    List<SarLawsFile> selectFileMsgByAttId(String attId);
+
+    List<SarLawsFile> selectFileByResId(SarLawsFile sarBussStandFileEO);
+
+    int deleteBylawsId(String standId);
+
+    int insertForeach(List<SarLawsFile> list); //批量新增
+
+    int insertSelective(SarLawsFile sarBussStandFile);
+
+    int updateByPrimaryKeySelective(SarLawsFile sarBussStandFile);
+
+    int deleteByPrimaryKey(String value);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsFile/entity/SarLawsFile.java

@@ -0,0 +1,98 @@
+package com.adc.da.slrs.sarLawsFile.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarLawsFile对象", description="")
+public class SarLawsFile extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableField("ID")
+    private String id;
+
+    @ApiModelProperty(value = "政策ID")
+    @TableField("LAWS_ID")
+    private String lawsId;
+
+    @ApiModelProperty(value = "政策文件分类")
+    @TableField("LAWS_FILE_CLASSIFY")
+    private String lawsFileClassify;
+
+    @ApiModelProperty(value = "文件主键")
+    @TableField("ATT_ID")
+    private String attId;
+
+    @ApiModelProperty(value = "文件名称")
+    @TableField("FILE_NAME")
+    private String fileName;
+
+    @ApiModelProperty(value = "文件后缀")
+    @TableField("FILE_SUFFIX")
+    private String fileSuffix;
+
+    @ApiModelProperty(value = "使用模式（SOURCE_FILE原文件，WEB_FILE转换后文件）")
+    @TableField("USE_MODEL")
+    private String useModel;
+
+    @ApiModelProperty(value = "加密密码")
+    @TableField("PASSWORD")
+    private String password;
+
+    @TableField("CREATION_USER")
+    private String creationUser;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "转换原文件id")
+    @TableField("ORI_ATT_ID")
+    private String oriAttId;
+
+
+    @TableField(exist = false)
+    private List<String> idList = new ArrayList<>();
+
+    @TableField(exist = false)
+    private String useModule;
+    @TableField(exist = false)
+    private String resId;
+    @TableField(exist = false)
+    private Integer pageCount;
+    @TableField(exist = false)
+    private String fileOldName;
+}

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

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarLawsFile.service;
+
+import com.adc.da.slrs.sarLawsFile.entity.SarLawsFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+public interface ISarLawsFileService extends IService<SarLawsFile> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarLawsFile.service.impl;
+
+import com.adc.da.slrs.sarLawsFile.entity.SarLawsFile;
+import com.adc.da.slrs.sarLawsFile.dao.SarLawsFileDao;
+import com.adc.da.slrs.sarLawsFile.service.ISarLawsFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Service
+public class SarLawsFileServiceImpl extends ServiceImpl<SarLawsFileDao, SarLawsFile> implements ISarLawsFileService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInfo/dao/SarLawsInfoDao.java

@@ -2,9 +2,12 @@ package com.adc.da.slrs.sarLawsInfo.dao;
 
 import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
 import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage;
+import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,6 +18,7 @@ import java.util.List;
  * @author super_liu
  * @since 2021-06-01
  */
+@Repository
 public interface SarLawsInfoDao extends BaseMapper<SarLawsInfo> {
 
     Integer selectLawsColumn(@Param("columnName") String columnName);
@@ -22,4 +26,85 @@ public interface SarLawsInfoDao extends BaseMapper<SarLawsInfo> {
     List<SarLawsInfo> queryByPage(SarLawsInfoEOPage page);
 
     Integer queryByCount(SarLawsInfoEOPage page);
+
+    /**
+     * @return com.adc.da.lawss.entity.SarLawsInfo
+     * @Author yangxuenan
+     * @Description 通过id查询详细信息
+     * Date 2018/9/21 16:42
+     * @Param [id]
+     **/
+    SarLawsInfo selectInfoById(String id);
+
+    /**
+     * @return java.util.List<com.adc.da.lawss.entity.SarLawsInfo>
+     * @Author yangxuenan
+     * @Description 分页查询配置法规
+     * Date 2018/9/30 17:02
+     * @Param [page]
+     **/
+    List<SarLawsInfo> queryConfigLawsByPage(SarLawsInfoEOPage page);
+
+    int queryConfigLawsByCount(SarLawsInfoEOPage page);
+
+
+    //liwenxuan:标准法规更新数量及清单:国内法规
+    Integer selectCounterLawsCountINLAND(Date visitTime);
+
+    //liwenxuan:标准法规更新数量及清单:国内法规All
+    Integer selectCounterLawsCountINLANDAll();
+
+    //liwenxuan:标准法规更新数量及清单:国外法规
+    Integer selectCounterLawsCountFOREIGN(Date visitTime);
+
+    //liwenxuan:标准法规更新数量及清单:国外法规All
+    Integer selectCounterLawsCountFOREIGNAll();
+
+    /**
+     * 功能描述: 通过文件号查询详细信息
+     *
+     * @param: [Number]
+     * @return: com.adc.da.lawss.entity.SarLawsInfo
+     * @auther: SYT
+     * @date: 2018/10/11 20:34
+     */
+    List<SarLawsInfo> selectInfoByNumber(@Param("number") String number, @Param("resName") String resName, @Param("type") String type);
+
+
+    /**
+     * 搜索中心查询相关推荐
+     *
+     * @param:
+     * @auther: gaoyan
+     * @date: 2018/11/10 9:22
+     */
+    List<RecommendVO> selectRecommendLaws(SarLawsInfoEOPage pagenew);
+
+    List<RecommendVO> selectCloseLaws(SarLawsInfoEOPage pagenew);
+
+    /**
+     * 功能描述: 查询所有小于当前时间的即将实施的条目
+     *
+     * @param: [lawsEO]
+     * @return: java.util.List<com.adc.da.lawss.entity.SarLawsInfo>
+     * @auther: SYT
+     * @date: 2018/11/16 15:24
+     */
+    List<SarLawsInfo> queryByPutTimeList(SarLawsInfo lawsEO);
+
+    int updateSarStandReplaced(SarLawsInfo lawsInfoEO);
+
+    int updateRelacedNumByNumber(SarLawsInfoEOPage lawsInfoEO);
+
+    List<SarLawsInfo> selectLawsInfoByIdAndRole(SarLawsInfoEOPage lawsEOPage);
+
+    int queryByCountForES(SarLawsInfoEOPage lawsEOPage);
+
+    List<SarLawsInfo> queryByPageForES(SarLawsInfoEOPage lawsEOPage);
+
+    int updateByPrimaryKeyForSynchron(SarLawsInfo SarLawsInfo);
+
+    int deleteByPrimaryKeyFlag(String id);
+
+    SarLawsInfo selectByPrimaryKeyAndTime(SarLawsInfo lawsEO);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsItemVal/controller/SarLawsItemValController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.sarLawsItemVal.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarLawsItemVal.entity.SarLawsItemVal;
+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-10-28
+*/
+@RestController
+@Api(description = "|SarLawsItemVal|")
+@RequestMapping("/sarLawsItemVal/sar-laws-item-val")
+public class SarLawsItemValController extends BaseController<SarLawsItemVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsItemVal/dao/SarLawsItemValDao.java

@@ -0,0 +1,18 @@
+package com.adc.da.slrs.sarLawsItemVal.dao;
+
+import com.adc.da.slrs.sarLawsItemVal.entity.SarLawsItemVal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Repository
+public interface SarLawsItemValDao extends BaseMapper<SarLawsItemVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsItemVal/entity/SarLawsItemVal.java

@@ -0,0 +1,59 @@
+package com.adc.da.slrs.sarLawsItemVal.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarLawsItemVal对象", description="")
+public class SarLawsItemVal extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "法规条目ID")
+    @TableField("LAWS_ITEM_ID")
+    private String lawsItemId;
+
+    @ApiModelProperty(value = "参数类型")
+    @TableField("PROPERTY_TYPE")
+    private String propertyType;
+
+    @ApiModelProperty(value = "参数内容")
+    @TableField("PROPERTY_VAL")
+    private String propertyVal;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private BigDecimal validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    private LocalDateTime creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    private LocalDateTime modifyTime;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsItemVal/service/ISarLawsItemValService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarLawsItemVal.service;
+
+import com.adc.da.slrs.sarLawsItemVal.entity.SarLawsItemVal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+public interface ISarLawsItemValService extends IService<SarLawsItemVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsItemVal/service/impl/SarLawsItemValServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarLawsItemVal.service.impl;
+
+import com.adc.da.slrs.sarLawsItemVal.entity.SarLawsItemVal;
+import com.adc.da.slrs.sarLawsItemVal.dao.SarLawsItemValDao;
+import com.adc.da.slrs.sarLawsItemVal.service.ISarLawsItemValService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Service
+public class SarLawsItemValServiceImpl extends ServiceImpl<SarLawsItemValDao, SarLawsItemVal> implements ISarLawsItemValService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsItems/dao/SarLawsItemsDao.java

@@ -2,10 +2,12 @@ package com.adc.da.slrs.sarLawsItems.dao;
 
 import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage;
 import com.adc.da.slrs.sarLawsItems.entity.SarLawsItems;
+import com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Set;
@@ -18,11 +20,16 @@ import java.util.Set;
  * @author super_liu
  * @since 2021-06-02
  */
+@Repository
 public interface SarLawsItemsDao extends BaseMapper<SarLawsItems> {
 
+    List<SarLawsItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
+
     Set<String> selectClaimTypesByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList);
 
     Set<String> selectSvppsByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList);
 
     List<SarLawsItems> queryByList(SarLawsItemsEOPage page);
+
+    int deleteByStandIdAndFileType(@Param("standId") String standId, @Param("fileType") String fileType);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsItems/entity/SarLawsItems.java

@@ -2,6 +2,8 @@ package com.adc.da.slrs.sarLawsItems.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -122,6 +124,16 @@ public class SarLawsItems extends BaseEntity {
     @TableField("FILE_TYPE")
     private String fileType;
 
+    @ApiModelProperty(value = "新车型实施日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("XCXSSRQLAWS")
+    private Date xcxssrqlaws;
+
+    @ApiModelProperty(value = "在产车实施日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("ZCXSSRQLAWS")
+    private Date zcxssrqlaws;
+
     @TableField(exist = false)
     private String applyArcticShow;
     @TableField(exist = false)
@@ -155,5 +167,20 @@ public class SarLawsItems extends BaseEntity {
     @TableField(exist = false)
     private String wczrsh;
 
+    @TableField(exist = false)
+    private String emergyKindShow;
+    //新加字段
+    @TableField(exist = false)
+    private String foUser;//FO
+    //新加字段带show
+    @TableField(exist = false)
+    private String oldId;
+    @TableField(exist = false)
+    private SarCompStatusInfo pgForm;
+
+    //责任工程师
+    @TableField(exist = false)
+    private String responsibleEngineer;
+
 
 }

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

@@ -0,0 +1,81 @@
+package com.adc.da.slrs.sarLawsMenu.controller;
+
+
+import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService;
+import com.adc.da.slrs.sarLawsMenu.service.ISarLawsMenuService;
+import com.adc.da.slrs.sarResource.entity.TsResource;
+import com.adc.da.slrs.sarResource.service.ITsResourceService;
+import com.adc.da.sys.util.UUIDUtils;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    *  前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-10-28
+*/
+@RestController
+@Api(description = "|SarLawsMenu|")
+@RequestMapping("/${restPath}/lawss/sarLawsMenu")
+public class SarLawsMenuController extends BaseController<SarLawsMenu> {
+
+    @Autowired
+    private ISarLawsMenuService lawsMenuService;
+
+    @Autowired
+    private ITsResourceService sarMenuEOService;
+
+    @ApiOperation(value = "|SarBussStandMenuEO|修改")
+    @PutMapping("/removeStandInfo")
+//    @RequiresPermissions("lawss:sarStandMenu:update")
+    public ResponseMessage removeStandInfo(@RequestBody SarLawsMenu standardsInfoEO) throws Exception {
+        String[] idList = standardsInfoEO.getIdlist();
+        int count = 0;
+        if(idList != null){
+            for(String id : idList){
+                SarLawsMenu menuEO = new SarLawsMenu();
+                menuEO.setLawsId(id);
+                menuEO.setMenuId(standardsInfoEO.getMenuId());
+                //删除所选目录下关联
+                String oldMenuId = standardsInfoEO.getOldMenuId();
+                if (StringUtils.isEmpty(oldMenuId)) {
+                    oldMenuId = standardsInfoEO.getMenuId();
+                }
+                menuEO.setOldMenuId(oldMenuId);
+                count += lawsMenuService.deleteByMenuId(menuEO);
+                //查询是否还有与其他节点的关联，若没有则增加与根节点的关联
+                List<SarLawsMenu> getList = lawsMenuService.selectAllMenuByStandId(menuEO);
+                if (getList == null || getList.isEmpty()) {
+                    // 查询根节点
+                    TsResource sarMenuEO = new TsResource();
+                    sarMenuEO.setSorDivide("LAWS_STAND");
+                    List<TsResource> getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO);
+                    menuEO.setMenuId(getRootMenu.get(0).getId());
+                    menuEO.setId(UUIDUtils.randomUUID20());
+                    menuEO.setValidFlag(0);
+                    lawsMenuService.save(menuEO);
+                }
+            }
+        }
+        if(count>0){
+            return Result.success("0","移除成功！",true);
+        } else {
+            return Result.error("移除失败!");
+        }
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/dao/SarLawsMenuDao.java

@@ -0,0 +1,37 @@
+package com.adc.da.slrs.sarLawsMenu.dao;
+
+import com.adc.da.slrs.sarBussStandMenu.entity.NewmenuOldmenuVO;
+import com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Repository
+public interface SarLawsMenuDao extends BaseMapper<SarLawsMenu> {
+    List<SarLawsMenu> selectByLawsInfo(SarLawsMenu sarLawsMenuEO);
+
+    int updateMenuidByMenuid(NewmenuOldmenuVO var1);
+
+    List<SarLawsMenu> selectByLawsId(String lawsId);
+
+    void deleteByLawsId(String lawsId);
+
+    List<SarLawsMenu> selectMenuByMenuParentId(SarLawsMenu sarLawsMenuEO);
+
+    int updateByLawsIdAndMenuId(SarLawsMenu sarLawsMenuEO);
+
+    int deleteByLawsIdAndMenuId(SarLawsMenu sarLawsMenuEO);
+
+    List<SarLawsMenu> selectAllMenuByStandId(SarLawsMenu sarStandMenuEO);
+
+    int deleteByMenuId(SarLawsMenu sarLawsMenuEO);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/entity/SarLawsMenu.java

@@ -0,0 +1,57 @@
+package com.adc.da.slrs.sarLawsMenu.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarLawsMenu对象", description="")
+public class SarLawsMenu extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "法规ID")
+    @TableField("LAWS_ID")
+    private String lawsId;
+
+    @ApiModelProperty(value = "目录ID")
+    @TableField("MENU_ID")
+    private String menuId;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @TableField(exist = false)
+    private String oldMenuId;
+
+    @TableField(exist = false)
+    private String[] idlist;
+
+    @TableField(exist = false)
+    private List<String> menuIds;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/entity/SarLawsMenuEOPage.java

@@ -0,0 +1,87 @@
+package com.adc.da.slrs.sarLawsMenu.entity;
+
+import com.adc.da.sys.common.BasePage;
+
+
+/**
+ * <b>功能：</b>SAR_LAWS_MENU SarLawsMenuEOPage<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2018-09-03 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarLawsMenuEOPage extends BasePage {
+
+    private String validFlag;
+    private String validFlagOperator = "=";
+    private String menuId;
+    private String menuIdOperator = "=";
+    private String lawsId;
+    private String lawsIdOperator = "=";
+    private String id;
+    private String idOperator = "=";
+
+    public String getValidFlag() {
+        return this.validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getValidFlagOperator() {
+        return this.validFlagOperator;
+    }
+
+    public void setValidFlagOperator(String validFlagOperator) {
+        this.validFlagOperator = validFlagOperator;
+    }
+
+    public String getMenuId() {
+        return this.menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public String getMenuIdOperator() {
+        return this.menuIdOperator;
+    }
+
+    public void setMenuIdOperator(String menuIdOperator) {
+        this.menuIdOperator = menuIdOperator;
+    }
+
+    public String getLawsId() {
+        return this.lawsId;
+    }
+
+    public void setLawsId(String lawsId) {
+        this.lawsId = lawsId;
+    }
+
+    public String getLawsIdOperator() {
+        return this.lawsIdOperator;
+    }
+
+    public void setLawsIdOperator(String lawsIdOperator) {
+        this.lawsIdOperator = lawsIdOperator;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIdOperator() {
+        return this.idOperator;
+    }
+
+    public void setIdOperator(String idOperator) {
+        this.idOperator = idOperator;
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/service/ISarLawsMenuService.java

@@ -0,0 +1,22 @@
+package com.adc.da.slrs.sarLawsMenu.service;
+
+import com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+public interface ISarLawsMenuService extends IService<SarLawsMenu> {
+
+    List<SarLawsMenu> selectAllMenuByStandId(SarLawsMenu sarStandMenuEO);
+
+    int deleteByMenuId (SarLawsMenu sarStandMenuEO);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/service/impl/SarLawsMenuServiceImpl.java

@@ -0,0 +1,37 @@
+package com.adc.da.slrs.sarLawsMenu.service.impl;
+
+import com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu;
+import com.adc.da.slrs.sarLawsMenu.dao.SarLawsMenuDao;
+import com.adc.da.slrs.sarLawsMenu.service.ISarLawsMenuService;
+import com.adc.da.slrs.sarResource.service.ITsResourceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Service
+public class SarLawsMenuServiceImpl extends ServiceImpl<SarLawsMenuDao, SarLawsMenu> implements ISarLawsMenuService {
+
+    @Autowired
+    private ITsResourceService sarMenuEOService;
+
+    public int deleteByMenuId (SarLawsMenu sarStandMenuEO){
+        List<String> menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId());
+        sarStandMenuEO.setMenuIds(menuIds);
+        return this.baseMapper.deleteByMenuId(sarStandMenuEO);
+    }
+
+    @Override
+    public List<SarLawsMenu> selectAllMenuByStandId(SarLawsMenu sarStandMenuEO){
+        return this.baseMapper.selectAllMenuByStandId(sarStandMenuEO);
+    }
+}

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

@@ -0,0 +1,304 @@
+package com.adc.da.slrs.sarLawsStandInfo.controller;
+
+
+import com.adc.da.common.ReadExcel;
+import com.adc.da.excel.poi.excel.ExcelExportUtil;
+import com.adc.da.exception.AdcDaBaseException;
+import com.adc.da.person.service.IPersonCollectEOService;
+import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage;
+import com.adc.da.slrs.sarLawsStandInfo.service.ISarLawsStandInfoService;
+import com.adc.da.slrs.sarResource.service.ITsResourceService;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarStandardsInfo.entity.StandardsInfoExcelVO;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.adc.da.sys.entity.DicTypeEO;
+import com.adc.da.sys.service.IDicTypeEOService;
+import com.adc.da.util.utils.StringUtils;
+import com.adc.da.utils.util.LawsStandExportUtil;
+import com.adc.da.utils.util.SarAdvanceSearchUtil;
+import com.adc.da.utils.util.StandExportUtil;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.List;
+
+/**
+* <p>
+    *  前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-10-25
+*/
+@RestController
+@Api(description = "|SarLawsStandInfo|")
+@RequestMapping("/${restPath}/lawss/sarLawsInfo")
+public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo> {
+
+    private static final Logger logger = LoggerFactory.getLogger(SarLawsStandInfoController.class);
+
+    @Autowired
+    private ISarLawsStandInfoService sarLawsInfoEOService;
+
+    @Autowired
+    private IPersonCollectEOService personCollectEOService;
+
+    @Autowired
+    private ITsResourceService iTsResourceService;
+
+
+    @Autowired
+    private ITsUserService tsUserService;
+
+    @Autowired
+    private IDicTypeEOService dicTypeEOService;
+
+    @ApiOperation(value = "|SarLawsInfoEO|分页查询")
+    @GetMapping("/page")
+    /*@RequiresPermissions("lawss:sarLawsInfo:page")*/
+    public ResponseMessage<PageInfo<SarLawsStandInfo>> page(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.getSarStandardsInfoPage(page);
+        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")
+    public ResponseMessage<SarLawsStandInfo> find(String id) throws Exception {
+        SarLawsStandInfo result = sarLawsInfoEOService.selectStandardsInfoByKey(id);
+        return Result.success(result);
+    }
+
+    @ApiOperation(value = "|SarLawsStandInfo|详情")
+    @GetMapping("/getStandInfoUpdateById")
+    //@RequiresPermissions("lawss:sarStandardsInfo:get")
+    public ResponseMessage<SarLawsStandInfo> getStandInfoUpdateById(String id) throws Exception {
+        SarLawsStandInfo result = sarLawsInfoEOService.selectStandardsInfoUpdateByKey(id);
+        String collectId = personCollectEOService.queryCollectByUserAndId(id);
+        result.setCollectId(collectId);
+        return Result.success(result);
+    }
+
+    @ApiOperation(value = "|SarLawsStandInfo|导出excel")
+    @GetMapping(value = "/exportStandardsInfoExcel")
+    public void exportStandardsInfoExcel(String exportContent, String exportType, String exportName,String userId, HttpServletResponse response,
+                                         HttpServletRequest request) throws Exception {
+        OutputStream os = null;
+        Workbook workbook = null;
+        try {
+            if(StringUtils.isEmpty(exportName)||exportName.equals("null")){
+                exportName="政策库";
+            }
+            response.setHeader("Content-Disposition",
+                    "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request));
+            response.setContentType("application/force-download");
+            // 导出所有数据
+            List<SarLawsStandInfo> data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId);
+            workbook = LawsStandExportUtil.exportDatas(data);
+
+            os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+            throw new AdcDaBaseException("下载文件失败，请重试");
+        } finally {
+            IOUtils.closeQuietly(os);
+        }
+    }
+
+    @ApiOperation(value = "|SarLawsStandInfo|确认配置标准")
+    @PostMapping("/saveStandardsMenu")
+    //@RequiresPermissions("lawss:sarBussionessStand:saveStandardsMenu")
+    public ResponseMessage saveStandardsMenu(@RequestBody SarLawsStandInfoPage standardsInfoEO){
+        if ("wdsc".equals(standardsInfoEO.getMenuId()) || "gxhbq".equals(standardsInfoEO.getMenuId())) {
+            return Result.error("所选节点不支持配置标准");
+        } else {
+            SarLawsStandInfoPage standlist = sarLawsInfoEOService.updateStandardsMenu(standardsInfoEO);
+            return Result.success(standardsInfoEO);
+        }
+    }
+
+    @ApiOperation(value = "|SarLawsStandInfo|企业标准修改")
+    @PostMapping(value = "/updateSarLawsStandInfo")
+    public ResponseMessage<SarLawsStandInfo> updateSarLawsStandInfo(@RequestBody SarLawsStandInfo sarLawsStandInfo) throws Exception {
+        sarLawsStandInfo.setModifyTime(new Date());
+        sarLawsInfoEOService.updateSarLawsStandInfo(sarLawsStandInfo);
+        return Result.success("","修改成功",sarLawsStandInfo);
+    }
+
+    @ApiOperation(value = "|SarLawsStandInfo|删除")
+    @PostMapping("deleteSarLawsStandInfo")
+    public ResponseMessage delete(String ids) throws Exception {
+        SarLawsStandInfoPage sarLawsStandInfoPage = new SarLawsStandInfoPage();
+        sarLawsStandInfoPage.setIdlist(ids.split(","));
+        ResponseMessage<SarLawsStandInfo> result = sarLawsInfoEOService.deleteSarLawsStandInfo(sarLawsStandInfoPage);
+        logger.info("delete from SAR_BUSSIONESS_STAND where id = {}", ids);
+        return result;
+    }
+
+    /**
+     * 新增过程中验证标准号
+     *
+     * @param page
+     * @return
+     */
+    @ApiOperation(value = "|SarLawsStandInfo|验证输入的标准号")
+    @PostMapping("/validateStandNumber")
+    //@RequiresPermissions("lawss:sarStandardsInfo:selectReplaceStandNum")
+    public ResponseMessage validateStandNumber(SarLawsStandInfoPage page) throws Exception {
+        String sortName = "";
+        String standNumShow = "";
+        List<DicTypeEO> getDicCode = dicTypeEOService.getDicEOByDicTypeCode(page.getStandSort());
+        if(getDicCode!= null && getDicCode.size()>0){
+            sortName =  getDicCode.get(0).getDicTypeName();
+        }
+        if (StringUtils.isNotEmpty(page.getLawsNumber())) {
+            List<SarLawsStandInfo> standlist = sarLawsInfoEOService.selectStandardsByStandNumber(page.getLawsNumber());
+            if (standlist.size() > 0) {
+                if (StringUtils.isNotEmpty(page.getId())) {
+                    // 如果是修改，判断id是否一样
+                    for (int i = 0; i < standlist.size(); i++) {
+                        if (standlist.get(i).getId().equals(page.getId())) {
+                            continue;
+                        } else {
+                            return Result.error(standNumShow + "政策编号已存在");
+                        }
+                    }
+                    return Result.success();
+                } else {
+                    return Result.error(standNumShow + "政策编号已存在");
+                }
+            } else {
+                return Result.success();
+            }
+        } else {
+            return Result.success();
+        }
+    }
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java

@@ -0,0 +1,30 @@
+package com.adc.da.slrs.sarLawsStandInfo.dao;
+
+import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo;
+import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-25
+ */
+@Repository
+public interface SarLawsStandInfoDao extends BaseMapper<SarLawsStandInfo> {
+
+    List<SarLawsStandInfo> getSarStandardsInfoPage(SarLawsStandInfoPage page);
+
+    int getSarStandardsInfoCount(SarLawsStandInfoPage page);
+
+    List<SarLawsStandInfo> selectStandardsInfoByKey(String id);
+
+    List<SarLawsStandInfo> getSarStandardsExportInfo(SarLawsStandInfoPage page);
+
+
+}

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

@@ -0,0 +1,261 @@
+package com.adc.da.slrs.sarLawsStandInfo.entity;
+
+import com.adc.da.att.vo.AttFileVo;
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+
+import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails;
+import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
+import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO;
+import com.adc.da.sys.entity.DicTypeEO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.util.*;
+
+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 oracle.sql.DATE;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarLawsStandInfo对象", description="")
+public class SarLawsStandInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "政策分类 共四级，逐级选择-配置管理中维护")
+    @TableField("LAWS_TYPE")
+    private String lawsType;
+
+    @ApiModelProperty(value = "政策编号")
+    @TableField("LAWS_NUMBER")
+    private String lawsNumber;
+
+    @ApiModelProperty(value = "中文名称")
+    @TableField("LAWS_NAME")
+    private String lawsName;
+
+    @ApiModelProperty(value = "英文名称")
+    @TableField("LAWS_EN_NAME")
+    private String lawsEnName;
+
+    @ApiModelProperty(value = "政策文号")
+    @TableField("LAWS_NO")
+    private String lawsNo;
+
+    @ApiModelProperty(value = "发文日期")
+    @TableField("ISSUE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTime;
+
+    @ApiModelProperty(value = "发文单位")
+    @TableField("ISSUE_COMPANY")
+    private String issueCompany;
+
+    @ApiModelProperty(value = "征集意见周期-起始时间")
+    @TableField("COMMENT_CYCLE_START")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String commentCycleStart;
+
+    @ApiModelProperty(value = "征集意见周期-结束时间")
+    @TableField("COMMENT_CYCLE_END")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String commentCycleEnd;
+
+    @ApiModelProperty(value = "文件状态-配置管理中维护")
+    @TableField("LAWS_TEXT_STATE")
+    private String lawsTextState;
+
+    @ApiModelProperty(value = "适用区域-配置管理中维护")
+    @TableField("LAWS_SYQY")
+    private String lawsSyqy;
+
+    @ApiModelProperty(value = "适用车型-配置管理中维护")
+    @TableField("LAWS_SYCX")
+    private String lawsSycx;
+
+    @ApiModelProperty(value = "是/否（选择否，只有政策、政策中文名称是必填项目）")
+    @TableField("IS_RELATE_ACCESS")
+    private String isRelateAccess;
+
+    @ApiModelProperty(value = "年度-可在配置管理中维护，根据发布日期自动带入可手动修改")
+    @TableField("LAWS_YEAR")
+    private String lawsYear;
+
+    @ApiModelProperty(value = "福田转发通知文号")
+    @TableField("LAWS_NOTISYNC_NUM")
+    private String lawsNotisyncNum;
+
+    @ApiModelProperty(value = "信息简报 xxx期次xxx板块")
+    @TableField("LAWS_BULLETIN")
+    private String lawsBulletin;
+
+    @ApiModelProperty(value = "标签-可在配置管理中维护")
+    @TableField("LAWS_LABEL")
+    private String lawsLabel;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("LAWS_REMARK")
+    private String lawsRemark;
+
+    @ApiModelProperty(value = "国家地区")
+    @TableField("COUNTRY")
+    private String country;
+
+    @TableField("CREATION_USER")
+    private String creationUser;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "参数1")
+    @TableField("PARAM1")
+    private Long param1;
+
+    @ApiModelProperty(value = "参数2")
+    @TableField("PARAM2")
+    private String param2;
+
+    // 非表字段
+    @ApiModelProperty(value = "代替文件号")
+    @TableField(exist = false)
+    private String replaceFileNum;
+
+    @ApiModelProperty(value = "被代替文件号")
+    @TableField(exist = false)
+    private String replacedFileNum;
+
+    @TableField(exist = false)
+    private String processNum;//流程编号
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String firstPutTime;
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTimeShow;
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTimeShow;
+
+    @TableField(exist = false)
+    private String issueTimeStr;
+
+    @TableField(exist = false)
+    private String putTimeStr;
+
+    //目录ID   非标准信息表中的字段
+    @TableField(exist = false)
+    private String  menuId;
+
+    @TableField(exist = false)
+    private String menuParentId;
+
+    @TableField(exist = false)
+    private String standStatusShow; // 标准状态下拉框   --单选
+
+    @TableField(exist = false)
+    private String standNatrueShow;
+
+    @TableField(exist = false)
+    private String standSortShow;
+
+    @TableField(exist = false)
+    private String applyCountryShow;
+
+    @TableField(exist = false)
+    private List<AttFileVo> standFileList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private List<AttFileVo> opinionFilesList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private List<AttFileVo> relevanceFileList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private String collectId;
+
+    //文件的类型
+    @TableField(exist = false)
+    private String standFileClassify;
+
+    //文件的下载id
+    @TableField(exist = false)
+    private String attId;
+
+    //记录是否修改了替代文件号
+    @TableField(exist = false)
+    private int upReplaceNumFlag;
+    //记录是否修改了文件号
+    @TableField(exist = false)
+    private int upNumFlag;
+    // 数据库新加的字段
+
+    @TableField(exist = false)
+    private String remark;//备注
+
+    @TableField(exist = false)
+    private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
+
+    @TableField(exist = false)
+    private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
+
+    @TableField(exist = false)
+    private String sarStandAttrEOStr; //新增修改时属性表信息
+
+    @TableField(exist = false)
+    private String fileIds; //全部文件ID
+
+    @TableField(exist = false)
+    private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();
+
+    @TableField(exist = false)
+    private String standTextStatusShow; // 标准文本状态显示名称
+    // 以下为非表中字段
+    @TableField(exist = false)
+    private String countryShow;  //国家地区显示名称
+    @TableField(exist = false)
+    private String standStateShow; // 标准状态显示名称
+    @TableField(exist = false)
+    private String standNatureShow; // 标准性质显示名称
+    @TableField(exist = false)
+    private List<DicTypeEO> dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据
+
+    @TableField(exist = false)
+    private List<SarStandItems> itemsList = new ArrayList<>();
+    @ApiModelProperty(value = "分解单条款内容")
+    @TableField(exist = false)
+    private Map<String,String> mapItems = new TreeMap<>();
+
+}

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

@@ -0,0 +1,277 @@
+package com.adc.da.slrs.sarLawsStandInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.base.page.BasePage;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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 oracle.sql.DATE;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-25
+ */
+@Data
+public class SarLawsStandInfoPage extends BasePage {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "政策分类 共四级，逐级选择-配置管理中维护")
+    private String lawsType;
+
+    @ApiModelProperty(value = "政策编号")
+    private String lawsNumber;
+
+    @ApiModelProperty(value = "中文名称")
+    private String lawsName;
+
+    @ApiModelProperty(value = "英文名称")
+    private String lawsEnName;
+
+    @ApiModelProperty(value = "政策文号")
+    private String lawsNo;
+
+    @ApiModelProperty(value = "发文日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTime;
+
+    @ApiModelProperty(value = "发文单位")
+    private String issueCompany;
+
+    @ApiModelProperty(value = "征集意见周期-起始时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String commentCycleStart;
+
+    @ApiModelProperty(value = "征集意见周期-结束时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String commentCycleEnd;
+
+    @ApiModelProperty(value = "文件状态-配置管理中维护")
+    private String lawsTextState;
+
+    @ApiModelProperty(value = "适用区域-配置管理中维护")
+    private String lawsSyqy;
+
+    @ApiModelProperty(value = "适用车型-配置管理中维护")
+    private String lawsSycx;
+
+    @ApiModelProperty(value = "是/否（选择否，只有政策、政策中文名称是必填项目）")
+    private String isRelateAccess;
+
+    @ApiModelProperty(value = "年度-可在配置管理中维护，根据发布日期自动带入可手动修改")
+    private String lawsYear;
+
+    @ApiModelProperty(value = "福田转发通知文号")
+    private String lawsNotisyncNum;
+
+    @ApiModelProperty(value = "信息简报 xxx期次xxx板块")
+    private String lawsBulletin;
+
+    @ApiModelProperty(value = "标签-可在配置管理中维护")
+    private String lawsLabel;
+
+    @ApiModelProperty(value = "备注")
+    private String lawsRemark;
+
+    @ApiModelProperty(value = "国家地区")
+    private String country;
+
+    @TableField("CREATION_USER")
+    private String creationUser;
+
+    @ApiModelProperty(value = "是否有效")
+    private String validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    private String creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private String modifyTime;
+
+    @ApiModelProperty(value = "参数1")
+    private String param1;
+
+    @ApiModelProperty(value = "参数2")
+    private String param2;
+
+    private String[] commentCycleDate;
+    private String modifyTime1;
+    private String modifyTime2;
+    private String modifyTimeOperator = "=";
+    private String creationTime1;
+    private String creationTime2;
+    private String creationTimeOperator = "=";
+    private String validFlagOperator = "=";
+    private String putUser;
+    private String putUserOperator = "=";
+    private String citationUser;
+    private String citationUserOperator = "=";
+    private String responsibleUnit;
+    private String responsibleUnitOperator = "=";
+    private String standFile;
+    private String standFileOperator = "=";
+    private String tags;
+    private String tagsOperator = "=";
+    private String standStatus;
+    private String standStatusOperator = "=";
+    private String replacedStandNum;
+    private String replacedStandNumOperator = "=";
+    private String replaceStandNum;
+    private String replaceStandNumOperator = "=";
+    private String quoteStand;
+    private String quoteStandOperator = "=";
+    private String firstPutTime;
+    private String firstPutTime1;
+    private String firstPutTime2;
+    private String firstPutTimeOperator = "=";
+    private String putYear;
+    private String putYear1;
+    private String putYear2;
+    private String putYearOperator = "=";
+    private String putTime;
+    private String putTime1;
+    private String putTime2;
+    private String putTimeOperator = "=";
+    private String issueTime1;
+    private String issueTime2;
+    private String issueTimeOperator = "=";
+    private String energyKind;
+    private String energyKindOperator = "=";
+    private String applyArctic;
+    private String applyArcticOperator = "=";
+    private String standEnName;
+    private String standEnNameOperator = "=";
+    private String standName;
+    private String standNameOperator = "=";
+    private String standCode;
+    private String standCodeOperator = "=";
+    private String classifyCode;
+    private String classifyCodeOperator = "=";
+    private String standSubclass;
+    private String standSubclassOperator = "=";
+    private String standGenera;
+    private String standGeneraOperator = "=";
+    private String idOperator = "=";
+    private String menuId;
+    private List<String> menuIdList;
+    private String[] idlist;
+    //为了在sql中区分修改操作
+    private String updateFlag;
+    // 数据库新增字段
+    private String applyCountry;
+    private String standYear;
+    private String applyCountryOperator = "=";
+    private String standNature;
+    private String standNatureOperator = "=";
+    private String synopsis;
+    private String synopsisOperator = "=";
+    private String standSort;
+    private String standSortOperator = "=";
+    private String opinionFile;
+    private String opinionFileOperator = "=";
+    private String relevanceFile;
+    private String relevanceFileOperator = "=";
+    private String remark;
+    private String remarkOperator = "=";
+
+    private List<String> roleIds;
+    private String rootMenuId;
+    private String orgName;
+    private List<String> menuRoleList;
+    private String[] replacedStandNumList;
+    private String numberName;
+
+    // 树结构增加搜索条件
+    private String collectMenuId;
+    private String advanceSearchVOStr;
+    private String advanceSearchStr;
+    private List<String> menuAllChildrenIdList;
+    private String userId;
+
+    private String zqcrId;
+
+    private String textStatusBuss;
+
+    // 新增字段
+    private String FZRQBUSS;
+    private String FSRQBUSS;
+    private String FBGBUSS;
+    private String BZSMBUSS;
+    private String LSBBBUSS;
+    private String QTWJBUSS;
+    private String QCDW;
+    private String QCRBUSS;
+    private String WJSCRYBUSS;
+    private String SYCXCLASS;
+    private String NYLXCLASS;
+    private String SYCPXCLASS;
+    private String TXLBBUSS;
+    private String VPPSBMBUSS;
+    private String VPPSCNBUSS;
+    private String DTQBBHBUSS;
+    private String BDTQBBHBUSS;
+    private String XGJLBUSS;
+    private String XGLC;
+    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;
+    private String sql;
+
+    // 树结构增加搜索条件
+    @TableField(exist = false)
+    private String labelMenuId;
+    @TableField(exist = false)
+    private String ids;
+    @TableField(exist = false)
+    private String proType;
+    @TableField(exist = false)
+    private Integer nowOrder;
+    @TableField(exist = false)
+    private Integer nowOrderBy;
+    @TableField(exist = false)
+    private String orderByA = "a.issue_time";
+    @TableField(exist = false)
+    private String orderBy1 = "SAR_LAWS_STAND_INFO.issue_time";
+    @TableField(exist = false)
+    private String order1 = "desc";
+
+}

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

@@ -0,0 +1,45 @@
+package com.adc.da.slrs.sarLawsStandInfo.service;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
+import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo;
+import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-25
+ */
+public interface ISarLawsStandInfoService extends IService<SarLawsStandInfo> {
+
+    void createSarStandardsInfo(SarLawsStandInfo sarLawsStandInfo) throws Exception;
+
+    void attrInfoDetails (SarLawsStandInfo row) throws Exception;
+
+    List<SarLawsStandInfo> selectStandardsByStandNumber(String replaceStandNum);
+
+    ResponseMessage<SarLawsStandInfo> deleteSarLawsStandInfo(SarLawsStandInfoPage page) throws Exception;
+
+    SarLawsStandInfo updateSarLawsStandInfo(SarLawsStandInfo sarLawsStandInfo) throws Exception;
+
+    SarLawsStandInfoPage updateStandardsMenu(SarLawsStandInfoPage standardsInfoEO);
+
+    List<SarLawsStandInfo> getExportData(String exportType, String exportContent,String userId) throws Exception;
+
+    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/sarLawsVal/controller/SarLawsValController.java

@@ -0,0 +1,23 @@
+package com.adc.da.slrs.sarLawsVal.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarLawsVal.entity.SarLawsVal;
+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-10-28
+*/
+@RestController
+@Api(description = "|SarLawsVal|")
+@RequestMapping("/sarLawsVal/sar-laws-val")
+public class SarLawsValController extends BaseController<SarLawsVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsVal/dao/SarLawsValDao.java

@@ -0,0 +1,24 @@
+package com.adc.da.slrs.sarLawsVal.dao;
+
+import com.adc.da.slrs.sarLawsVal.entity.SarLawsVal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Repository
+public interface SarLawsValDao extends BaseMapper<SarLawsVal> {
+
+    //通过标准id删除表中数据
+    int deleteDataBylawsId(String standId);
+
+    int insertForeach(List<SarLawsVal> list); //批量新增
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsVal/entity/SarLawsVal.java

@@ -0,0 +1,64 @@
+package com.adc.da.slrs.sarLawsVal.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarLawsVal对象", description="")
+public class SarLawsVal extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "法规ID")
+    @TableField("LAWS_ID")
+    private String lawsId;
+
+    @ApiModelProperty(value = "参数类型")
+    @TableField("PROPERTY_TYPE")
+    private String propertyType;
+
+    @ApiModelProperty(value = "参数内容")
+    @TableField("PROPERTY_VAL")
+    private String propertyVal;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsVal/service/ISarLawsValService.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarLawsVal.service;
+
+import com.adc.da.slrs.sarLawsVal.entity.SarLawsVal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+public interface ISarLawsValService extends IService<SarLawsVal> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsVal/service/impl/SarLawsValServiceImpl.java

@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarLawsVal.service.impl;
+
+import com.adc.da.slrs.sarLawsVal.entity.SarLawsVal;
+import com.adc.da.slrs.sarLawsVal.dao.SarLawsValDao;
+import com.adc.da.slrs.sarLawsVal.service.ISarLawsValService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-28
+ */
+@Service
+public class SarLawsValServiceImpl extends ServiceImpl<SarLawsValDao, SarLawsVal> implements ISarLawsValService {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java

@@ -3,13 +3,10 @@ package com.adc.da.slrs.sarModelTree.controller;
 
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
-import com.adc.da.slrs.sarModelTree.entity.ResponseResult;
 import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
 import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService;
-import com.adc.da.slrs.sarModelTree.service.impl.SarModuleTreeServiceImpl;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Company;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.ResponseDto;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +39,7 @@ public class SarModelTreeController extends BaseController<SarModelTree> {
     @GetMapping("/list")
     public ResponseMessage<List<SarModelTree>> getAll(){
         List<SarModelTree> tsResources = iSarModelTreeService.getAll(null);
-//        List<SarModelTree> tsResources = iSarModuleTreeService.getAll(null);
+//        TODO List<SarModelTree> tsResources = iSarModuleTreeService.getAll(null);
         return Result.success(tsResources);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java

@@ -1,7 +1,7 @@
 package com.adc.da.slrs.sarModelTree.service;
 
 import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 
 import java.util.List;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java

@@ -4,7 +4,7 @@ import com.adc.da.slrs.sarModelTree.dao.SarModuleTreeDao;
 import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
 import com.adc.da.slrs.sarModelTree.entity.SarModuleTree;
 import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -25,27 +26,38 @@ public class SarModuleTreeServiceImpl extends ServiceImpl<SarModuleTreeDao, SarM
     @Autowired()
     private SarModuleTreeServiceImpl  sarModuleTreeService;
 
-
+    /**
+     * @param sarModelTree
+     * @return 所有的根节点
+     */
     @Override
     public List<SarModelTree> getAll(SarModelTree sarModelTree) {
         QueryWrapper<SarModuleTree> treeQueryWrapper = new QueryWrapper<>();
         treeQueryWrapper.groupBy("FTVSTYPE1");
         List<SarModuleTree> moduleTreeList = this.baseMapper.selectList(treeQueryWrapper);
-
-        //把SarModuleTree类型的list集合转换为SarModelTree类型的list集合
-        List<SarModelTree> sarModelTreeList = moduleTreeList.stream().map(SarModuleTree -> {
-            SarModelTree modelTree = new SarModelTree();
-            modelTree.setId(SarModuleTree.getGuid());
-            modelTree.setName(SarModuleTree.getFtvstype1());
-//            modelTree.setModel("TS"+SarModuleTree.get);
-            return modelTree;
-        }).collect(Collectors.toList());
-
-        return sarModelTreeList;
+        //返回转换元素后的数组
+        return listTransform(moduleTreeList);
     }
 
+    /**
+     * 根据根节点查询其所有的子节点
+     * @param parent
+     * @return
+     */
     @Override
     public List<SarModelTree> recursionGetChildren(SarModelTree parent) {
+
+        QueryWrapper<SarModuleTree> treeQueryWrapper = new QueryWrapper<>();
+        treeQueryWrapper.eq("GUID",parent.getId());
+        List<SarModuleTree> moduleTreeList = this.baseMapper.selectList(treeQueryWrapper);
+
+
+        Map<String, List<SarModuleTree>> collect = moduleTreeList.stream().collect(Collectors.groupingBy(SarModuleTree::getFtvstype1));
+        collect.forEach((k, v)->{
+            SarModelTree modelTree = new SarModelTree();
+            //TODO 生成树型结构
+//            modelTree
+        });
         return null;
     }
 
@@ -93,5 +105,25 @@ public class SarModuleTreeServiceImpl extends ServiceImpl<SarModuleTreeDao, SarM
         return head;
     }
 
+    /**
+     *  把SarModuleTree类型的list集合转换为SarModelTree类型的list集合,这样就不用修改前端代码( •̀ ω •́ )✧
+     *  --->对修改关闭,对扩展开放
+     * @param moduleTreeList
+     * @return
+     */
+    public List<SarModelTree> listTransform(List<SarModuleTree> moduleTreeList){
+
+       return  moduleTreeList.stream().map(SarModuleTree -> {
+            SarModelTree modelTree = new SarModelTree();
+            modelTree.setId(SarModuleTree.getGuid());
+            modelTree.setName(SarModuleTree.getFtvstype1());
+            modelTree.setModel("TS"
+                    +SarModuleTree.getFtvstype2().substring(SarModuleTree.getFtvstype2().length()-2)
+                    +SarModuleTree.getSeriesid()
+                    +SarModuleTree.getReserved()
+                    +SarModuleTree.getStarted()); //"TS"+SF_ID+SE_ID+SU_ID 拼接模块编号ID
+            return modelTree;
+        }).collect(Collectors.toList());
+    }
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java

@@ -57,6 +57,14 @@ public interface TsPositionDao extends BaseMapper<TsPosition> {
      */
     List<TsPosition> selectPositionAndRole(TsPosition tsPosition);
 
+    /**
+     * 总数
+     * @param tsPosition
+     * @return
+     */
+    Integer countPositionAndRole(TsPosition tsPosition);
+
+
     /**
      * 通过岗位列表查询绑定的角色列表
      * @param positionIds：岗位列表

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java

@@ -44,9 +44,10 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
     @Override
     public IPage<TsPosition> getPosition(TsPosition tsPosition) {
         IPage page=new Page();
-
-        page.setTotal(tsPositionDao.pageTotal());
+//        page.setTotal(tsPositionDao.pageTotal());
+        page.setTotal(tsPositionDao.countPositionAndRole(tsPosition));
         page.setRecords(tsPositionDao.selectPositionAndRole(tsPosition));
+        page.setTotal(page.getTotal());
         page.setCurrent(tsPosition.getCurrent());
         page.setSize(tsPosition.getPageSize());
         System.out.println(page.getTotal());

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/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)));
                 }
             }
         }
@@ -287,14 +291,18 @@ 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)){
+            if(!sorDivide.equals("INLAND_STAND") && !sorDivide.equals("FOREIGN_STAND")){
+                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;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java

@@ -77,6 +77,8 @@ public class SarStandAttrDetailsController extends BaseController<SarStandAttrDe
 
 
         // 政策属性字段
+        List<SarStandAttrDetails> getLawsStandList = InitStandAttrUtil.lawsStandAttrFieldList;
+        resultMap.put(SarTypeEnum.LAWS_STAND.getValue(),getLawsStandList);
         List<SarStandAttrDetails> getInlandLawsList = InitStandAttrUtil.lawsInlandAttrFieldList;
         resultMap.put(SarTypeEnum.INLAND_LAWS.getValue(),getInlandLawsList);
         List<SarStandAttrDetails> getForeignLawsList = InitStandAttrUtil.lawsForeignAttrFieldList;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java

@@ -66,6 +66,7 @@ public class SarStandAttrDetailsServiceImpl extends ServiceImpl<SarStandAttrDeta
         standTypeList.add(SarTypeEnum.INLAND_STAND.getValue());
         standTypeList.add(SarTypeEnum.FOREIGN_STAND.getValue());
         lawsTypeList.add(SarTypeEnum.LAWS.getValue());
+        lawsTypeList.add(SarTypeEnum.LAWS_STAND.getValue());
         lawsTypeList.add(SarTypeEnum.INLAND_LAWS.getValue());
         lawsTypeList.add(SarTypeEnum.FOREIGN_LAWS.getValue());
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -10,6 +10,7 @@ import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController;
 import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
+import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,7 +40,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     @Autowired
     private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
     @Autowired
-    private SarStandardsInfoController sarStandardsInfoController;
+    private ISarStandardsInfoService sarStandardsInfoService;
     @Autowired
     private SarStandItemsDao sarStandItemsDao;
 
@@ -155,7 +156,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         page.setUserId(null);
         List<SarStandardsInfo> pageInfo = null;
         try {
-            pageInfo = sarStandardsInfoController.getSarStandardsInfoPage(page).getData().getList();
+            pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -2,17 +2,13 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
 import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl;
-import com.adc.da.sys.util.UUIDUtils;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -21,8 +17,6 @@ import com.adc.da.base.web.BaseController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 /**
  * <p>
@@ -50,7 +44,7 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
      **/
     @GetMapping("/queryProject")
     @ApiOperation("车型/项目库")
-    public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,
+    public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", required=false,value = "page")int Page, @RequestParam(defaultValue = "10", required=false,value = "pageSize") int PageSize,
                                                    SarStandProjectLibraryDto sarDto) {
         IPage<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize,sarDto);
         IPage<SarStandProjectLibrary> notMaintenanceList = sarStandProjectLibraryService.queryNotMaintenanceProject(Page,PageSize,sarDto);
@@ -231,13 +225,9 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
     public ResponseDto save(@RequestBody String jsonStr){
         log.info(jsonStr);
         Head head = sarStandProjectLibraryService.AnalysisJsonAndStorage(jsonStr);
-        ArrayList<Company> companies = new ArrayList<>();
-        ResponseDto responseDto = new ResponseDto(head,companies);
-        //todo 未确定返回内容
-        Company company = new Company();
-        company.setCOMPANY_CODE("");
-        company.setFISCAL_YEAR("");
-        companies.add(company);
+
+        ResponseDto responseDto = new ResponseDto(head);
+
         return responseDto;
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java

@@ -1,10 +0,0 @@
-package com.adc.da.slrs.sarStandProjectLibrary.entity;
-
-import lombok.Data;
-
-@Data
-public class Company {
-    private String COMPANY_CODE;
-
-    private String FISCAL_YEAR;
-}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java

@@ -74,7 +74,6 @@ public class SarStandProjectLibrary extends BaseEntity {
     private String projectManager;
 
     @ApiModelProperty(value = "项目经理名称")
-
     @TableField(exist = false)
     private String uName;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/myResponse/Head.java

@@ -1,6 +1,7 @@
-package com.adc.da.slrs.sarStandProjectLibrary.entity;
+package com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -24,4 +25,30 @@ public class Head extends BaseEntity {
     }
 
     public Head(){};
+
+
+    @JsonProperty("BIZTRANSACTIONID")
+    public String getBIZTRANSACTIONID() {
+        return BIZTRANSACTIONID;
+    }
+    @JsonProperty("RESULT")
+    public String getRESULT() {
+        return RESULT;
+    }
+    @JsonProperty("ERRORCODE")
+    public String getERRORCODE() {
+        return ERRORCODE;
+    }
+    @JsonProperty("ERRORINFO")
+    public String getERRORINFO() {
+        return ERRORINFO;
+    }
+    @JsonProperty("COMMENTS")
+    public String getCOMMENTS() {
+        return COMMENTS;
+    }
+    @JsonProperty("SUCCESSCOUNT")
+    public String getSUCCESSCOUNT() {
+        return SUCCESSCOUNT;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/myResponse/MyResult.java

@@ -0,0 +1,24 @@
+package com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class MyResult {
+//    private String COMPANY_CODE;
+//
+//    private String FISCAL_YEAR;
+
+    private String msg;
+
+    private String code;
+
+    private boolean success;
+
+
+    public MyResult(){
+        this.msg="";
+        this.code="";
+        this.success=true;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/myResponse/ResponseDto.java

@@ -1,9 +1,10 @@
-package com.adc.da.slrs.sarStandProjectLibrary.entity;
+package com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 @Data
 public class ResponseDto {
@@ -26,12 +27,19 @@ public class ResponseDto {
     }
 
     public ResponseDto(Head HEAD) {
-        ArrayList<Company> companies = new ArrayList<>();
-        Company company = new Company();
-        company.setCOMPANY_CODE("");
-        company.setFISCAL_YEAR("");
-        companies.add(company);
-        this.LIST=companies;
+
+
+        this.LIST=Arrays.asList(new MyResult());
         this.HEAD=HEAD;
     }
+
+    @JsonProperty("HEAD")
+    public Head getHEAD() {
+        return HEAD;
+    }
+
+    @JsonProperty("LIST")
+    public List<?> getLIST() {
+        return LIST;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandProjectLibrary.service;
 
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
 import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService;
 import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
@@ -75,25 +76,23 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             //把刚刚拿到的值存到实体类里
             SarStandProjectLibrary projectInfo = new SarStandProjectLibrary();
             projectInfo
-                    .setProjectPlatfor(projectObject.get("projectPlatfor").getAsString())
-                    .setProjectNumber(projectObject.get("projectNumber").getAsString())
-                    .setProjectName(projectObject.get("projectName").getAsString())
-                    .setProjectClassification(projectObject.get("projectClassification").getAsString())
-                    .setProjectStatus(projectObject.get("projectStatus").getAsString())
-                    .setProjectGroup(projectObject.get("projectGroup").getAsString())
-                    .setCurrentNode(projectObject.get("currentNode").getAsString())
-                    .setProjectLevel(projectObject.get("projectLevel").getAsString())
-                    .setProductLine(projectObject.get("productLine").getAsString());
-
-            projectObject.get("projectEndDate").getAsString();
+                    .setProjectPlatfor(projectObject.get("eng_platform").getAsString())
+                    .setProjectNumber(projectObject.get("code").getAsString())
+                    .setProjectName(projectObject.get("name").getAsString())
+                    .setProjectClassification(projectObject.get("catalog_name").getAsString())
+                    .setProjectStatus(projectObject.get("project_status").getAsString())
+                    .setProjectGroup(projectObject.get("project_group_name").getAsString())
+                    .setCurrentNode(projectObject.get("project_current_milestone").getAsString())
+                    .setProjectLevel(projectObject.get("project_level").getAsString())
+                    .setProductLine(projectObject.get("eng_product_line").getAsString());
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
 
-            Date targetBeginOn = null;
-            try {
-                targetBeginOn = simpleDateFormat.parse(projectObject.get("projectStartDate").getAsString());
 
-                Date targetEndOn = simpleDateFormat.parse(projectObject.get("projectEndDate").getAsString());
+            try {
+                Date targetBeginOn = simpleDateFormat.parse(projectObject.get("target_begin_on").getAsString());
+
+                Date targetEndOn = simpleDateFormat.parse(projectObject.get("target_end_on").getAsString());
                 projectInfo
                         .setProjectStartDate(targetBeginOn)
                         .setProjectEndDate(targetEndOn);
@@ -251,8 +250,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     @Override
     public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
         QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
-        wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","s.uName");
-        wrapper.last("inner join ts_user s on s.USID = sar_stand_project_library.project_manager");
+        wrapper.select("product_line","s.user_id as projectManager","s.NAME AS uName");
+        wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" +
+                " and sar_stand_project_library.product_line IS not NULL");
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
         System.out.println("总条数"+userIPage.getTotal());
@@ -436,6 +436,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = new Page<>();
         if (3!=flag) {
+            //6922
             List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPages(current, pageSize, wrapper, flag);
             Integer count = sarStandProjectLibraryDao.selectCount(wrapper, flag);
             userIPage.setCurrent(current);
@@ -445,6 +446,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             return userIPage;
         }
         else {
+            //6922
             flag=2;
             List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag);
             Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java

@@ -2,9 +2,8 @@ package com.adc.da.slrs.sarStandProjectTeam.controller;
 
 
 import com.adc.da.base.web.BaseController;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Company;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.ResponseDto;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
 import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam;
 import com.adc.da.slrs.sarStandProjectTeam.service.ISarStandProjectTeamService;
 import io.swagger.annotations.Api;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-
 
 /**
 * <p>
@@ -41,13 +38,8 @@ public class SarStandProjectTeamController extends BaseController<SarStandProjec
     public ResponseDto save(@RequestBody String jsonStr){
         log.info(jsonStr);
         Head head = sarStandProjectTeamService.AnalysisJsonAndStorage(jsonStr);
-        ArrayList<Company> companies = new ArrayList<>();
         //todo 未确定返回内容
-        Company company = new Company();
-        company.setCOMPANY_CODE("");
-        company.setFISCAL_YEAR("");
-        companies.add(company);
-        ResponseDto responseDto = new ResponseDto(head,companies);
+        ResponseDto responseDto = new ResponseDto(head);
         return responseDto;
 
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/ISarStandProjectTeamService.java

@@ -1,6 +1,6 @@
 package com.adc.da.slrs.sarStandProjectTeam.service;
 
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam;
 import com.baomidou.mybatisplus.extension.service.IService;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java

@@ -1,15 +1,13 @@
 package com.adc.da.slrs.sarStandProjectTeam.service.impl;
 
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam;
 import com.adc.da.slrs.sarStandProjectTeam.dao.SarStandProjectTeamDao;
 import com.adc.da.slrs.sarStandProjectTeam.service.ISarStandProjectTeamService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.springframework.stereotype.Service;

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

@@ -91,27 +91,27 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
     @GetMapping("/getSarStandardsInfoPage")
     //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
-    public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
+    public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPage(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
         int isNull = -1;
         if (null != page.getNowOrderBy()) {
             switch (page.getNowOrderBy()) {
                 case 1:
-                    page.setOrderBy1("issueTime");//发布日期
+                    page.setOrderByA("issueTime");//发布日期
                     break;
                 case 2:
-                    page.setOrderBy1("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
+                    page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
                     break;
                 case 3:
-                    page.setOrderBy1("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
+                    page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
                     break;
                 case 4:
-                    page.setOrderBy1("SAR_STANDARDS_INFO.text_status");//文本状态
+                    page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态
                     break;
                 case 5:
-                    page.setOrderBy1("paixu");
+                    page.setOrderByA("paixu");
                     break;
                 case 6:
-                    page.setOrderBy1("SAR_STAND_ATTR_INFO.SSRQ");
+                    page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ");
                     break;
                 default:
                     page.setNowOrder(null);
@@ -183,6 +183,67 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+    @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
+    @GetMapping("/getSarStandardsInfoPageBak")
+    //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
+    public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
+//        int isNull = -1;
+//        if (null != page.getNowOrderBy()) {
+//            switch (page.getNowOrderBy()) {
+//                case 1:
+//                    page.setOrderByA("issueTime");//发布日期
+//                    break;
+//                case 2:
+//                    page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
+//                    break;
+//                case 3:
+//                    page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
+//                    break;
+//                case 4:
+//                    page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态
+//                    break;
+//                case 5:
+//                    page.setOrderByA("paixu");
+//                    break;
+//                case 6:
+//                    page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ");
+//                    break;
+//                default:
+//                    page.setNowOrder(null);
+//                    break;
+//            }
+//            if (null != page.getNowOrder()) {
+//                switch (page.getNowOrder()) {
+//                    case 1:
+//                        page.setOrder1("desc");
+//                        break;
+//                    case 2:
+//                        page.setOrder1("asc");
+//                    default:
+//                        page.setOrder1(null);
+//                        break;
+//                }
+//            }
+//        }
+//
+//
+//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+//            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
+//            if (StringUtils.isNotBlank(advanceStr)) {
+//                page.setAdvanceSearchStr(advanceStr);
+//            } else {
+//                page.setAdvanceSearchStr(null);
+//            }
+//        }
+//
+//        if(page.getUserId() == null || page.getUserId().equals("")){
+//            page.setUserId(LoginUserUtil.getUserId());
+//        }
+        List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
     @ApiOperation(value = "|SarStandardsInfoEO|新增")
     @PostMapping("/addarStandardsInfo")
     //401问题2021-03-31暂时注释掉 liuhuiwen
@@ -466,6 +527,14 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         return Result.success(result);
     }
 
+    @ApiOperation(value = "|SarStandardsInfoEO|修改详情")
+    @GetMapping("/getStandInfoUpdateById")
+    //@RequiresPermissions("lawss:sarStandardsInfo:get")
+    public ResponseMessage<SarStandardsInfo> findUpdateById(String id) throws Exception {
+        SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoUpdateByKey(id);
+        return Result.success(result);
+    }
+
     @ApiOperation(value = "|SarStandardsInfoEO|确认配置标准")
     @PostMapping("/saveStandardsMenu")
     //@RequiresPermissions("lawss:sarStandardsInfo:saveStandardsMenu")

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

@@ -199,6 +199,12 @@ public class SarStandardsInfo extends BaseEntity {
     private String jspg;
     @TableField(exist = false)
     private String CHJL;
+    @TableField(exist = false)
+    private String SSRQ;
+    @TableField(exist = false)
+    private String ZCCSSRQ;
+    @TableField(exist = false)
+    private String XCXSSRQ;
 
     @TableField(exist = false)
     private String putTime2;

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

@@ -84,6 +84,7 @@ public class SarStandardsInfoEOPage extends BasePage {
     private String productId;
     private Integer nowOrder;
     private Integer nowOrderBy;
+    private String orderByA = "a.issue_time";
     private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
     private String order1 = "desc";
 

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

@@ -21,6 +21,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
     List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception;
 
+    List<SarStandardsInfo> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception;
+
     void createSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception;
 
     int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception;
@@ -37,6 +39,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
     SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception;
 
+    SarStandardsInfo selectStandardsInfoUpdateByKey(String id) throws Exception;
+
     public void attrInfoDetails (SarStandardsInfo row) throws Exception;
 
     boolean updateStandardsMenu(SarStandardsInfoEOPage standardsInfoEO);

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

@@ -1,6 +1,9 @@
 package com.adc.da.slrs.sarStandardsInfo.service.impl;
 
 import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.slrs.sarPosition.entity.TsPosition;
+import com.adc.da.slrs.sarPosition.service.ITsPositionService;
+import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.att.vo.AttFileVo;
 import com.adc.da.common.*;
@@ -69,6 +72,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.sf.json.JSONObject;
+import org.apache.catalina.User;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.util.PDFTextStripper;
@@ -116,6 +120,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Value("${file.path}")
     private String filePath;//文件存储路径
 
+    @Autowired
+    private ITsPositionService iTsPositionService;
+
     @Autowired
     private SarStandardsInfoDao dao;
 
@@ -277,7 +284,36 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      * @Param: [page]
      * @Return: java.util.List<com.adc.da.lawss.entity.SarStandardsInfoEO>
      */
+    @Override
     public List<SarStandardsInfo> getSarStandardsInfoPage(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);
+        attrInfoCollect(sarlist);
+        return sarlist;
+    }
+
+    @Override
+    public List<SarStandardsInfo> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
         if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
             QueryWrapper<TsResource> qw = new QueryWrapper<>();
@@ -304,6 +340,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return sarlist;
     }
 
+    public void attrInfo(List<SarStandardsInfo> sarlist) throws Exception {
+        for (SarStandardsInfo row : sarlist) {
+            attrInfoDetails(row);
+        }
+    }
+
     /***
      * @Description: 处理属性表数据
      * @Author: super_liu
@@ -311,9 +353,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      * @Param: [sarlist]
      * @Return: void
      */
-    public void attrInfo(List<SarStandardsInfo> sarlist) throws Exception {
+    public void attrInfoCollect(List<SarStandardsInfo> sarlist) throws Exception {
+        List<String> collectResIds = sarlist.stream().map(SarStandardsInfo::getId).collect(Collectors.toList());
+        Map<String,String> collectMap = personCollectEOService.queryCollectByUserAndIds(collectResIds);
         for (SarStandardsInfo row : sarlist) {
-            attrInfoDetails(row);
+            if(collectMap != null && collectMap.get(row.getId()) != null){
+                row.setCollectId(collectMap.get(row.getId()));
+            }
         }
     }
 
@@ -337,44 +383,58 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             Map<String, Object> newMap = new HashMap<>();
             if (getAttrMap != null) {
                 for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
-                    if ("EOPSSRQ".equals(entry.getKey())) {
-                        if (entry.getValue() != null && entry.getValue().toString().length() > 10) {
-                            String time = DateUtil.formatStrUTCToDateStr(entry.getValue().toString());
-                            entry.setValue(time);
-                        }
-                    }
                     String name = entry.getKey();
                     if ("\"null\"".equals(entry.getValue())) {
                         entry.setValue("");
                     }
-                    if ("SVPPS".equals(name)) {
-                        Set<String> set = new HashSet();
-                        // 查询条款svpps
-                        Set<String> itemSvpps = sarStandItemsEODao.selectSvppsByStandId(row.getId(), null, null);
-                        if (itemSvpps != null && !itemSvpps.isEmpty()) {
-                            set.addAll(itemSvpps);
+                    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);
                         }
-                        Object value = entry.getValue();
-                        if (value != null && StringUtils.isNotBlank(value.toString())) {
-                            set.addAll(Arrays.asList(value.toString().split(",")));
-                        }
-                        String allVal = ConcatStringUtil.concatSet(set);
-                        if (StringUtils.isNotBlank(allVal)) {
-                            entry.setValue(allVal);
-                            value = sysInfoEOService.getSvppsNamesByIds(allVal);
-                        }
-                        newMap.put(name + "Name", value);
-                    } else if ("YQLX".equals(name)) {
-                        //要求类型来源于条款
-                        SarStandItems sarStandItemsEO = new SarStandItems();
-                        sarStandItemsEO.setStandId(row.getId());
-                        Set<String> itemClaimType = sarStandItemsEODao.selectClaimTypesByStandId(row.getId(), null, null);
-                        if (itemClaimType != null && itemClaimType.size() > 1) {
-                            entry.setValue("RENVECPFGT");
-                        } else if (itemClaimType != null && itemClaimType.size() == 1) {
-                            entry.setValue(itemClaimType.toArray()[0]);
-                        }
-                    } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+                    }
+                }
+                getAttrMap.putAll(newMap);
+            }
+
+            if (getAttrMap != null && !getAttrMap.isEmpty()) {
+                row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
+            }
+
+            row.setAttrInfoMap(getAttrMap);
+        }
+    }
+
+    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)) {
@@ -469,7 +529,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         if (StringUtils.isNotBlank(value)) {
                             List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
                             entry.setValue(fileObj);
-                          //以标准id和文本类型查询分解单表 有数据设标记为为 1
+                            //以标准id和文本类型查询分解单表 有数据设标记为为 1
                             FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO();
                             sarItemCount.setStandId(row.getId());
                             sarItemCount.setFileType(name);
@@ -482,7 +542,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
                         value = entry.getValue().toString();
                         List<String> valArr = Arrays.asList(value.split(","));
-                        value = dicTypeEODao.getDicNamesByCodes(valArr);
+
+                        switch (name){
+                            //通过id绑定责任工程师名称
+                            case "ZRGCS":{
+                                QueryWrapper<TsUser> tsUserQW = new QueryWrapper<>();
+                                tsUserQW.select("UNAME")
+                                        .in("USID",valArr);
+                                List<String> stringList = tsUserService.listObjs(tsUserQW, o ->o.toString());
+                                value= String.join(",", stringList);
+                                break;
+                            }
+                            //通过id绑定责任部门师名称
+                            case "ZRBM":{
+                                QueryWrapper<TsPosition> tsPositionQW = new QueryWrapper<>();
+                                tsPositionQW.select("name")
+                                        .in("id",valArr);
+                                List<String> stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString());
+                                value = String.join(",", stringList);
+                                break;
+                            }
+                            default:value = dicTypeEODao.getDicNamesByCodes(valArr);
+                        }
+
+
                         entry.setValue(value);
                     }
                 }
@@ -568,6 +651,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: 新增标准
@@ -603,21 +735,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
             //编写预警信息
 //            writeWarnings(sarStandardsInfoEO);
+            // 处理属性表信息
+            if (StringUtils.isNotBlank(sarStandardsInfoEO.getSarStandAttrEOStr())) {
+                createStandAttrInfo(sarStandardsInfoEO);
+            }
+
             updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
             updateCiteStand(sarStandardsInfoEO, null, "BFDTBZ", "BBFDTBZ");
 //            updateRelateStand(sarStandardsInfoEO, "CBBH");
             // 根据代替标准号修改被代替的标准的状态  修改为已修订状态
             replaseStandState(sarStandardsInfoEO);
-            // 处理属性表信息
-            if (StringUtils.isNotBlank(sarStandardsInfoEO.getSarStandAttrEOStr())) {
-                createStandAttrInfo(sarStandardsInfoEO);
-            }
+
             // 增加关联事件
             String number = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber();
             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) {
                 // 消息队列
@@ -1418,19 +1552,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);
@@ -1442,14 +1580,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;
     }
 
@@ -2126,6 +2263,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return sarStandardsInfoEO;
     }
 
+    public SarStandardsInfo selectStandardsInfoUpdateByKey(String id) throws Exception {
+        //查询出详情信息
+        List<SarStandardsInfo> resultlist = dao.selectStandardsInfoByKey(id);
+        SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
+        if (resultlist.size() > 0) {
+            List<SarStandardsInfo> sarStandardsInfoEOList = new ArrayList<>();
+            sarStandardsInfoEOList.add(resultlist.get(0));
+            attrInfo(sarStandardsInfoEOList);
+            sarStandardsInfoEO = sarStandardsInfoEOList.get(0);
+        }
+        // 查询纳入清单的国家地区
+        if (sarStandardsInfoEO != null) {
+            if(sarStandardsInfoEO.getStandSystem() != null){
+                SarMenuStandard menu = sarMenuStandardService.selectMenuById(sarStandardsInfoEO.getStandSystem());
+                if(menu != null){
+                    sarStandardsInfoEO.setStandSystemName(menu.getMenuName() == null ? "" : menu.getMenuName());
+                }
+            }
+            String accessCountry = sarSarAccessEOService.getCountryByRes(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND");
+            sarStandardsInfoEO.setAccessCountry(accessCountry);
+        }
+        return sarStandardsInfoEO;
+    }
+
     public boolean updateStandardsMenu(SarStandardsInfoEOPage standardsInfoEO) {
         SarStandMenu sarStandMenuEO = new SarStandMenu();
         String nowMenuId = standardsInfoEO.getMenuId();

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,20 @@
+package com.adc.da.slrs.wgDept.dao;
+
+import com.adc.da.slrs.wgDept.entity.WgDept;
+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<WgDept> researchDatas(@Param(value = "data") String data);
+}

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

@@ -0,0 +1,56 @@
+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="集团参与情况")
+@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("datum")
+    private String datum;
+
+
+}

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,66 @@
+package com.adc.da.slrs.wgMeetingInfo.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="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")
+    private LocalDateTime meetingTime;
+
+    @ApiModelProperty(value = "会议名称")
+    @TableField("meet_name")
+    private String meetingName;
+
+    @ApiModelProperty(value = "会议人员")
+    @TableField("meeting_people")
+    private String meetingPeople;
+
+    @ApiModelProperty(value = "会议人员名称")
+    @TableField("meeting_people_name")
+    private String meetingPeopleName;
+
+    @ApiModelProperty(value = "会议报告")
+    @TableField("meeting_report")
+    private String meetingReport;
+
+    @ApiModelProperty(value = "会议资料")
+    @TableField("meeting_datum")
+    private String meetingDatum;
+
+
+}

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/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,22 @@
+package com.adc.da.slrs.wgNetInfo.dao;
+
+import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo;
+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<WgNetInfo> researchDatas(@Param(value = "data") String data);
+
+}

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

@@ -0,0 +1,44 @@
+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;
+
+
+}

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,70 @@
+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("pay_datum")
+    private String payDatum;
+
+    @ApiModelProperty(value = "费用列支")
+    @TableField("pay_info")
+    private String payInfo;
+
+
+}

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