修改微型消防站

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireStationDto.java

@@ -122,4 +122,12 @@ public class FireStationDto extends BaseDto {
     @ApiModelProperty(value = "战备车辆数量")
     private Integer carNum;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireStation.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -87,4 +88,10 @@ public class FireStation extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
 }

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +44,9 @@ public class FireStationController extends BaseController {
     @Autowired
     FireStationServiceImpl fireStationServiceImpl;
 
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+
     /**
      * 新增微型消防站
      *
@@ -107,11 +113,11 @@ public class FireStationController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "微型消防站分页查询", notes = "微型消防站分页查询")
     public ResponseModel<Page<FireStationDto>> queryForPage(@RequestParam(value = "current") int current,
-                                                            @RequestParam(value = "size") int size) {
+                                                            @RequestParam(value = "size") int size,String bizOrgCode) {
         Page<FireStationDto> page = new Page<FireStationDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationPage(page));
+        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationPage(page,bizOrgCode));
     }
 
     /**
@@ -142,8 +148,8 @@ public class FireStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "微型消防站列表全部数据查询", notes = "微型消防站列表全部数据查询")
     @GetMapping(value = "/list")
-    public ResponseModel<List<FireStationDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationList(false,null,null));
+    public ResponseModel<List<FireStationDto>> selectForList(String bizOrgCode) {
+        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationList(false,null,null,bizOrgCode));
     }
 
     /**
@@ -159,4 +165,19 @@ public class FireStationController extends BaseController {
         List<MenuFrom> menus = fireStationServiceImpl.getCompanyTeamTree();
         return ResponseHelper.buildResponse(menus);
     }
+
+    /**
+     * 微型消防站单位部门树
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/companyTreeByUserAndType")
+    @ApiOperation(httpMethod = "GET", value = "微型消防站单位部门树", notes = "微型消防站单位部门树")
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(@RequestParam(required = false) String type) {
+        // 获取登陆人角色
+        ReginParams reginParams = getSelectedOrgInfo();
+        return ResponseHelper.buildResponse(iOrgUsrService.companyTreeByUserAndType(reginParams,type));
+    }
 }

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

@@ -48,15 +48,15 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
     /**
      * 分页查询
      */
-    public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page) {
-        return this.queryForPage(page, null, false);
+    public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page,String bizOrgCode) {
+        return this.queryForPage(page, null, false,bizOrgCode);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete,@Condition(Operator.eq) Long bizCompanyId,@Condition(Operator.like) String name) {
-        return this.queryForList("", false, isDelete,bizCompanyId,name);
+    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete,@Condition(Operator.eq) Long bizCompanyId,@Condition(Operator.like) String name,@Condition(Operator.eq) String bizOrgCode) {
+        return this.queryForList("", false, isDelete,bizCompanyId,name,bizOrgCode);
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -251,7 +251,7 @@ public class ExcelServiceImpl {
 				nameString =par.containsKey("name")?par.get("name").toString():null;
 				bizCompanyId =par.containsKey("bizCompanyId")?Long.parseLong(par.get("bizCompanyId").toString()):null;;
 			}
-			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false, bizCompanyId,nameString);
+			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false, bizCompanyId,nameString,null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireStationDtoList,
 					FireStationDto.class, null, false);
 			break;
@@ -1637,7 +1637,7 @@ public class ExcelServiceImpl {
 					FireTeamDto.class, dataSourcesImpl, false);
 			break;
 		case "WXXFZ":
-			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false,null,null);
+			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false,null,null,null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireStationDtoList,
 					FireStationDto.class, null, false);
 			break;