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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java

@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.controller;
 
 import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.att.service.IAttFileEOService;
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
@@ -10,10 +11,11 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*;
 import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;
@@ -57,7 +59,7 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
      **/
     @ApiOperation(value = "查询标准信息")
     @GetMapping("/selectLawsById")
-    public ResponseMessage selectLawsById(@RequestParam(defaultValue = "1")int Page, @RequestParam(defaultValue = "10") int Size, String id,String standName,String responseUnit){
+    public ResponseMessage selectLawsById(@RequestParam(defaultValue = "1")int Page, @RequestParam(defaultValue = "10") int Size, String id,String standName){
         List<LawsDto> laws = iSarLawsAttrDetailedList.selectLaws(id,Page-1,Size,standName);
         return Result.success("200",laws);
     }
@@ -94,7 +96,7 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
     * date 2021-06-24
     **/
     @ApiOperation(value = "导出标准信息")
-    @RequestMapping("/ExportLawsById")
+    @PostMapping("/ExportLawsById")
     public void ExportLawsById(HttpServletResponse response, StandExcelVo standExcelVo){
         try {
             response.setContentType("application/vnd.ms-excel");
@@ -104,7 +106,7 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
             }
             String fileName = URLEncoder.encode(standExcelVo.getExportName(), "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-            List<LittleLawsDto> data = new ArrayList<>();
+            List<LawsDto> data = new ArrayList<>();
             if (CollectionUtils.isEmpty(standExcelVo.getIds())){
                 List<String> list=  sarLawsAttrDetailedListDao.selectLawsId2(standExcelVo.getId());
                 if (CollectionUtils.isEmpty(list)) return;
@@ -112,23 +114,32 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
             }else {
                 data=sarLawsAttrDetailedListDao.selectLawsById(standExcelVo.getIds(),null);
             }
-            List<StandExcelDto> standExcel=new ArrayList<>();
+            for (LawsDto lawsDto:data){
-            for (LittleLawsDto littleLawsDto:data){
+                if (StringUtils.isNoneBlank(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).toString())){
-                StandExcelDto standExcelDto=StandExcelDto.builder()
+                    lawsDto.setTypeApplicable(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).toString());
-                        .standNumber(littleLawsDto.getStandNumber())
+                }
-                        .standName(littleLawsDto.getStandName())
-                        .standEnName(littleLawsDto.getStandEnName())
-                        .responseUnit("责任部门")
-                        .newCarTime("无字段")
-                        .nowCarTime("无字段")
-                        .typeApplicable("无字段")
-                        .issueTime(littleLawsDto.getIssueTime())
-                        .textStatus(littleLawsDto.getTextStatus())
-                        .build();
-                standExcel.add(standExcelDto);
             }
-            EasyExcel.write(response.getOutputStream(), StandExcelDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1")
+            List<StandExcelDto> standExcelDtos = new ArrayList<>();
-                    .doWrite(standExcel);
+            for (LawsDto lawsDto:data){
+                StandExcelDto standExcelDto = StandExcelDto.builder()
+                        .standNumber(lawsDto.getStandNumber())
+                        .standName(lawsDto.getStandName())
+                        .standEnName(lawsDto.getStandEnName())
+                        .typeApplicable(lawsDto.getTypeApplicable())
+                        .NYLX(lawsDto.getNYLX())
+                        .putTime(lawsDto.getPutTime())
+                        .newCarTime(lawsDto.getXCXSSRQGJ())
+                        .nowCarTime(lawsDto.getZCCSSRQGJ())
+                        .ZRBM(lawsDto.getZRBM())
+                        .SYCPX(lawsDto.getSYCPX())
+                        .CYCVPPSBM(lawsDto.getCYCVPPSBM())
+                        .CYCVPPSCN(lawsDto.getCYCVPPSCN())
+                        .KCCVPPSBM(lawsDto.getKCCVPPSBM())
+                        .KCCVPPSCN(lawsDto.getKCCVPPSCN())
+                        .build();
+            }
+            EasyExcel.write(response.getOutputStream(), LawsDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1")
+                    .doWrite(data);
         } catch (Exception e) {
             response.reset();
             response.setContentType("application/json");

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java

@@ -1,8 +1,7 @@
 package com.adc.da.slrs.sarLawsAttrDetailedList.dao;
 
+import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList;
-import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto;
-import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelDto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -23,7 +22,9 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetail
     //根据清单id，查出标准的id并排序
     List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size);
     //根据标准id查出数据
-    List<LittleLawsDto> selectLawsById(@Param("param1") List<String> LawsIds,@Param("standName") String standName);
+    List<LawsDto> selectLawsById(@Param("param1") List<String> LawsIds, @Param("standName") String standName);
+    //查询适用车型
+    List<String> selectTypeApplicable(@Param("param1") String LawsId);
     List<String> selectLawsId2(String standId);
     Boolean insertList(@Param("sarLawsAttrDetailedLists") List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists);
     Boolean deleteByStandId(String standId);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java

@@ -2,8 +2,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity;
 
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * //Dto,用于从标准主表中查询和检索信息
@@ -14,6 +16,8 @@ import lombok.Data;
  */
 @Builder
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class LawsDto {
     @ApiModelProperty(value = "主键")
     private String id;
@@ -23,16 +27,26 @@ public class LawsDto {
     private String standName;
     @ApiModelProperty(value = "英文名称")
     private String standEnName;
-    @ApiModelProperty(value = "责任部门")
+    @ApiModelProperty(value = "适用车型")
-    private String responseUnit;
-    @ApiModelProperty(value = "新车型实施日期")
-    private String newCarTime;
-    @ApiModelProperty(value = "在产车实施日期")
-    private String nowCarTime;
-    @ApiModelProperty(value = "适用车辆类型")
     private String typeApplicable;
-    @ApiModelProperty(value = "发布日期")
+    @ApiModelProperty(value = "能源类型")
-    private String issueTime;
+    private String NYLX;
-    @ApiModelProperty(value = "文本状态")
+    @ApiModelProperty(value = "标准实施日期")
-    private String textStatus;
+    private String putTime;
+    @ApiModelProperty(value = "新车型实施日期")
+    private String XCXSSRQGJ;
+    @ApiModelProperty(value = "在产车实施日期")
+    private String ZCCSSRQGJ;
+    @ApiModelProperty(value = "责任部门")
+    private String ZRBM;
+    @ApiModelProperty(value = "适用产品线")
+    private String SYCPX;
+    @ApiModelProperty(value = "乘用车VPPS编码")
+    private String CYCVPPSBM;
+    @ApiModelProperty(value = "乘用车vpps中文名称")
+    private String CYCVPPSCN;
+    @ApiModelProperty(value = "卡车VPPS编码")
+    private String KCCVPPSBM;
+    @ApiModelProperty(value = "卡车vpps中文名称")
+    private String KCCVPPSCN;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LittleLawsDto.java

@@ -1,26 +0,0 @@
-package com.adc.da.slrs.sarLawsAttrDetailedList.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * //TODO 添加类、接口描述
- * 能从主表中查出的LawsDto所需要的数据
- * @author ZhangZhiYuan
- * date 2021-06-22
- */
-@Data
-public class LittleLawsDto {
-    @ApiModelProperty(value = "主键")
-    private String id;
-    @ApiModelProperty(value = "标准编号")
-    private String standNumber;
-    @ApiModelProperty(value = "中文名称")
-    private String standName;
-    @ApiModelProperty(value = "英文名称")
-    private String standEnName;
-    @ApiModelProperty(value = "发布日期")
-    private String issueTime;
-    @ApiModelProperty(value = "文本状态")
-    private String textStatus;
-}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java

@@ -2,8 +2,10 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * //TODO 添加类、接口描述
@@ -14,32 +16,35 @@ import lombok.Data;
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class StandExcelDto {
-    @ExcelProperty("标准编号")
     @ApiModelProperty(value = "标准编号")
     private String standNumber;
-    @ExcelProperty("中文名称")
     @ApiModelProperty(value = "中文名称")
     private String standName;
-    @ExcelProperty("英文名称")
     @ApiModelProperty(value = "英文名称")
     private String standEnName;
-    @ExcelProperty("责任部门")
+    @ApiModelProperty(value = "适用车型")
-    @ApiModelProperty(value = "责任部门")
+    private String typeApplicable;
-    private String responseUnit;
+    @ApiModelProperty(value = "能源类型")
-    @ExcelProperty("新车型实施日期")
+    private String NYLX;
+    @ApiModelProperty(value = "标准实施日期")
+    private String putTime;
     @ApiModelProperty(value = "新车型实施日期")
     private String newCarTime;
-    @ExcelProperty("在产车实施日期")
     @ApiModelProperty(value = "在产车实施日期")
     private String nowCarTime;
-    @ExcelProperty("适用车辆类型")
+    @ApiModelProperty(value = "责任部门")
-    @ApiModelProperty(value = "适用车辆类型")
+    private String ZRBM;
-    private String typeApplicable;
+    @ApiModelProperty(value = "适用产品线")
-    @ExcelProperty("发布日期")
+    private String SYCPX;
-    @ApiModelProperty(value = "发布日期")
+    @ApiModelProperty(value = "乘用车VPPS编码")
-    private String issueTime;
+    private String CYCVPPSBM;
-    @ExcelProperty("文本状态")
+    @ApiModelProperty(value = "乘用车vpps中文名称")
-    @ApiModelProperty(value = "文本状态")
+    private String CYCVPPSCN;
-    private String textStatus;
+    @ApiModelProperty(value = "卡车VPPS编码")
+    private String KCCVPPSBM;
+    @ApiModelProperty(value = "卡车vpps中文名称")
+    private String KCCVPPSCN;
 }

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

@@ -2,17 +2,17 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl;
 
 import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
-import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelVo;
 import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -31,6 +31,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
 
     @Autowired
     SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
+
     //从主表中查询信息
     @Override
     public List<LawsDto> selectLaws(String standId, Integer Page, Integer Size,String standName) {
@@ -38,19 +39,12 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         if (CollectionUtils.isEmpty(lawsIds)){
             return null;
         }
-        List<LittleLawsDto> lawsDtoList = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,standName);
+        List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,standName);
-        List<LawsDto> list = new ArrayList<>();
+        for (LawsDto lawsDto:list){
-        for (LittleLawsDto laws:lawsDtoList){
+            if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){
-            LawsDto lawsDto = LawsDto.builder()
+                lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
-                    .id(laws.getId())
+                System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
-                    .standNumber(laws.getStandNumber())
+            }
-                    .standName(laws.getStandName())
-                    .standEnName(laws.getStandEnName())
-                    .issueTime(laws.getIssueTime())
-                    .textStatus(laws.getTextStatus())
-                    .build();
-            list.add(lawsDto);
-
         }
         return list;
     }
@@ -58,7 +52,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
     //向清单表和主表中的关联表插入信息
     @Override
     public Boolean insertDetailedList(String standId, String[] lawsIds) {
-        if (!StringUtils.isEmpty(lawsIds)){
+        if (lawsIds.length !=0 && lawsIds!=null){
             try {
                 List<SarLawsAttrDetailedList> attrDetailedLists = new ArrayList<>();
                 int a=0;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java

@@ -4,6 +4,8 @@ package com.adc.da.slrs.sarStandItems.controller;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 
+import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
+import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
 import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
 import io.swagger.annotations.ApiOperation;
@@ -50,4 +52,18 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         }
     }
 
+    @ApiOperation(value = "分解单查询(带时间)")
+    @GetMapping("/findAllItemsTimes")
+    public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){
+        List<SarItemsTime> sarItemsTimes = ServiceImpl.findItemsTime(type,ids);
+        return sarItemsTimes;
+    }
+
+    @ApiOperation(value = "标准查询")
+    @PostMapping("/findStand")
+    public List<LawsDto> findStand(@RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "size",defaultValue = "10") int size){
+        List<LawsDto> sarItems = ServiceImpl.selectLawDto(page,size);
+        return sarItems;
+    }
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandItems.dao;
 
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
+import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto;
 import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.sys.common.SelectionResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -54,4 +55,10 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
     List<SelectionResult> selectAllItemsSvpps(SarStandItems sarStandItemsEO);
 
     List<SarStandItemsDto> selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids);
+
+    StandsTimeDto selectStandTime(String standId);
+
+    List<StandsTimeDto> selectStandTimeAll();
+
+    List<String> selectStandId(@Param("page")int page,@Param("size")int size);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java

@@ -0,0 +1,58 @@
+package com.adc.da.slrs.sarStandItems.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * //TODO 添加类、接口描述
+ *
+ * @author ZhangZhiYuan
+ * @date 2021-07-14
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SarItemsTime {
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "标准ID")
+    private String standId;
+
+    @ApiModelProperty(value = "条目编号")
+    private String itemsNum;
+
+    @ApiModelProperty(value = "内容")
+    private String itemsName;
+
+    @ApiModelProperty(value = "责任部门")
+    private String responsibleUnit;
+
+    @ApiModelProperty(value = "新车型实施日期")
+    @TableField("XCXSSRQ")
+    private String XCXSSRQ;
+
+    @ApiModelProperty(value = "在产车实施日期")
+    @TableField("ZCCSSRQ")
+    private String ZCCSSRQ;
+
+    @ApiModelProperty(value = "SVPPS")
+    private String svpps;
+
+
+    @ApiModelProperty(value = "适用车型")
+    private String applyArctic;
+
+
+    @ApiModelProperty(value = "要求类型")
+    private String claimType;
+
+    @ApiModelProperty(value = "覆盖关系")
+    private String busStandCover;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java

@@ -0,0 +1,33 @@
+package com.adc.da.slrs.sarStandItems.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * //TODO 添加类、接口描述
+ *
+ * @author ZhangZhiYuan
+ * @date 2021-07-14
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StandsTimeDto {
+
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "新车型实施日期")
+    @TableField("XCXSSRQ")
+    private String XCXSSRQ;
+
+    @ApiModelProperty(value = "在产车实施日期")
+    @TableField("ZCCSSRQ")
+    private String ZCCSSRQ;
+}

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

@@ -1,11 +1,12 @@
 package com.adc.da.slrs.sarStandItems.service;
 
+import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
+import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -19,4 +20,6 @@ import java.util.List;
 public interface ISarStandItemsService extends IService<SarStandItems> {
 
     List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType);
+    List<SarItemsTime> findItemsTime(String type,String ids);
+    List<LawsDto> selectLawDto(int page,int size);
 }

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

