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

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

@@ -374,7 +374,7 @@ public interface workFlowFeignClient {
     Wrapper<String> findPrcNumByPid(@RequestParam("pId") String pId);
 
     @RequestMapping(value = "/bat-wkflow/findPrcNameByPrcNum",method = RequestMethod.GET)
-        Wrapper<String> findPrcNameByPrcNum(@RequestParam("prcNum") String prcNum);
+    Wrapper<String> findPrcNameByPrcNum(@RequestParam("prcNum") String prcNum);
 
     @RequestMapping(value = "/bat-wkflow/getStandCode",method = RequestMethod.GET)
     Set<String> getStandCode();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java

@@ -6,6 +6,7 @@ import com.adc.da.http.Result;
 import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO;
 import com.adc.da.slrs.sarPosition.service.ITsPositionService;
 import com.adc.da.slrs.sarRole.entity.TsRole;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -38,8 +39,8 @@ public class TsPositionController extends BaseController<TsPosition> {
      */
     @ApiOperation("查询岗位")
     @GetMapping
-    public ResponseMessage<List<TsPosition>> getPosition(TsPosition tsPosition){
-        List<TsPosition> positions=tsPositionService.getPosition(tsPosition);
+    public ResponseMessage<IPage<TsPosition>> getPosition(TsPosition tsPosition){
+        IPage<TsPosition> positions=tsPositionService.getPosition(tsPosition);
         return Result.success(positions);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java

@@ -64,6 +64,8 @@ public interface TsPositionDao extends BaseMapper<TsPosition> {
      */
     List<String> getRoleIdsByPositionIds(List<String> positionIds);
 
+    long pageTotal();
+
     /**
      * 通过roleId查询岗位ID列表
      * @param roleId：角色ID

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java

@@ -76,5 +76,12 @@ public class TsPosition extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp createTime;
 
+    @TableField(exist = false)
+    private Integer current;
 
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    @TableField(exist = false)
+    private  Integer total;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java

@@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.slrs.sarPosition.entity.TsPosition;
 import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO;
 import com.adc.da.slrs.sarRole.entity.TsRole;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public interface ITsPositionService extends IService<TsPosition> {
      * @param tsPosition：查询信息
      * @return List<TsPosition>
      */
-    List<TsPosition> getPosition(TsPosition tsPosition);
+    IPage<TsPosition> getPosition(TsPosition tsPosition);
 
     /**
      * 配置角色

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java

@@ -9,6 +9,8 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService;
 import com.adc.da.slrs.sarRole.entity.TsRole;
 import com.adc.da.utils.util.ListUtil;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,9 +42,16 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
      * @return List<TsPosition>
      */
     @Override
-    public List<TsPosition> getPosition(TsPosition tsPosition) {
+    public IPage<TsPosition> getPosition(TsPosition tsPosition) {
+        IPage page=new Page();
 
-        return tsPositionDao.selectPositionAndRole(tsPosition);
+        page.setTotal(tsPositionDao.pageTotal());
+        page.setRecords(tsPositionDao.selectPositionAndRole(tsPosition));
+        page.setCurrent(tsPosition.getCurrent());
+        page.setSize(tsPosition.getPageSize());
+        System.out.println(page.getTotal());
+
+        return page;
     }
 
     /**

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

@@ -162,7 +162,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         }
         List<String> standId = new ArrayList<>();
         for (SarStandardsInfo standardsInfo : pageInfo){
-            if (standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){
+            if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){
                 standId.add(standardsInfo.getId());
             }
         }

adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml

@@ -32,6 +32,11 @@
                 p.name like concat(concat('%',#{name}),'%')
             </if>
         </where>
+        limit ${(current-1) * pageSize},${pageSize}
+    </select>
+
+    <select id="pageTotal" resultType="Long">
+        select count(1) as total from ts_position
     </select>
 
     <select id="getRoleIdsByPositionIds" resultType="String">