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

2021-08-12 09:40:39 +08:00
parent 86ca149885 440bb7d038
commit 7071cb23c8
20 changed files with 197 additions and 57 deletions
@@ -25,6 +25,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
+import org.elasticsearch.search.sort.SortOrder;
 import org.json.JSONTokener;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

@Component
@@ -77,6 +80,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
        searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
+                .addSort("issueTime", SortOrder.DESC)
                .setSize(searchInfoEO.getPageSize());

        if(searchInfoEO.getSelectIndex().equals("stand")) {
@@ -91,13 +95,20 @@ public class SearchCenterServiceImpl implements SearchCenterService {
            QueryBuilder multiQueryBuilder;
            switch (searchInfoEO.getSelectIndex()){
                case "stand":
+                    if (isRqFormat(searchInfoEO.getSelectValue())) {
+                        Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
+                        Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
+                        RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
+                        boolQueryShould.should(rangeQueryBuilder);
+                    }
                    boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                            .should(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                            .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                            .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                            .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
-                            .should(QueryBuilders.wildcardQuery("standNature.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
-                            .should(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
+                            .should(QueryBuilders.wildcardQuery("standNatureName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
+                            .should(QueryBuilders.wildcardQuery("textStatusName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
+                            .should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                            .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                            .should(QueryBuilders.wildcardQuery("content.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                            .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
@@ -205,6 +216,30 @@ public class SearchCenterServiceImpl implements SearchCenterService {
        return result;
    }

+    private Date dateFormatToStr(String dateStr){
+        Date date = new Date();
+        try {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            date =  dateFormat.parse(dateStr.trim().substring(0,10));
+        }catch (Exception e){
+            e.getMessage();
+        }
+        return date;
+    }
+
+    public static boolean isRqFormat(String mes){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            if (mes.equals(sdf.format(sdf.parse(mes)))) {
+                return true;
+            }
+        }catch (Exception e){
+            return false;
+        }
+
+       return false;
+    }
+
    /**
     * 自动匹配动态字段条件查询 ES
     * @param searchInfoEO
@@ -255,7 +290,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                    if(json instanceof org.json.JSONArray){
                        fields = JSONObject.parseArray(collectAttrMap.get(field).toString(),String.class);
                    }else {
-                        fields.add(collectAttrMap.get(field).toString());
+                        if(!json.equals("null")){
+                            fields.add(collectAttrMap.get(field).toString());
+                        }
                    }
                    if(!fields.isEmpty()){
                        for (String str : fields) {
@@ -152,10 +152,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
            contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append("  ");
            contentBuilder.append("标准名称:").append(attrInfoMap.get("standName")).append("  ");
            contentBuilder.append("标准英文名称:").append(attrInfoMap.get("standEnName")).append("  ");
-            contentBuilder.append("标准性质:").append(attrInfoMap.get("standNature")).append("  ");
-            contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatus")).append("  ");
+            contentBuilder.append("标准性质:").append(attrInfoMap.get("standNatureName")).append("  ");
+            contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusName")).append("  ");
            contentBuilder.append("标准发布日期:").append(attrInfoMap.get("issueTime")).append("  ");
-            contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccess")).append("  ");
+            contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccessName")).append("  ");

            // 区分国内、海外
            if (isForeign) {
@@ -5,6 +5,7 @@ import com.adc.da.slrs.otSvpps.service.IOtSvppsService;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 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.rabbitmq.client.Channel;
 import net.sf.json.JSONObject;
@@ -35,6 +36,9 @@ public class SendStandMQService {
    @Autowired
    private SysInfoEOService sysInfoEOService;

+    @Autowired
+    private DicTypeEODao dicTypeEODao;
+

    @Autowired
    private IOtSvppsService otSvppsEOService;
@@ -112,12 +116,45 @@ public class SendStandMQService {
            saveMap.put("standstateshow",codeName);
        }
        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);
+        }
+        String standNatureName = "";
+        if(infoEO.getStandNature() != null && StringUtils.isNotBlank(infoEO.getStandNature())){
+            List<String> valArr = Arrays.asList(infoEO.getStandNature().split(","));
+            standNatureName = dicTypeEODao.getDicNamesByCodes(valArr);
+        }
        saveMap.put("standNature",infoEO.getStandNature());
+        saveMap.put("standNatureName",standNatureName);
        saveMap.put("synopsis",infoEO.getSynopsis());
        saveMap.put("standType",infoEO.getStandType());
+        String textStatusName = "";
+        if(infoEO.getTextStatus() != null && StringUtils.isNotBlank(infoEO.getTextStatus())){
+            List<String> valArr = Arrays.asList(infoEO.getTextStatus().split(","));
+            textStatusName = dicTypeEODao.getDicNamesByCodes(valArr);
+        }
        saveMap.put("textStatus",infoEO.getTextStatus());
+        saveMap.put("textStatusName",textStatusName);
+        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);
        saveMap.put("standSystem",infoEO.getStandSystem());

        // 自定义属性字段
@@ -148,16 +185,18 @@ public class SendStandMQService {

        //当建立代替时，产生的没有文件的问题
        if (StringUtils.isBlank(String.valueOf(saveMap.get("content")))) {
-            String context = String.valueOf(saveMap.get("FBGBJBD")) + ","
-                    + String.valueOf(saveMap.get("XXZLXX")) + ","
-                    + String.valueOf(saveMap.get("ZQYJG")) + ","
-                    + String.valueOf(saveMap.get("BPG")) + ","
-                    + String.valueOf(saveMap.get("CA")) + ","
-                    + String.valueOf(saveMap.get("SSG")) + ","
-                    + String.valueOf(saveMap.get("JDWJ")) + ","
-                    + String.valueOf(saveMap.get("XGD")) + ","
-                    + String.valueOf(saveMap.get("KWJ")) + ","
-                    + String.valueOf(saveMap.get("ZBJBD"));
+            List<String> list = new ArrayList<>();
+
+            String context = filterStringIsNotBlank(String.valueOf(saveMap.get("FBGBJBD")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("XXZLXX")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("ZQYJG")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("BPG")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("CA")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("SSG")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("JDWJ")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("XGD")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("KWJ")),true)
+                    + filterStringIsNotBlank(String.valueOf(saveMap.get("ZBJBD")),false);
            context = context.replace(",,", ",");
            saveMap.put("content", context);
        }
@@ -168,6 +207,11 @@ public class SendStandMQService {
        }
    }

+    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 "";
@@ -30,7 +30,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetail
    //用于导出
    List<LawsDto> selectLawsByIdE(@Param("param1") List<String> LawsIds);
    //根据标准id查出数据
-    List<LawsDto> selectLawsByIdC(@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType);
+    List<LawsDto> selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType);
+    List<LawsDto> selectLawsByIdCount(@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType);
    //查询时间
    List<StandRegionalTimeDto> selectTimes(String standId);
    List<String> selectLawsId2(String standId);
@@ -8,6 +8,6 @@ public class DetAllStandDto {
    Integer size;
    String cid;
    String userId;
-    String endTime;
+    String startTime;
    String Account;
 }
@@ -60,5 +60,8 @@ public class SarPublicIdea extends BaseEntity {
    @TableField("stand_id")
    private String standId;

+    @TableField("stand_type")
+    private String standType;
+

 }
@@ -40,11 +40,11 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao

    @Override
    public IPage<SarPublicIdeaAllSUD> selectAll(DetAllStandDto detAllStandDto) {
-        if (detAllStandDto.getEndTime() != null) {
+        if (detAllStandDto.getStartTime() != null) {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            Date Time = null;
            try {
-                Time = sdf.parse(detAllStandDto.getEndTime());
+                Time = sdf.parse(detAllStandDto.getStartTime());
            } catch (ParseException e) {
                e.printStackTrace();
            }
@@ -110,7 +110,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        Date Time = null;
        try {
-            Time = sdf.parse(detAllStandDto.getEndTime());
+            Time = sdf.parse(detAllStandDto.getStartTime());
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -78,7 +78,7 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
    }


-    @ApiOperation(value = "标准查询")
+    @ApiOperation(value = "标准批量保存")
    @PostMapping("/saveBatch")
    public String saveBatch(@RequestBody List<SarStandItems> findStandDto){
        findStandDto.forEach(sarStandItems -> sarStandItems.setId(UUIDUtils.randomUUID(32)));
@@ -14,4 +14,5 @@ public class FindStandDto {
    private int size;
    private String standName;
    private String standType;
+    private String fileType;
 }
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;

 /**
 * <p>
- * 
+ *
 * </p>
 *
 * @author super_liu
@@ -172,5 +172,17 @@ public class SarStandItems extends BaseEntity {
    private String responsibleEngineer;


+    @ApiModelProperty(value = "相对于上一版本变化点")
+    @TableField("compared_with_previous")
+    private String comparedWithPrevious;
+
+    @ApiModelProperty(value = "合规性分析")
+    @TableField("compliance_state")
+    private String complianceState;
+
+    @ApiModelProperty(value = "符合性要求-符合性状态")
+    @TableId("COMPLIANCE_REQUIR")
+    private String complianceRequire;
+

 }
@@ -44,4 +44,8 @@ public class SarStandItemsDto {
    @ApiModelProperty(value = "覆盖关系")
    private String busStandCover;

+    private String xcxssrq;
+
+    private String zccssrq;
+
 }
@@ -85,8 +85,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
                            .itemsName(sarStandItemsDto.getItemsName())
                            .itemsNum(sarStandItemsDto.getItemsNum())
                            .responsibleUnit(sarStandItemsDto.getResponsibleUnit())
-                            .XCXSSRQ(standsTimeDto.getXCXSSRQ())
-                            .ZCCSSRQ(standsTimeDto.getZCCSSRQ())
+                            .XCXSSRQ(sarStandItemsDto.getXcxssrq())
+                            .ZCCSSRQ(sarStandItemsDto.getZccssrq())
                            .svpps(sarStandItemsDto.getSvpps())
                            .applyArctic(sarStandItemsDto.getApplyArctic())
                            .claimType(sarStandItemsDto.getClaimType())
@@ -108,8 +108,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
                        .itemsName(sarStandItemsDto.getItemsName())
                        .itemsNum(sarStandItemsDto.getItemsNum())
                        .responsibleUnit(sarStandItemsDto.getResponsibleUnit())
-                        .XCXSSRQ(standsTimeDto.getXCXSSRQ())
-                        .ZCCSSRQ(standsTimeDto.getZCCSSRQ())
+                        .XCXSSRQ(sarStandItemsDto.getXcxssrq())
+                        .ZCCSSRQ(sarStandItemsDto.getZccssrq())
                        .svpps(sarStandItemsDto.getSvpps())
                        .applyArctic(sarStandItemsDto.getApplyArctic())
                        .claimType(sarStandItemsDto.getClaimType())
@@ -129,8 +129,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
                                .itemsName(sarStandItemsDto.getItemsName())
                                .itemsNum(sarStandItemsDto.getItemsNum())
                                .responsibleUnit(sarStandItemsDto.getResponsibleUnit())
-                                .XCXSSRQ(standsTimeDto1.getXCXSSRQ())
-                                .ZCCSSRQ(standsTimeDto1.getZCCSSRQ())
+                                .XCXSSRQ(sarStandItemsDto.getXcxssrq())
+                                .ZCCSSRQ(sarStandItemsDto.getZccssrq())
                                .svpps(sarStandItemsDto.getSvpps())
                                .applyArctic(sarStandItemsDto.getApplyArctic())
                                .claimType(sarStandItemsDto.getClaimType())
@@ -168,11 +168,11 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
        if (standId==null || standId.size()==0){
            list = null;
        }else {
-            list = sarLawsAttrDetailedListDao.selectLawsByIdC(standId,findStandDto.getStandName(), findStandDto.getStandType());
+            list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType());
        }
        IPage<LawsDto> page1=new Page<>();
        page1.setRecords(list);
-        page1.setTotal(dao.selectToken());
+        page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size());
        return page1;
    }

@@ -106,8 +106,8 @@ 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","project_manager as projectManager","uName");
-        wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid");
+        wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","ts_user.uName");
+        wrapper.last("inner join sar_stand_project_library s on ts_user.USID = s.project_manager");
        Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
        IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
        System.out.println("总条数"+userIPage.getTotal());
@@ -72,12 +72,15 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
        }
        //仅查询未关闭的
        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
+        //根据 项目名称 进行查询
        if(sarStandUnqualifiedPage.getProductName()!=null){
            sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
        }
+        //根据 责任部门 进行查询
        if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
            sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
        }
+        //根据 标准号/标准名称 进行查询
        if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
 //            sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
            sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
@@ -109,6 +109,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    private Date interpretationTime;

+    @ApiModelProperty(value = "条款名称")
+    @TableField("clause_name")
+    private String clauseName;
+

    private String id;

@@ -24,8 +24,8 @@ import java.util.List;
@Service
 public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<SarInterpretationNationalStandardDao, SarInterpretationNationalStandard> implements ISarInterpretationNationalStandardService {

-    @Autowired
-    SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao;
+//    @Autowired
+//    SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao;

    @Override
    public String saveBath(List<SarInterpretationNationalStandard> sarInterpretationNationalStandards) {
@@ -34,18 +34,18 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<Sa
        sarInterpretationNationalStandards.forEach(sarInterpretationNationalStandard -> {
            QueryWrapper<SarStandardComplianceProductAssess> queryWrapper=new QueryWrapper<>();
            queryWrapper.eq("stand_id",sarInterpretationNationalStandard.getStandId());
-            List<SarStandardComplianceProductAssess> assessList = sarStandardComplianceProductAssessDao.selectList(queryWrapper);
-            if (assessList.isEmpty()){
-                SarStandardComplianceProductAssess sar=new SarStandardComplianceProductAssess();
-                sar.setId(UUIDUtils.randomUUID(32));
-                sar.setStandId(sarInterpretationNationalStandard.getStandId());
-                sar.setStandNumber(sarInterpretationNationalStandard.getStandNumber());
-                sar.setStandType(sarInterpretationNationalStandard.getStandType());
-                sar.setStandName(sarInterpretationNationalStandard.getStandName());
-                sar.setStandType(sarInterpretationNationalStandard.getStandType());
-                sar.setInterpretationTime(sarInterpretationNationalStandard.getInterpretationTime());
-                sarStandardComplianceProductAssessDao.insert(sar);
-            }
+//            List<SarStandardComplianceProductAssess> assessList = sarStandardComplianceProductAssessDao.selectList(queryWrapper);
+//            if (assessList.isEmpty()){
+//                SarStandardComplianceProductAssess sar=new SarStandardComplianceProductAssess();
+//                sar.setId(UUIDUtils.randomUUID(32));
+//                sar.setStandId(sarInterpretationNationalStandard.getStandId());
+//                sar.setStandNumber(sarInterpretationNationalStandard.getStandNumber());
+//                sar.setStandType(sarInterpretationNationalStandard.getStandType());
+//                sar.setStandName(sarInterpretationNationalStandard.getStandName());
+//                sar.setStandType(sarInterpretationNationalStandard.getStandType());
+//                sar.setInterpretationTime(sarInterpretationNationalStandard.getInterpretationTime());
+//                sarStandardComplianceProductAssessDao.insert(sar);
+//            }
        });
        String res = flag ? "1":"0";
        return res;
@@ -119,7 +119,7 @@ public class SarStandardsInfo extends BaseEntity {
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    private Date modifyTime;

-    @ApiModelProperty(value = "是否纳入认证清单(0否 1是)")
+    @ApiModelProperty(value = "是否纳入认证清单(2否 1是)")
    @TableField("IS_RELATE_ACCESS")
    private String isRelateAccess;

@@ -2103,14 +2103,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
        Set<String> keys = attrInfoMap.keySet();
        for (String key:keys) {
            String value = String.valueOf(attrInfoMap.get(key));
-            if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key)){
+            if (StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key)){
                value = value.replace(" , ",",");
                value = value.replace(","," , ");
                attrInfoMap.put(key,value);
            }
        }
        // 根据文件attid 读取文件内容
-        if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) {
+        if (StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) {
            String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
            StringBuilder content = new StringBuilder("");
            for (int i = 0; i < attidlist.length; i++) {
@@ -404,7 +404,7 @@
    </select>

    <!-- 查询SAR_STAND_ITEMS列表 -->
-    <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+    <select id="queryByPage" resuCOMPLIANCE_REQUIRltMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
        select
        <include refid="Base_Column_List"/>
        from
@@ -666,6 +666,7 @@
    </select>


+
    <select id="selectSvppsByStandId" parameterType="java.lang.String" resultType="java.lang.String">
        select svpps from SAR_STAND_ITEMS
        where valid_flag=0 and svpps != ''
@@ -715,9 +716,7 @@


    <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
-        select
-        ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as
-        responsibleEngineer
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq
        from SAR_STAND_ITEMS
        where FILE_TYPE=#{type}
        <if test="ids != null">
@@ -89,12 +89,16 @@
        a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
        a.ID = b.STAND_ID
+        left join sar_stand_items ssi on ssi.stand_id = a.id
        <where>
            <if test="standName != null">
                (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
                or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
                and
            </if>
+        <if test="fileType !=null">
+            ssi.FILE_TYPE = #{fileType} and
+        </if>
        <if test="standType !=null">
            a.STAND_TYPE = #{standType} and
        </if>
@@ -103,7 +107,37 @@
                #{item}
            </foreach>
        </where>
+        group by a.ID
+        limit #{start},#{end}
    </select>
+
+    <select id="selectLawsByIdCount" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
+        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,a.STAND_SORT as standSortShow,
+        a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
+        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
+        a.ID = b.STAND_ID
+        left join sar_stand_items ssi on ssi.stand_id = a.id
+        <where>
+            <if test="standName != null">
+                (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
+                or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
+                and
+            </if>
+            <if test="fileType !=null">
+                ssi.FILE_TYPE = #{fileType} and
+            </if>
+            <if test="standType !=null">
+                a.STAND_TYPE = #{standType} and
+            </if>
+            a.ID IN
+            <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+        group by a.ID
+    </select>
+
    <select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto">
        SELECT
            b.country_area AS country,
@@ -177,6 +211,4 @@
    </delete>


-
-
 </mapper>