Merge branch 'develop_master' into FOTON

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -234,20 +234,12 @@ public class SarStandardComplianceAssessResultController {
     public ResponseMessage<Object> selectNationalStandard(InterpretationEO eo) throws Exception {
         if (eo.getPosition() == 1) {
             IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-            QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
-            //如果查询条件里标准编号不为空，查询
-            if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber());
-            //如果查询条件里标准名称不为空，查询
-            if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName());
-            //如果查询条件里具体章条不为空，查询
-            if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem());
-
-            if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
-            if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
-
-            IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
-            while (page.getRecords().remove(null)) ;
-            return Result.success(page);
+            List<SarInterpretationNationalStandard> standards=iSarInterpretationNationalStandardService.getAllDatas(eo);
+            Integer datasCount=iSarInterpretationNationalStandardService.getAllDatasCount(eo);
+            iPage.setTotal(datasCount);
+            iPage.setRecords(standards);
+            while (iPage.getRecords().remove(null)) ;
+            return Result.success(iPage);
         } else {
             IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
             QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java

@@ -1,9 +1,12 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
 
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -16,4 +19,8 @@ public interface SarInterpretationNationalStandardDao extends BaseMapper<SarInte
 
     boolean updateData(@Param("find") SarInterpretationNationalStandard findStandDto);
 
+    List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard);
+
+    Integer getAllDatasCout(InterpretationEO sarInterpretationNationalStandard);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
 
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,4 +19,8 @@ public interface ISarInterpretationNationalStandardService extends IService<SarI
     String saveBath(List<SarInterpretationNationalStandard> sarInterpretationNationalStandards);
 
     boolean updateData(SarInterpretationNationalStandard findStandDto);
+
+    List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard);
+
+    Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
 
 import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
@@ -55,4 +56,14 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<Sa
     public boolean updateData(SarInterpretationNationalStandard findStandDto) {
         return sarInterpretationNationalStandardDao.updateData(findStandDto);
     }
+
+    @Override
+    public List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard) {
+        return sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard);
+    }
+
+    @Override
+    public Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard) {
+        return sarInterpretationNationalStandardDao.getAllDatasCout(sarInterpretationNationalStandard);
+    }
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml

@@ -14,4 +14,75 @@
         and sar_interpretation_national_standard.STAND_NAME=#{find.standName}
         and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime}
     </update>
+
+    <select id="getAllDatas"
+            resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard">
+
+            SELECT c.* FROM (
+            SELECT
+                (@i:=@i+1) as rows,
+                id,
+                INTERPRETATION_TIME,
+                STAND_NUMBER,
+                specific_item,
+                compared_with_previous,
+                CREATION_USER,
+                CREATION_TIME,
+                VALID_FLAG,
+                LAST_VERSION_NUMBER,
+                risk_degree,
+                compliance_state,
+                INTERPRETATION_STATE,
+                STAND_TYPE,
+                MODIFY_TIME,
+                STAND_SORT,
+                STAND_ID,
+                STAND_NAME,
+                core_technical_requirement
+            FROM
+                sar_interpretation_national_standard ,(SELECT @i:=0)j
+            WHERE
+                1=1
+                <if test="interpretationTime!=null ">
+                   and INTERPRETATION_TIME = #{interpretationTime}
+                </if>
+                <if test="standId!=null and standId!=''">
+                    AND STAND_ID = #{standId}
+                </if>
+                <if test="standNumber!=null and standNumber!=''">
+                    AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
+                </if>
+                <if test="standName!=null and standName!=''">
+                    AND STAND_NAME like concat(concat('%',#{standName}),'%')
+                </if>
+                <if test="specificItem!=null and specificItem!=''">
+                    AND specific_item like concat(concat('%',#{specificItem}),'%')
+                </if>
+                ORDER BY STAND_ID, specific_item
+                LIMIT ${(current-1)*size},${current*size}
+                ) c  ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
+    </select>
+    <select id="getAllDatasCout" resultType="java.lang.Integer">
+            SELECT
+            count(id)
+            FROM
+            sar_interpretation_national_standard
+            WHERE
+            1=1
+            <if test="interpretationTime!=null ">
+                and INTERPRETATION_TIME = #{interpretationTime}
+            </if>
+            <if test="standId!=null and standId!=''">
+                AND STAND_ID = #{standId}
+            </if>
+            <if test="standNumber!=null and standNumber!=''">
+                AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
+            </if>
+            <if test="standName!=null and standName!=''">
+                AND STAND_NAME like concat(concat('%',#{standName}),'%')
+            </if>
+            <if test="specificItem!=null and specificItem!=''">
+                AND specific_item like concat(concat('%',#{specificItem}),'%')
+            </if>
+    </select>
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml

@@ -21,7 +21,7 @@
                 and name like concat('%',#{name},'%')
             </if>
             <if test="project_id != null and project_id != ''">
-                and project_id = #{project_id}
+                and project_id = #{projectId}
             </if>
             <if test="project_name != null and project_name != ''">
                 and project_name = #{project_name}
@@ -111,7 +111,7 @@
                 name = #{name},
             </if>
             <if test="project_id != null and project_id != ''">
-                project_id = #{project_id},
+                project_id = #{projectId},
             </if>
             <if test="project_name != null and project_name != ''">
                 project_name = #{project_name},
@@ -254,7 +254,7 @@
                 #{name},
             </if>
             <if test="project_id != null and project_id != ''">
-                #{project_id},
+                #{projectId},
             </if>
             <if test="project_name != null and project_name != ''">
                 #{project_name},