From e9988097679a12764838c29323fea2e76411b75c Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 8 Jul 2021 20:04:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add:=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 2 + .../controller/SarStandItemsController.java | 33 +++++++++++ .../sarStandItems/dao/SarStandItemsDao.java | 4 ++ .../entity/SarStandItemsDto.java | 56 +++++++++++++++++++ .../impl/SarStandItemsServiceImpl.java | 5 ++ .../SarStandItems/SarStandItemsMapper.xml | 17 ++++++ 6 files changed, 117 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 3919b41a..f6223f44 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -84,6 +84,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl * 前端控制器 @@ -20,4 +32,25 @@ import com.adc.da.base.web.BaseController; @RequestMapping("/SarStandItems/sar-stand-items") public class SarStandItemsController extends BaseController { + @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 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 ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids); + return Result.success("200",ItemDto); + }else { + List ItemDto = ServiceImpl.findAllItems(Page,Size,type,null); + return Result.success("200",ItemDto); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 20e88748..d2af513f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/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 { List querySarStandItemsList(SarStandItemsEOPage page); @@ -50,4 +53,5 @@ public interface SarStandItemsDao extends BaseMapper { List selectAllItemsSvpps(SarStandItems sarStandItemsEO); + List selectAllItemsByIds(@Param("page") int Page, @Param("size") int Size,@Param("type") String type,@Param("ids") String[] ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java new file mode 100644 index 00000000..291c3471 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 1973f711..3de73d3d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/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 findAllItems(int Page,int Size,String type,String[] ids){ + return dao.selectAllItemsByIds((Page-1)*Size,Size*Page,type,ids); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 185b011c..bb6eb6b8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -641,4 +641,21 @@ + + + + From 04792ee931e4545622b74f7ca3d8e1386fda11d8 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 8 Jul 2021 20:05:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add:=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index 291c3471..f173797e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -1,8 +1,5 @@ package com.adc.da.slrs.sarStandItems.entity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j;