Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -115,5 +115,6 @@ public class FirefightersDto extends BaseDto {
     
     @ApiModelProperty(value = "专家领域")
     private String areasExpertise;
-
+    @ApiModelProperty(value = "消防专家领域字典code")
+    private String areasExpertiseCode;
 }

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+/**
+* 消防队员
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FirefightersZhDto", description="消防队员")
+public class FirefightersZhDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "系统账号")
+    private String systemAccount;
+
+    @ApiModelProperty(value = "员工编码")
+    private String employeeNumber;
+
+    @ApiModelProperty(value = "所属机构")
+    private String company;
+
+    @ApiModelProperty(value = "机构code")
+    private String companyCode;
+
+    @ApiModelProperty(value = "队伍id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "常用证件类型代码")
+    private String certificatesType;
+
+    @ApiModelProperty(value = "常用证件类型代码code")
+    private String certificatesTypeCode;
+
+
+    @ApiModelProperty(value = "证件号码")
+    private String certificateNumber;
+
+    @ApiModelProperty(value = "出生日期")
+    private Date birthdayTime;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "籍贯/户口所在地")
+    private String nativePlace;
+
+    @ApiModelProperty(value = "现居住地")
+    private String residence;
+
+    @ApiModelProperty(value = "现居住地详情")
+    private String residenceDetails;
+
+    @ApiModelProperty(value = "机场住宿情况")
+    private String airportAccommodation;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+    
+    @ApiModelProperty(value = "岗位名称数据字典code")
+    private String jobTitleCode;
+    
+    @ApiModelProperty(value = "人员状态，在职/离职")
+    private String state;
+    @ApiModelProperty(value = "人员状态，在职/离职字典code")
+    private String stateCode;
+
+    @ApiModelProperty(value = "婚姻状况")
+    private String maritalStatus;
+
+    @ApiModelProperty(value = "办公电话")
+    private String officeTelephone;
+
+    @ApiModelProperty(value = "手机")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "互联网_电子信箱")
+    private String email;
+
+    @ApiModelProperty(value = "政治面貌代码")
+    private String politicalOutlook;
+
+    @ApiModelProperty(value = "人员照片")
+    private String personnelPhotos;
+
+    @ApiModelProperty(value = "身份证正面")
+    private String idPositive;
+
+    @ApiModelProperty(value = "身份证反面")
+    private String idReverse;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "机构名称")
+    private String companyName;
+    
+    @ApiModelProperty(value = "专家领域")
+    private String areasExpertise;
+    
+    @ApiModelProperty(value = "消防专家领域字典code")
+    private String areasExpertiseCode;
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -21,7 +22,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
 
-    List<Firefighters> getFirefighters(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize,
+    List<FirefightersZhDto> getFirefighters(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize,
                                        @Param("par") FirefightersDto par);
 
     Map<String, Long> getFirefightersCount(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param(

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

@@ -7,5 +7,9 @@ package com.yeejoin.amos.boot.module.common.api.service;
 * @date 2021-06-07
 */
 public interface IDataDictionaryService {
-	
+
+
+    Object getFireChemical(String type) throws Exception;
+
+    Object  gwmcDataDictionary(String type)throws Exception;
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
 
+import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 /**
 * 危化品接口类
 *
@@ -8,5 +12,7 @@ package com.yeejoin.amos.boot.module.common.api.service;
 * @date 2021-06-29
 */
 public interface IFireChemicalService {
+    public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page, @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode, boolean isDelete) ;
+
 
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
 
+import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 /**
 * 接口类
 *消防专家
@@ -9,4 +14,9 @@ package com.yeejoin.amos.boot.module.common.api.service;
 */
 public interface IFireExpertsService {
 
+
+    public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
+                                                        @Condition(Operator.eq) Boolean isDelete,
+                                                        @Condition(Operator.like) String name,
+                                                        @Condition(Operator.eq) String expertCode);
 }

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

