标准分解单 分页

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "bat-wkflow")
+@FeignClient(value = "bat-wkflow-zhaokaiyao")
 //@FeignClient(value = "shan")
 public interface workFlowFeignClient {
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandItems.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 
@@ -55,9 +56,11 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
     @ApiOperation(value = "分解单查询")
     @GetMapping("/querySarItemAndInterpretation")
     public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
-        List<SarItemVO> sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page);
+        List<SarStandItems> rows = ServiceImpl.querySarItemAndInterpretation(page);
 
-        return Result.success("200",sarItemVOS);
+        PageInfo<SarStandItems> pageInfo = getPageInfo(page.getPager(), rows);
+
+        return Result.success(pageInfo);
     }
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -24,7 +24,10 @@ import java.util.Set;
 @Repository
 public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
-    List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
+    List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
+
+    Integer sarItemCount(FindSarItemsPageReqDTO page);
+
 
     List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java

@@ -10,7 +10,7 @@ import java.util.Date;
 
 
 @Data
-public class FindSarItemsPageReqDTO {
+public class FindSarItemsPageReqDTO extends BasePage {
 
     private static final long serialVersionUID = 1L;
     private Integer page = 1;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java

@@ -27,8 +27,6 @@ public class SarItemVO extends BaseEntity {
     @ApiModelProperty(value = "条款名称")
     private String itemsName;
 
-    @ApiModelProperty(value = "条款内容(未使用)")
-    private String itemsTitle;
 
     @ApiModelProperty(value = "条款内容--条款要求")
     private String termsConditions;
@@ -66,4 +64,7 @@ public class SarItemVO extends BaseEntity {
 
     @ApiModelProperty(value = "解读内容--核心技术要点")
     private String interpretationContent;
+
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author super_liu
@@ -132,6 +132,15 @@ public class SarStandItems extends BaseEntity {
     @TableField("ZCCSSRQ")
     private Date zccssrq;
 
+
+    @ApiModelProperty(value = "符合性要求-符合性状态")
+    @TableField("COMPLIANCE_REQUIR")
+    private String complianceRequire;
+
+    @ApiModelProperty(value = "解读内容--核心技术要点")
+    @TableField("core_technical_requirement")
+    private String interpretationContent;
+
     @TableField(exist = false)
     private String emergyKindShow;
     @TableField(exist = false)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -11,6 +11,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -191,7 +192,15 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     }
 
 
-    public List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
+    public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
-        return dao.querySarItemAndInterpretation(page);
+
+
+
+        Integer count=dao.sarItemCount(page);
+        page.getPager().setRowCount(count);
+
+
+        List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
+        return sarStandItems;
     }
 }

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

@@ -599,10 +599,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
                 pageInfo.setStandId(sarStandardsInfoEO.getId());
                 pageInfo.setFileType("FBGBJBD");
-                List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
+
+                /**
+                 *  SarItemVO换为sarItemVOS
+                 *  List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
+                 *  .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
+                 */
+
+                List<SarStandItems> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
                 if(!sarItemVOS.isEmpty()){
                     Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
-                            .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
+                            .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getItemsName));
                     sarStandardsInfoEO.setMapItems(collectMap);
                 }
                 createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
@@ -1179,10 +1186,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
             pageInfo.setStandId(sarStandardsInfoEO.getId());
             pageInfo.setFileType("FBGBJBD");
-            List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
+
+            /**
+             *  SarItemVO换为SarItemVOS
+             *  List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
+             *  .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
+             */
+            List<SarStandItems> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
             if(!sarItemVOS.isEmpty()){
                 Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
-                        .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
+                        .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getItemsName));
                 sarStandardsInfoEO.setMapItems(collectMap);
             }
             createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -51,15 +51,14 @@
         <result column="foShow" property="foShow"/>
     </resultMap>
 
-    <resultMap id="sarItemVOResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarItemVO">
+    <resultMap id="sarItemVOResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
         <id column="id" property="id"/>
         <result column="STAND_ID" property="standId"/>
         <result column="ITEMS_NUM" property="itemsNum"/>
         <result column="ITEMS_NAME" property="itemsName"/>
-        <result column="ITEMS_TITLE" property="itemsTitle"/>
         <result column="TERMS_CONDITIONS" property="termsConditions"/>
-        <result column="XCXSSRQ" property="XCXSSRQ"/>
+        <result column="XCXSSRQ" property="xccssrq"/>
-        <result column="ZCCSSRQ" property="ZCCSSRQ"/>
+        <result column="ZCCSSRQ" property="zccssrq"/>
         <result column="APPLY_ARCTIC" property="applyArctic"/>
         <result column="RESPONSIBLE_UNIT" property="responsibleUnit"/>
         <result column="DUTY_ENGINEER" property="dutyEngineer"/>
@@ -367,41 +366,54 @@
 
   </delete>
 
+
+
+
     <!-- SAR_STAND_ITEMS 列表总数-->
     <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
         select count(1) from SAR_STAND_ITEMS
         <include refid="Base_Where_Clause"/>
     </select>
 
+
+    <sql id="sarItemWhere">
+        <where>
+            <if test="standId!=null and standId!=''">
+                and stand_id=#{standId}
+            </if>
+
+            <if test="fileType !=null and fileType!=''">
+                and file_type=#{fileType}
+            </if>
+
+            <if test="itemsName != null and itemsName!=''">
+                and ITEMS_NAME=#{itemsName}
+            </if>
+            <if test="XCXSSRQ !=null and XCXSSRQ!=''">
+                and XCXSSRQ=#{XCXSSRQ}
+            </if>
+            <if test="ZCCSSRQ !=null and ZCCSSRQ != ''">
+                and ZCCSSRQ=#{ZCCSSRQ}
+            </if>
+        </where>
+    </sql>
+
+    <select id="sarItemCount" parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO" resultType="java.lang.Integer">
+        SELECT COUNT( 1 ) FROM sar_stand_items
+        <include refid="sarItemWhere"/>
+
+    </select>
+
+
     <select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
             parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
             SELECT
 	        *
             FROM
-	            sar_stand_items AS a
+	            sar_stand_items
-        <where>
+        <include refid="sarItemWhere"/>
-
-            <if test="standId!=null and standId!=''">
-                and a.stand_id=#{standId}
-            </if>
-
-            <if test="fileType !=null and fileType!=''">
-               and a.file_type=#{fileType}
-            </if>
-
-            <if test="itemsName != null and itemsName!=''">
-                and a.ITEMS_NAME=#{itemsName}
-            </if>
-            <if test="XCXSSRQ !=null and XCXSSRQ!=''">
-                and a.XCXSSRQ=#{XCXSSRQ}
-            </if>
-            <if test="ZCCSSRQ !=null and ZCCSSRQ != ''">
-                and a.ZCCSSRQ=#{ZCCSSRQ}
-            </if>
-        </where>
         LIMIT #{page},#{pageSize}
 
-
     </select>
 
     <!-- 查询SAR_STAND_ITEMS列表 -->