From 21931a9455e478edca4ab170124ff96a5299e898 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 12:02:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 7ef6ef5f..8985ecd5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -187,8 +187,8 @@ public class SarStandAttrInfo extends BaseEntity { private String sycpx; @ApiModelProperty(value = "适用认证") - @TableField("SYZD") - private String syzd; + @TableField("SYRZ") + private String syrz; @ApiModelProperty(value = "责任工程师") @TableField("ZRGCS") From 7db2b79b637518e13c24eaa791a5b68217a557b8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 16:29:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardsInfoController.java | 9 +++++++++ .../slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java | 2 ++ .../service/ISarStandardsInfoService.java | 2 ++ .../service/impl/SarStandardsInfoServiceImpl.java | 5 +++++ .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 10 ++++++++++ 5 files changed, 28 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 8c3a3177..c35efe84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -419,6 +419,15 @@ public class SarStandardsInfoController extends BaseController } } + + @ApiOperation(value = "标准发布查询") + @GetMapping("/getStandInfoByList") + //@RequiresPermissions("lawss:sarStandardsInfo:get") + public ResponseMessage> getStandInfoByList(String limit) throws Exception { + List result = sarStandardsInfoEOService.getStandInfoByList(limit); + return Result.success(result); + } + @ApiOperation(value = "|SarStandardsInfoEO|详情") @GetMapping("/getStandInfoById") //@RequiresPermissions("lawss:sarStandardsInfo:get") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 98bc1851..5fa8089c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -29,6 +29,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); + List queryStandInfoByList(@Param("limit") Integer limit); + Integer selectStandColumn(@Param("columnName") String columnName); Integer selectCounterStandardsCount(SarStandardsInfo sarStandardsInfoEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 3d021796..b3fc3d01 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -31,6 +31,8 @@ public interface ISarStandardsInfoService extends IService { List selectStandardsByStandnumber(String replaceStandNum, String standType); + List getStandInfoByList(String limit); + SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception; public void attrInfoDetails (SarStandardsInfo row) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0b2d01bf..c3e1a681 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1829,6 +1829,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getStandInfoByList(String limit){ + return dao.queryStandInfoByList(Integer.valueOf(limit)); + } + /** * 新增过程中验证标准号 * diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 253602d1..2bc31a08 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -626,6 +626,16 @@ + +