@@ -6,7 +6,7 @@ import java.util.Map;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
-import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 
 
 /**
@@ -18,7 +18,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 public interface IFirefightersService {
 
 
-    List<Firefighters> getFirefighters(int pageNum, int pageSize, FirefightersDto par);
+    List<FirefightersZhDto> getFirefighters(int pageNum, int pageSize, FirefightersDto par);
 
     Map<String, Long> getFirefightersCount(int pageNum, int pageSize, FirefightersDto par);
 
@@ -27,5 +27,11 @@ public interface IFirefightersService {
     List<Menu> getFirefightersJobTitleCount() throws Exception;
 
     void saveFirefighters(FirefightersInfoDto firefighters);
+    
+    
+    
+    
+    
+    
 
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 
 import java.util.List;
 
@@ -21,4 +23,10 @@ public interface ILinkageUnitService {
     Integer listLinkageUnitZhDtoCount(RequestData par);
 
     LinkageUnitDto queryOne(Long sequenceNbr);
+
+    public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
+                                                        @Condition(Operator.eq) Boolean isDelete,
+                                                        @Condition(Operator.like) String unitName,
+                                                        @Condition(Operator.eq) String linkageUnitType);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -11,16 +11,18 @@
     </select>
 
     <select id="getFirefighters"
-            resultType="com.yeejoin.amos.boot.module.common.api.entity.Firefighters">
-        select a.* from cb_firefighters a LEFT JOIN cb_firefighters_post b on
-        a.sequence_nbr=b.firefighters_id where a.is_delete=0 ORDER BY a.rec_date 
+            resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto">
+        select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code areasExpertiseCode from cb_firefighters a LEFT JOIN cb_firefighters_post b on
+        a.sequence_nbr=b.firefighters_id where a.is_delete=0
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
         <if test='par.name!=null'>and a.name= #{par.name}</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
-        limit #{pageNum},#{pageSize}
+         <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
+         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
+        ORDER BY a.rec_date  limit #{pageNum},#{pageSize}
     </select>
 
     <select id="getFirefightersCount" resultType="Map">
@@ -33,6 +35,8 @@
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
+        <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
+        <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
     </select>
 
 

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

 package com.yeejoin.amos.boot.module.command.biz.controller;
 
+import com.alibaba.fastjson.JSON;
+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.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao;
 import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.service.*;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
@@ -29,8 +35,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * *指挥资源Api
@@ -60,7 +66,17 @@ public class CommandController extends BaseController {
     @Autowired
     ILinkageUnitService  iLinkageUnitService;
     @Autowired
-     IAlertSubmittedService alertSubmittedService;
+    IAlertSubmittedService alertSubmittedService;
+    @Autowired
+    IDataDictionaryService  dataDictionaryService;
+    @Autowired
+    IFireChemicalService fireChemicalService;
+
+    @Autowired
+    IFireExpertsService fireExpertsService;
+    
+    @Autowired
+    IFirefightersService firefightersService;
     /**
      * 警情列表
      *
@@ -365,5 +381,95 @@ public class CommandController extends BaseController {
     }
 
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询危险品字典", notes = "根据字典类型查询危险品字典")
+    public ResponseModel<Object> gwmcDataDictionaryFireChemical(@PathVariable String type) throws Exception {
+       Object list = dataDictionaryService.getFireChemical(type);
+         return ResponseHelper.buildResponse(list);
+     }
+
+    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "危化品分页查询", notes = "危化品分页查询")
+    public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
+                                                             @RequestParam(value = "pageSize") int pageSize, String casNo,
+                                                             String formula, String name, String typeCode) {
+        Page<FireChemicalDto> page = new Page<FireChemicalDto>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        boolean isDelete = false;
+        return ResponseHelper.buildResponse(fireChemicalService.queryForFireChemicalPage(page, casNo, formula,
+                name, typeCode, isDelete));
+    }
+
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/gwmcDataDictionary/{type}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
+    public ResponseModel<Object> gwmcDataDictionary(@PathVariable String type) throws Exception {
+
+        Object list = dataDictionaryService.gwmcDataDictionary(type);
+        return ResponseHelper.buildResponse(list);
+
+    }
+
+    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "fireExperts/page")
+    @ApiOperation(httpMethod = "GET", value = "外部专家分页查询", notes = "外部专家分页查询")
+    public ResponseModel<IPage<FireExpertsDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
+                                                             @RequestParam(value = "pageSize") int pageSize,
+                                                             FireExpertsDto fireExpertsDto) {
+        Page<FireExpertsDto> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+         Page<FireExpertsDto> fireExpertsDtoPage = fireExpertsService.queryForFireExpertsPage(page, false,
+                fireExpertsDto.getName(), fireExpertsDto.getExpertCode());
+        return ResponseHelper.buildResponse(fireExpertsDtoPage);
+    }
+
+
+    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "LinkageUnitDto/page")
+    @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
+    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);
+
+        return ResponseHelper.buildResponse(linkageUnitDtoPage);
+    }
 
+    
+    
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getFirefighters", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "内部专家列表分页查询", notes = "内部专家列表分页查询")
+    public ResponseModel<Page<FirefightersZhDto>> getFirefighters(Integer pageNum, Integer pageSize,
+                                                             FirefightersDto firefighters) {   	
+    	if(firefighters.getAreasExpertiseCode()==null) {
+    		firefighters.setAreasExpertiseCode("0");
+    	}  	
+        //条件分页
+        if (null == pageNum || null == pageSize) {
+            pageNum = 1;
+            pageSize = Integer.MAX_VALUE;
+        }
+        List<FirefightersZhDto> list = firefightersService.getFirefighters((pageNum - 1) * pageSize, pageSize,
+                firefighters);
+        Map<String, Long> num = firefightersService.getFirefightersCount((pageNum - 1) * pageSize, pageSize,
+                firefighters);
+        Page<FirefightersZhDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
+        pageBean.setRecords(list);
+        return ResponseHelper.buildResponse(pageBean);
+    }
+    
+    
+    
+    
+    
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -8,6 +13,10 @@ import com.yeejoin.amos.boot.module.common.api.dto.DataDictionaryDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDataDictionaryService;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+
+import java.util.Collection;
+import java.util.List;
 
 /**
 * 数据字典 服务实现类
@@ -17,5 +26,49 @@ import com.yeejoin.amos.boot.module.common.api.service.IDataDictionaryService;
 */
 @Service
 public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto,DataDictionary,DataDictionaryMapper> implements IDataDictionaryService {
+    @Autowired
+    RedisUtils redisUtils;
+
+    @Value("${redis.cache.failure.time}")
+    private long time;
+
+
+    @Override
+    public Object getFireChemical(String type) throws Exception {
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", type);
+        queryWrapper.orderByAsc("sort_num");
+
+        if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+            Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+            return obj;
+        } else {
+            Collection<DataDictionary> list = this.list(queryWrapper);
+            List<MenuFrom> menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0,
+                    "getName", "getParent", null);
+            MenuFrom Me = new MenuFrom("-1", "-1", "-1", "危化品库", "危化品库", "危化品库", "-1", null);
+            Me.setIsLeaf(false);
+            Me.setChildren(menus);
+            redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(Me), time);
+            return Me;
+        }
+    }
+
+    @Override
+    public Object gwmcDataDictionary(String type) throws Exception{
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", type);
+        queryWrapper.orderByAsc("sort_num");
 
+        if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+            Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+            return obj;
+        } else {
+            Collection<DataDictionary> list = this.list(queryWrapper);
+            List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
+                    , "getParent", null);
+            redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
+            return menus;
+        }
+    }
 }

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