@@ -1,13 +1,19 @@
 package com.adc.da.slrs.sarStandItems.service.impl;
 
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
+import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
+import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
+import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto;
 import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
 import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,7 +36,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
 
     @Autowired
     private SysInfoEOService sysInfoEOService;
-
+    @Autowired
+    private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
 
     public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){
         List<SarStandItems> itemsEOList = dao.queryItemsByList(page);
@@ -58,6 +65,97 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         return actitemsEOList;
     }
 
+    @Override
+    public List<SarItemsTime> findItemsTime(String type, String ids) {
+        StandsTimeDto standsTimeDto=new StandsTimeDto();
+        List<SarItemsTime> sarItemsTime = new ArrayList<>();
+        if (!StringUtils.isEmpty(ids) && ids.contains(",")){
+            String[] strings=new String[1];
+            String[] Sids=ids.split(",");
+            for (String id : Sids){
+                strings[0]=id;
+                List<SarStandItemsDto> ItemDto = dao.selectAllItemsByIds(type,strings);
+                standsTimeDto=dao.selectStandTime(id);
+                for (SarStandItemsDto sarStandItemsDto:ItemDto){
+                    SarItemsTime itemsTime = SarItemsTime.builder()
+                            .id(sarStandItemsDto.getId())
+                            .standId(sarStandItemsDto.getStandId())
+                            .itemsName(sarStandItemsDto.getItemsName())
+                            .itemsNum(sarStandItemsDto.getItemsNum())
+                            .responsibleUnit(sarStandItemsDto.getResponsibleUnit())
+                            .XCXSSRQ(standsTimeDto.getXCXSSRQ())
+                            .ZCCSSRQ(standsTimeDto.getZCCSSRQ())
+                            .svpps(sarStandItemsDto.getSvpps())
+                            .applyArctic(sarStandItemsDto.getApplyArctic())
+                            .claimType(sarStandItemsDto.getClaimType())
+                            .busStandCover(sarStandItemsDto.getBusStandCover())
+                            .build();
+                    sarItemsTime.add(itemsTime);
+                }
+
+            }
+        }else if (!StringUtils.isEmpty(ids)){
+            String[] Sids=new String[1];
+            Sids[0]=ids;
+            List<SarStandItemsDto> ItemDto = dao.selectAllItemsByIds(type,Sids);
+            standsTimeDto=dao.selectStandTime(ids);
+            for (SarStandItemsDto sarStandItemsDto:ItemDto){
+                SarItemsTime itemsTime = SarItemsTime.builder()
+                        .id(sarStandItemsDto.getId())
+                        .standId(sarStandItemsDto.getStandId())
+                        .itemsName(sarStandItemsDto.getItemsName())
+                        .itemsNum(sarStandItemsDto.getItemsNum())
+                        .responsibleUnit(sarStandItemsDto.getResponsibleUnit())
+                        .XCXSSRQ(standsTimeDto.getXCXSSRQ())
+                        .ZCCSSRQ(standsTimeDto.getZCCSSRQ())
+                        .svpps(sarStandItemsDto.getSvpps())
+                        .applyArctic(sarStandItemsDto.getApplyArctic())
+                        .claimType(sarStandItemsDto.getClaimType())
+                        .busStandCover(sarStandItemsDto.getBusStandCover())
+                        .build();
+                sarItemsTime.add(itemsTime);
+            }
+        }else {
+            List<SarStandItemsDto> ItemDto = dao.selectAllItemsByIds(type,null);
+            List<StandsTimeDto> standsTimeDtos = dao.selectStandTimeAll();
+            for (SarStandItemsDto sarStandItemsDto:ItemDto){
+                for (StandsTimeDto standsTimeDto1:standsTimeDtos){
+                    if (sarStandItemsDto.getStandId().equals(standsTimeDto1.getStandId())){
+                        SarItemsTime itemsTime = SarItemsTime.builder()
+                                .id(sarStandItemsDto.getId())
+                                .standId(sarStandItemsDto.getStandId())
+                                .itemsName(sarStandItemsDto.getItemsName())
+                                .itemsNum(sarStandItemsDto.getItemsNum())
+                                .responsibleUnit(sarStandItemsDto.getResponsibleUnit())
+                                .XCXSSRQ(standsTimeDto1.getXCXSSRQ())
+                                .ZCCSSRQ(standsTimeDto1.getZCCSSRQ())
+                                .svpps(sarStandItemsDto.getSvpps())
+                                .applyArctic(sarStandItemsDto.getApplyArctic())
+                                .claimType(sarStandItemsDto.getClaimType())
+                                .busStandCover(sarStandItemsDto.getBusStandCover())
+                                .build();
+                        sarItemsTime.add(itemsTime);
+                    }
+                }
+            }
+        }
+
+        return sarItemsTime;
+    }
+
+    @Override
+    public List<LawsDto> selectLawDto(int page,int size) {
+        List<String> standId = dao.selectStandId(page-1,size);
+        List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(standId,null);
+        for (LawsDto lawsDto:list){
+            if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){
+                lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
+                System.out.println(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ","));
+            }
+        }
+        return list;
+    }
+
     public List<SarStandItemsDto> findAllItems(String type,String[] ids){
         return dao.selectAllItemsByIds(type,ids);
     }

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -654,6 +654,20 @@
         </foreach>
         </if>
     </select>
