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

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java

@@ -41,20 +41,20 @@ public class PDMCSarLawsStandInfoController extends BaseController<PDMCSarLawsSt
     public ResponseMessage<PageInfo<PDMCSarLawsStandInfo>> getSarStandardsInfoPage(
             @RequestParam(value = "current", defaultValue = "1") Long current,
             @RequestParam(value = "limit",required = false) Long limit) throws Exception {
+        Long count = pdmcSarLawsStandInfoService.getSarStandardsCount();
         if (ObjectUtil.isEmpty(limit)){
-            int count = pdmcSarLawsStandInfoService.getSarStandardsCount();
             if (count == 0) {
                 return Result.error("文件信息为空");
             }
-            limit = (long) count;
+            limit = count;
         }
-        Page<PDMCSarLawsStandInfo> page = new Page<>(current, limit);
+        Page<PDMCSarLawsStandInfo> page = new Page<>(current, limit,false);
         Page<PDMCSarLawsStandInfo> sarStandardsInfoPage = pdmcSarLawsStandInfoService.getSarStandardsInfo(page);
 
         PageInfo<PDMCSarLawsStandInfo> pdmcSarLawsStandInfoPageInfo = new PageInfo<>();
         pdmcSarLawsStandInfoPageInfo.setList(sarStandardsInfoPage.getRecords());
         pdmcSarLawsStandInfoPageInfo.setPageNo((int)sarStandardsInfoPage.getCurrent());
-        pdmcSarLawsStandInfoPageInfo.setCount(sarStandardsInfoPage.getTotal());
+        pdmcSarLawsStandInfoPageInfo.setCount(count);
         pdmcSarLawsStandInfoPageInfo.setPageSize((int) sarStandardsInfoPage.getSize());
         if (pdmcSarLawsStandInfoPageInfo.getList().isEmpty()) {
             return Result.error("404","文件信息为空",pdmcSarLawsStandInfoPageInfo);

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java

@@ -12,5 +12,5 @@ import java.util.List;
 public interface PDMCSarLawsStandInfoDao extends BaseMapper<PDMCSarLawsStandInfo> {
     Page<PDMCSarLawsStandInfo> getSarStandardsInfo(@Param("page")Page<PDMCSarLawsStandInfo> page);
 
-    int getSarStandardsCount();
+    Long getSarStandardsCount();
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java

@@ -15,5 +15,5 @@ import java.util.List;
 public interface PDMCSarLawsStandInfoService extends IService<PDMCSarLawsStandInfo> {
     Page<PDMCSarLawsStandInfo> getSarStandardsInfo(Page<PDMCSarLawsStandInfo> page);
 
-    int getSarStandardsCount();
+    Long getSarStandardsCount();
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java

@@ -25,7 +25,7 @@ public class PDMCSarLawsStandInfoServiceImpl extends ServiceImpl<PDMCSarLawsStan
     }
 
     @Override
-    public int getSarStandardsCount() {
+    public Long getSarStandardsCount() {
         return baseMapper.getSarStandardsCount();
     }
 }

adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml

@@ -25,7 +25,14 @@
 				IFNULL(CONCAT('-', CASE WHEN ssi.STAND_YEAR='' THEN NULL ELSE ssi.STAND_YEAR END), '')) as STAND_NUMBER,
         ssi.STAND_NAME as STAND_NAME,
         ssi.STAND_EN_NAME as STAND_EN_NAME,
-        ssi.STAND_STATE as TEXT_STATE,
+        (SELECT
+	        ts_dictype.DIC_TYPE_NAME
+        FROM
+	        ts_dictype
+        WHERE
+            DIC_ID = ( SELECT id FROM ts_dictionary WHERE DICTIONARY_CODE = "STANDSTATE" )
+                and VALID_FLAG = 0
+                and ssi.stand_state = ts_dictype.DIC_TYPE_CODE) as TEXT_STATE,
         ssi.ISSUE_TIME as ISSUE_TIME,
         ssi.REPLACE_STAND_NUM as REPLACE_STAND_NUM,
         concat('https://srms.foton.com.cn/#/otherStandardDetails/',ssi.ID,'/',ssi.STAND_TYPE,'_STAND') as LINK
@@ -38,10 +45,12 @@
         from sar_standards_info ssi
         left join sar_stand_menu ssm on ssi.id=ssm.STAND_ID order by ssi.ID asc
     </select>
-    <select id="getSarStandardsCount" resultType="java.lang.Integer">
+    <select id="getSarStandardsCount" resultType="long">
         select
         count(1)
-        from sar_standards_info
+        from (select
-        left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
+        <include refid="Base_Column_List_Show"/>
+        from sar_standards_info ssi
+        left join sar_stand_menu ssm on ssi.id=ssm.STAND_ID) temp
     </select>
 </mapper>