@@ -28,6 +28,7 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
         /**
          * 分页查询
          */
+        @Override
         public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page,   @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode,boolean isDelete)   {
            return this.queryForPage(page, "", false,casNo, formula, name,  typeCode, isDelete);
         }

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

@@ -25,6 +25,7 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExpe
     /**
      * 分页查询
      */
+    @Override
     public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String name,

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

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,7 +41,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     FirefightersContactsServiceImpl firefightersContactsService;
 
     @Override
-    public List<Firefighters> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {
+    public List<FirefightersZhDto> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {
         return firefightersMapper.getFirefighters(pageNum, pageSize, par);
     }
 

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

@@ -56,6 +56,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
     /**
      * 分页查询
      */
+    @Override
     public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String unitName,

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
@@ -262,18 +263,18 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getFirefighters", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
-    public ResponseModel<Page<Firefighters>> getFirefighters(Integer pageNum, Integer pageSize,
+    public ResponseModel<Page<FirefightersZhDto>> getFirefighters(Integer pageNum, Integer pageSize,
                                                              FirefightersDto firefighters) {
         //条件分页
         if (null == pageNum || null == pageSize) {
             pageNum = 1;
             pageSize = Integer.MAX_VALUE;
         }
-        List<Firefighters> list = iFirefightersService.getFirefighters((pageNum - 1) * pageSize, pageSize,
+        List<FirefightersZhDto> list = iFirefightersService.getFirefighters((pageNum - 1) * pageSize, pageSize,
                 firefighters);
         Map<String, Long> num = iFirefightersService.getFirefightersCount((pageNum - 1) * pageSize, pageSize,
                 firefighters);
-        Page<Firefighters> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
+        Page<FirefightersZhDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
         pageBean.setRecords(list);
         return ResponseHelper.buildResponse(pageBean);
     }

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireTeamListDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
@@ -152,7 +153,7 @@ public class DataSourcesImpl implements DataSources {
     }
 
     private String[] getFirefighters() {
-        List<Firefighters> firefighters = firefightersService.getFirefighters(1, Integer.MAX_VALUE,
+        List<FirefightersZhDto> firefighters = firefightersService.getFirefighters(1, Integer.MAX_VALUE,
                 new FirefightersDto());
         List<String> names = firefighters.stream().map(item -> {
             return item.getName() + "@" + item.getSequenceNbr();