+    <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
+        select STAND_ID,XCXSSRQ,ZCCSSRQ
+        from sar_stand_attr_info
+        where STAND_ID=#{standId,jdbcType=VARCHAR}
+    </select>
+    <select id="selectStandTimeAll" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
+        select STAND_ID,XCXSSRQ,ZCCSSRQ
+        from sar_stand_attr_info
+    </select>
+    <select id="selectStandId" resultType="java.lang.String">
+        SELECT STAND_ID
+        FROM sar_stand_attr_info
+        group by STAND_ID limit #{page},#{size}
+    </select>
 
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

@@ -2,24 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao">
 
-    <select id="selectLawsById" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto">
+    <select id="selectLawsById" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT ID,STAND_NUMBER,STAND_NAME,STAND_EN_NAME,ISSUE_TIME,TEXT_STATUS
+        SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN
-        FROM sar_standards_info
+        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
+        a.ID = b.STAND_ID
         <where>
             <if test="standName != null">
-                (STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
+                (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
-                or STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
+                or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
                 and
             </if>
-            ID IN
+            a.ID IN
             <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            order by field(ID,
+
-            <foreach collection="param1" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-            )
         </where>
 
     </select>
@@ -45,6 +42,12 @@
         </where>
         order by number
     </select>
+    <select id="selectTypeApplicable" resultType="java.lang.String">
+        SELECT APPLY_ARCTIC
+        FROM sar_stand_items
+        WHERE ID =#{param1,jdbcType=VARCHAR}
+    </select>
+
 
     <insert id="insertList">
         INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES