修改微型消防站代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

@@ -28,6 +28,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 			+ "<if test='par.bizCompanyId!=null'> and a.biz_company_id = #{par.bizCompanyId} </if>"
 			+ "<if test='par.bizCompanyCode!=null'> and a.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
 			+ "<if test='par.address!=null'> and a.address like  CONCAT('',#{par.address},'%') </if>"
+			+ "<if test='par.bizOrgCode != null'> and a.biz_org_code like  CONCAT(#{par.bizOrgCode},'%') </if>"
 			+" order by a.rec_date desc limit  #{pageNum},#{pageSize}"
 			+ "</script>")	
 	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
@@ -37,6 +38,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
 			+ "<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
 			+ "<if test='par.address!=null'> and cb_fire_station.address like  CONCAT('',#{par.address},'%') </if>"
+			+ "<if test='par.bizOrgCode != null'> and biz_org_code  like  CONCAT(#{par.bizOrgCode},'%')  </if>"
 			+ "</script>")	
 	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par);
 

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

@@ -39,7 +39,7 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "微型消防站Api")
-@RequestMapping(value = "/common/fire-station")
+    @RequestMapping(value = "/common/fire-station")
 public class FireStationController extends BaseController {
 
     @Autowired
@@ -77,7 +77,7 @@ public class FireStationController extends BaseController {
     }
 
     /**
-     * 根据sequenceNbr删除
+     *  根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
      * @return
@@ -175,7 +175,7 @@ public class FireStationController extends BaseController {
      */
     @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/companyTreeByUserAndType")
+    @GetMapping(value = "/tree/companyTreeByUserAndType")
     @ApiOperation(httpMethod = "GET", value = "微型消防站单位部门树", notes = "微型消防站单位部门树")
     public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(@RequestParam(required = false) String type) {
         // 获取登陆人角色

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,null);
+			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false, bizCompanyId,nameString,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireStationDtoList,
 					FireStationDto.class, null, false);
 			break;