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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -419,6 +419,15 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         }
     }
 
+
+    @ApiOperation(value = "标准发布查询")
+    @GetMapping("/getStandInfoByList")
+    //@RequiresPermissions("lawss:sarStandardsInfo:get")
+    public ResponseMessage<List<SarStandardsInfo>> getStandInfoByList(String limit) throws Exception {
+        List<SarStandardsInfo> result = sarStandardsInfoEOService.getStandInfoByList(limit);
+        return Result.success(result);
+    }
+
     @ApiOperation(value = "|SarStandardsInfoEO|详情")
     @GetMapping("/getStandInfoById")
     //@RequiresPermissions("lawss:sarStandardsInfo:get")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java

@@ -29,6 +29,8 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
     List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO);
 
+    List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit);
+
     Integer selectStandColumn(@Param("columnName") String columnName);
 
     Integer selectCounterStandardsCount(SarStandardsInfo sarStandardsInfoEO);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java

@@ -31,6 +31,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
     List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType);
 
+    List<SarStandardsInfo> getStandInfoByList(String limit);
+
     SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception;
 
     public void attrInfoDetails (SarStandardsInfo row) throws Exception;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1829,6 +1829,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return strhours;
     }
 
+    @Override
+    public List<SarStandardsInfo> getStandInfoByList(String limit){
+        return dao.queryStandInfoByList(Integer.valueOf(limit));
+    }
+
     /**
      * 新增过程中验证标准号
      *

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -626,6 +626,16 @@
         </if>
     </select>
 
+    <select id="queryStandInfoByList" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        FROM sar_standards_info
+        LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
+        WHERE DATE_FORMAT(ssai.SSRQ,'%Y-%m-%D') &gt;= DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME,'%Y-%m-%D')
+        ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC
+        LIMIT #{limit}
+    </select>
+
     <!--    查询表中是否存在某字段-->
     <select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String">
         SELECT COUNT(*)