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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

@@ -84,6 +84,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 default:
                     break;
             }
+            if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员");
+            else {sarLawsDetailedList.setUpdatePeople(getUserName());}
             sarLawsDetailedListDao.insert(sarLawsDetailedList);
             addDetailedDto.setInforlist(addDetailedDto.getInforlist().substring(1,addDetailedDto.getInforlist().length()-1));
             String[] split = addDetailedDto.getInforlist().split(",");

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

@@ -1,12 +1,24 @@
 package com.adc.da.slrs.sarStandItems.controller;
 
 
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+
+import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
+import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     *  前端控制器
@@ -20,4 +32,25 @@ import com.adc.da.base.web.BaseController;
 @RequestMapping("/SarStandItems/sar-stand-items")
 public class SarStandItemsController extends BaseController<SarStandItems> {
 
+    @Autowired
+    private SarStandItemsServiceImpl ServiceImpl;
+
+    @ApiOperation(value = "分解单查询")
+    @GetMapping("/findAllItems")
+    public ResponseMessage findAllItems(@RequestParam(defaultValue = "1")int Page, @RequestParam(defaultValue = "10") int Size,String type,String ids){
+        if (!StringUtils.isEmpty(ids) && ids.contains(",")){
+            String[] Sids=ids.split(",");
+            List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids);
+            return Result.success("200",ItemDto);
+        }else if (!StringUtils.isEmpty(ids)){
+            String[] Sids=new String[1];
+            Sids[0]=ids;
+            List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids);
+            return Result.success("200",ItemDto);
+        }else {
+            List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,null);
+            return Result.success("200",ItemDto);
+        }
+    }
+
 }

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

@@ -1,9 +1,11 @@
 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.page.SarStandItemsEOPage;
 import com.adc.da.sys.common.SelectionResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -18,6 +20,7 @@ import java.util.Set;
  * @author super_liu
  * @since 2021-06-01
  */
+@Mapper
 public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
     List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
@@ -50,4 +53,5 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
     List<SelectionResult> selectAllItemsSvpps(SarStandItems sarStandItemsEO);
 
+    List<SarStandItemsDto> selectAllItemsByIds(@Param("page") int Page, @Param("size") int Size,@Param("type") String type,@Param("ids") String[] ids);
 }

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

@@ -0,0 +1,53 @@
+package com.adc.da.slrs.sarStandItems.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
+/**
+ * //TODO 添加类、接口描述
+ *
+ * @author ZhangZhiYuan
+ * @date 2021-07-08
+ */
+@Slf4j
+@Data
+public class SarStandItemsDto {
+
+    @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 = "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/service/impl/SarStandItemsServiceImpl.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandItems.service.impl;
 
 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.page.SarStandItemsEOPage;
 import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
 import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
@@ -56,4 +57,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         }
         return actitemsEOList;
     }
+
+    public List<SarStandItemsDto> findAllItems(int Page,int Size,String type,String[] ids){
+        return dao.selectAllItemsByIds((Page-1)*Size,Size*Page,type,ids);
+    }
 }

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

@@ -641,4 +641,21 @@
         </if>
     </select>
 
+
+    <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
+        from SAR_STAND_ITEMS
+        where FILE_TYPE=#{type}
+
+        <if test="ids != null">
+        and STAND_ID in
+        <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        </if>
+
+        LIMIT #{page} , #{size};
+    </select>
+
+
 </mapper>