联动单位分页接口添加参数

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/ILinkageUnitService.java

@@ -24,9 +24,20 @@ public interface ILinkageUnitService {
 
     LinkageUnitDto queryOne(Long sequenceNbr);
 
-    public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
+    /**
+     * 联动单位分页查询
+     *
+     * @param page
+     * @param isDelete
+     * @param unitName 单位名称
+     * @param linkageUnitType 联动单位类型
+     * @param emergencyLinkageUnitCode 紧急联动单位类型code
+     * @return
+     */
+    Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String unitName,
-                                                        @Condition(Operator.eq) String linkageUnitType);
+                                                        @Condition(Operator.eq) String linkageUnitType,
+                                                        @Condition(Operator.eq) String emergencyLinkageUnitCode);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -473,14 +473,14 @@ public class CommandController extends BaseController {
     @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "LinkageUnitDto/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
-    public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoqueryForPage(@RequestParam(value = "pageNum") int pageNum,
+    public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoQueryForPage(@RequestParam(value = "pageNum") int pageNum,
                                                             @RequestParam(value = "pageSize") int pageSize,
                                                             String unitName, String linkageUnitType, String inAgreement) {
         Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false,
-                unitName, linkageUnitType);
+                unitName, linkageUnitType, null);
 
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/LinkageUnitController.java

@@ -116,12 +116,12 @@ public class LinkageUnitController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
     public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, String unitName, String linkageUnitType, String inAgreement) {
+            (value = "size") int size, String unitName, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode) {
         Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(current);
         page.setSize(size);
         Page<LinkageUnitDto> linkageUnitDtoPage = linkageUnitServiceImpl.queryForLinkageUnitPage(page, false,
-                unitName, linkageUnitType);
+                unitName, linkageUnitType, emergencyLinkageUnitCode);
         Date now = new Date();
         List<LinkageUnitDto> linkageUnitDtoList = linkageUnitDtoPage.getRecords().stream().map(item -> {
             boolean isInAgreement = DateUtils.belongCalendar(now, item.getAgreementStartDate(),

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java

@@ -61,8 +61,9 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
     public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String unitName,
-                                                        @Condition(Operator.eq) String linkageUnitType) {
-        return this.queryForPage(page, null, false, isDelete, unitName, linkageUnitType);
+                                                        @Condition(Operator.eq) String linkageUnitType,
+                                                        @Condition(Operator.eq) String emergencyLinkageUnitCode) {
+        return this.queryForPage(page, null, false, isDelete, unitName, linkageUnitType, emergencyLinkageUnitCode);
     }
 
     /**