Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

@@ -118,4 +118,7 @@ public class FirefightersZhDto extends BaseDto {
     
     @ApiModelProperty(value = "消防专家领域字典code")
     private String areasExpertiseCode;
+
+    @ApiModelProperty(value = "单位人员id")
+    private String orgUsrId;
 }

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

@@ -85,6 +85,9 @@ public class OrgUsrDto extends BaseDto {
     @ApiModelProperty(value = "省市区名称,用逗号分隔")
     private String pczName;
 
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String parentName;
+
     @ApiModelProperty(value = "唯一编号")
     private String code;
 

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author DELL
+ */
+@Data
+@ApiModel(value="PeopleInfoDto", description="人员基本信息")
+public class PeopleBasicInfoDto {
+    @ApiModelProperty(value = "系统账号")
+    private String systemAccount;
+
+    @ApiModelProperty(value = "员工编码")
+    private String personNumber;
+
+    @ApiModelProperty(value = "所属机构")
+    private String company;
+
+    @ApiModelProperty(value = "机构code")
+    private String companyCode;
+
+    @ApiModelProperty(value = "是否进行安全培训")
+    private String safetyTraining;
+
+    @ApiModelProperty(value = "人员照片")
+    private String personImg;
+
+    @ApiModelProperty(value = "重点工种资质证书")
+    private String certificateImg;
+
+    @ApiModelProperty(value = "队伍id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "消防队伍名称")
+    private String  fireTeamName;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "常用证件类型代码")
+    private String certificatesType;
+
+    @ApiModelProperty(value = "常用证件类型代码code")
+    private String certificatesTypeCode;
+
+
+    @ApiModelProperty(value = "证件号码")
+    private String certificatesNumber;
+
+    @ApiModelProperty(value = "出生日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    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 telephone;
+
+    @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 nativePlaceValue;
+
+    // BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段  2. 地区选择联动  只有新增时带联动  编辑时不带联动 3. 导出模板及导入同步修改
+    @ApiModelProperty(value = "户籍所在地详细地址")
+    private String nativePlaceVal;
+
+    @ApiModelProperty(value = "现居住地详细地址")
+    private String residenceDetailVal;
+
+    @ApiModelProperty(value = "amos账户名称")
+    private String amosName;
+
+    @ApiModelProperty(value = "amos账户id")
+    private String amosUserId;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "人员类型")
+    private String peopleType;
+
+    @ApiModelProperty(value = "主键")
+    private String sequenceNbr;
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "单位人员id")
+    private String orgUsrId;
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author DELL
+ */
+@Data
+@ApiModel(value="PeopleInfoDto", description="人员")
+public class PeopleInfoDto {
+    @ApiModelProperty(value = "基本信息")
+    private PeopleBasicInfoDto firefighters;
+
+    @ApiModelProperty(value = "联系人信息")
+    private FirefightersContacts firefightersContacts;
+
+    @ApiModelProperty(value = "岗位页签")
+    private FirefightersDataDto postEduDtoObj;
+
+    public PeopleInfoDto(PeopleBasicInfoDto peopleBasicInfoDto, FirefightersContacts firefightersContacts, FirefightersDataDto postEduDtoObj) {
+        super();
+        this.firefighters = peopleBasicInfoDto;
+        this.firefightersContacts = firefightersContacts;
+        this.postEduDtoObj = postEduDtoObj;
+    }
+}

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

@@ -144,4 +144,13 @@ public class Firefighters extends BaseEntity {
 
     @ApiModelProperty(value = "机构编码")
     private String bizOrgCode;
+
+    @ApiModelProperty(value = "人员类型")
+    private String peopleType;
+
+    @ApiModelProperty(value = "是否进行安全培训")
+    private String safetyTraining;
+
+    @ApiModelProperty(value = "单位人员id")
+    private String orgUsrId;
 }

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

@@ -43,4 +43,7 @@ public class FirefightersContacts extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
+
+    @ApiModelProperty(value = "单位人员id")
+    private String orgUsrId;
 }

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

@@ -52,4 +52,7 @@ public class FirefightersEducation extends BaseEntity {
 
     @ApiModelProperty(value = "学历资质文件")
     private String qualifications;
+
+    @ApiModelProperty(value = "单位人员id")
+    private String orgUsrId;
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -86,4 +87,48 @@ public class FirefightersPost extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+    @ApiModelProperty(value = "岗位数据字典code")
+    private String jobTitleCode;
+
+    @ApiModelProperty(value = "消防队伍名称")
+    private String fireTeamName;
+
+    @ApiModelProperty(value = "消防队伍code")
+    private String fireTeamId;
+
+    @ApiModelProperty(value = "消防管理组织机构内部职务")
+    private String internalPosition;
+
+    @ApiModelProperty(value = "消防管理组织机构内部职务-code")
+    private String internalPositionCode;
+
+    @ApiModelProperty(value = "消防管理岗位")
+    private String fireManagementPost;
+
+    @ApiModelProperty(value = "消防管理岗位-code")
+    private String fireManagementPostCode;
+
+    @ApiModelProperty(value = "持证类别")
+    private String certificateType;
+
+    @ApiModelProperty(value = "持证类别-code")
+    private String certificateTypeCode;
+
+    @ApiModelProperty(value = "持证时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date holdingTime;
+
+    @ApiModelProperty(value = "审核周期")
+    private String auditCycle;
+
+    @ApiModelProperty(value = "单位人员id")
+    private String orgUsrId;
+
+    @ApiModelProperty(value = "重点工种资质证书")
+    private String certificateImg;
+
 }

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

@@ -48,4 +48,7 @@ public class FirefightersWorkexperience extends BaseEntity {
 	@ApiModelProperty(value = "更新时间")
 	@TableField(fill = FieldFill.UPDATE)
 	private Date updateTime;
+
+	@ApiModelProperty(value = "单位人员id")
+	private String orgUsrId;
 }

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

@@ -77,6 +77,9 @@ public class OrgUsr extends BaseEntity {
     @ApiModelProperty(value = "省市区名称,用逗号分隔")
     private String pczName;
 
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String parentName;
+
     @ApiModelProperty(value = "唯一编号")
     private String code;
 

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

@@ -7,6 +7,7 @@ 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.dto.FirefightersZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.PeopleInfoDto;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 
 
@@ -31,4 +32,9 @@ public interface IFirefightersService {
 
     Firefighters selectByAmosOrgId(Long id);
 
+    PeopleInfoDto updatePeopleById(PeopleInfoDto peopleInfoDto, Long id);
+
+    Firefighters getFirefightersByUserId(String sequenceNbr);
+
+    void saveFirefightersByUser(PeopleInfoDto firefighters);
 }

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

@@ -323,5 +323,38 @@ public interface IOrgUsrService {
     List<OrgMenuDto> companyTreeByUserNumber(ReginParams reginParams);
 
     List<OrgMenuDto> companyTreeByUser(ReginParams reginParams);
+    /**
+     * 人员新增同步新增消防人员
+     * @param peopleInfoDto 基本信息
+     * @return PeopleInfoDto
+     */
+    PeopleInfoDto peopleSave(PeopleInfoDto peopleInfoDto);
+
+    /**
+     * 获取人员详情
+     * @param id 人员id
+     * @return 人员
+     */
+    PeopleInfoDto selectPeopleById(Long id);
+
+    /**
+     * 根据id，type删除
+     * @param id 主键
+     * @param type 类型
+     */
+    String deletePeopleById(Long id, String type, AgencyUserModel user);
 
+    /**
+     * 查询身份证号码是否重复
+     * @param certificatesNumber 身份证号码
+     * @return 标识
+     */
+    boolean checkCertificatesNumber(String certificatesNumber);
+
+    /**
+     * 根据id删除消防人员
+     * @param id
+     * @return
+     */
+    String deleteFirefighterPeopleById(Long id);
 }

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

@@ -120,7 +120,8 @@
             max(case v.field_code when 'holdingTime' then IFNULL(v.field_value_label,v.field_value) end) holdingTime,
             max(case v.field_code when 'auditCycle' then IFNULL(v.field_value_label,v.field_value) end) auditCycle,
             max(case v.field_code when 'personImg' then IFNULL(v.field_value_label,v.field_value) end) personImg,
-            max(case v.field_code when 'certificateImg' then IFNULL(v.field_value_label,v.field_value) end) certificateImg
+            max(case v.field_code when 'certificateImg' then IFNULL(v.field_value_label,v.field_value) end) certificateImg,
+            max(case v.field_code when 'peopleType' then IFNULL(v.field_value_label,v.field_value) end) peopleType
             FROM
             `cb_dynamic_form_instance` v
             WHERE

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

@@ -9,16 +9,28 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 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.core.framework.PersonIdentify;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.CompanyInfo;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireCompanyInfoServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -36,11 +49,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
@@ -66,6 +74,9 @@ public class OrgPersonController extends BaseController {
     @Value("${auth-key-org-user:org_user_info}")
     private String authKey;
 
+    @Autowired
+    FireCompanyInfoServiceImpl fireCompanyInfoServiceImpl;
+
     /**
      * 新增人员信息
      *
@@ -317,4 +328,69 @@ public class OrgPersonController extends BaseController {
     public ResponseModel<JSONObject> selectByUserId(HttpServletRequest request, @PathVariable Long userId) throws Exception {
         return ResponseHelper.buildResponse(iOrgUsrService.selectPersonByUserId(userId));
     }
+
+    /**
+     * 新增人员
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/peopleSave", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增人员", notes = "新增人员默认创建消防人员")
+    public ResponseModel<PeopleInfoDto> peopleSave(@RequestBody PeopleInfoDto peopleInfoDto) {
+        return ResponseHelper.buildResponse( iOrgUsrService.peopleSave(peopleInfoDto));
+    }
+
+    /**
+     * 根据id查询人员
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/people/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
+    public ResponseModel<PeopleInfoDto> selectPeopleById(@PathVariable Long id) {
+
+        PeopleInfoDto peopleInfoDto =iOrgUsrService.selectPeopleById(id);
+        return ResponseHelper.buildResponse(peopleInfoDto);
+    }
+
+    /**
+     * 根据id删除
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/people/{id}/{type}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public ResponseModel<String> deletePeopleById(@PathVariable Long id, @PathVariable String type) {
+        AgencyUserModel user = getUserInfo();
+        return ResponseHelper.buildResponse(iOrgUsrService.deletePeopleById(id, type, user));
+    }
+
+    /**
+     * 查询身份证号码是否重复
+     * @param certificatesNumber
+     * @return 标志
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/people/checkCertificates/{certificatesNumber}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "查询身份证号码是否重复", notes = "查询身份证号码是否重复")
+    public ResponseModel<Boolean> checkCertificatesNumber(@PathVariable String certificatesNumber) {
+        return ResponseHelper.buildResponse(iOrgUsrService.checkCertificatesNumber(certificatesNumber));
+    }
+
+    /**
+     * 根据id删除
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/people/firefighter/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public ResponseModel<String> deleteFirefighterPeopleById(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(iOrgUsrService.deleteFirefighterPeopleById(id));
+    }
 }

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

@@ -5,9 +5,18 @@ import java.util.List;
 import java.util.Map;
 
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -18,10 +27,6 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
-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.Firefighters;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersMapper;
@@ -29,6 +34,7 @@ import com.yeejoin.amos.boot.module.common.api.service.IFirefightersService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 /**
  * 消防队员 服务实现类
@@ -48,6 +54,11 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	FirefightersContactsServiceImpl firefightersContactsService;
 	@Autowired
 	DataDictionaryMapper dataDictionaryMapper;
+	@Autowired
+	OrgUsrServiceImpl orgUsrService;
+	@Autowired
+	FirefightersContactsServiceImpl ifirefightersContactsService;
+
 	@Override
 	public List<FirefightersZhDto> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {
 		return firefightersMapper.getFirefighters(pageNum, pageSize, par);
@@ -70,21 +81,25 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		Firefighters firefighter = firefighters.getFirefighters();
 		// 现居住地保存地址信息 户籍所在地信息 BUG3553 bykongfm
 		// BUG2168 居住地户籍所在地为空判断 bykongfm
-		if (firefighter.getResidenceDetails() != null) {
+		if (ObjectUtils.isNotEmpty(firefighter.getResidenceDetails())) {
 			FeignClientResult<RegionModel> region = Systemctl.regionClient
 					.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
 			firefighter.setResidence(region.getResult().getRegionName());
 		}
-		if (firefighter.getNativePlace() != null) {
+		if (ObjectUtils.isNotEmpty(firefighter.getNativePlace())) {
 			FeignClientResult<RegionModel> nativePlace = Systemctl.regionClient
 					.getRegion(Long.parseLong(firefighter.getNativePlace()));
 			firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
 		}
 		save(firefighter);
-		if(firefighters.getFirefightersContacts() != null){
+		if(ObjectUtils.isNotEmpty(firefighters.getFirefightersContacts())){
 			FirefightersContacts firefightersContact = firefighters.getFirefightersContacts();
 			firefightersContact.setFirefightersId(firefighter.getSequenceNbr());
-			firefightersContactsService.save(firefightersContact);
+			if (ObjectUtils.isNotEmpty(firefightersContact.getSequenceNbr())) {
+				firefightersContactsService.updateById(firefightersContact);
+			} else {
+				firefightersContactsService.save(firefightersContact);
+			}
 			firefighters.setFirefightersContacts(firefightersContact);
 		}
 		firefighters.setFirefighters(firefighter);
@@ -99,8 +114,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		return firefighters;
 	}
 
-
-	/**
+    /**
 	 * 导出列表
 	 */
 	public List<FirefightersExcelDto> exportToExcel(@Condition(Operator.eq) Boolean isDelete, Map par) {
@@ -186,5 +200,48 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	public Object getAllFirefightersPerson(String jobId) {
 		return firefightersMapper.selectNormalFirePerson(jobId);
 	}
-	
+
+
+
+	@Override
+    @Transactional(rollbackFor = Exception.class)
+	public PeopleInfoDto updatePeopleById(PeopleInfoDto peopleInfoDto, Long id) {
+		// 1.动态表单
+		AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(peopleInfoDto.getFirefighters().getAmosUserId()).getResult();
+		peopleInfoDto.getFirefighters().setAmosName(amosUser.getRealName());
+		OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
+		OrgPersonDto orgPersonDto = new OrgPersonDto();
+		BeanUtils.copyProperties(orgUsr, orgPersonDto);
+		List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto.getFirefighters());
+		orgPersonDto.setDynamicFormValue(dynamicFormInstances);
+		try {
+			orgUsrService.updateByIdOrgPerson(orgPersonDto, id);
+		} catch (Exception e) {
+			log.error("动态表单更新出错");
+		}
+
+		// 2.更新岗位
+		orgUsrService.saveFirefightersPost(peopleInfoDto.getPostEduDtoObj());
+
+		// 3.消防人员更新消防表
+		if ("1".equals(peopleInfoDto.getFirefighters().getPeopleType())){
+			// 更新紧急联系人
+			ifirefightersContactsService.updateById(peopleInfoDto.getFirefightersContacts());
+		}
+		return peopleInfoDto;
+	}
+
+	@Override
+	public Firefighters getFirefightersByUserId(String sequenceNbr) {
+		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
+		wrapper.eq(Firefighters::getOrgUsrId, sequenceNbr);
+		wrapper.eq(Firefighters::getIsDelete, false);
+		return this.baseMapper.selectOne(wrapper);
+	}
+
+	@Override
+	public void saveFirefightersByUser(PeopleInfoDto firefighters) {
+		orgUsrService.saveFirefighters(firefighters);
+	}
+
 }

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

@@ -9,15 +9,18 @@ import javax.servlet.http.HttpServletRequest;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
 import com.yeejoin.amos.boot.module.jcs.api.service.IUserCarService;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,9 +45,6 @@ import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 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.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
@@ -419,4 +419,73 @@ public class FirefightersController extends BaseController {
     public ResponseModel<Object> getAllFirefightersPerson(String jobCode)throws Exception {
         return ResponseHelper.buildResponse(iFirefightersService.getAllFirefightersPerson(jobCode));
     }
+
+    /**
+     * 根据id查询人员
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/people/{id}", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "获取人员详情", notes = "获取人员详情")
+    public ResponseModel<PeopleInfoDto> updatePeopleById(@RequestBody PeopleInfoDto firefighters, @PathVariable Long id) {
+        try {
+            if ("2".equals(firefighters.getFirefighters().getPeopleType())){
+                PeopleBasicInfoDto peopleBasicInfoDto = firefighters.getFirefighters();
+                Firefighters firefighter = new Firefighters();
+                BeanUtils.copyProperties(peopleBasicInfoDto, firefighter);
+                Firefighters fire = iFirefightersService.getFirefightersByUserId(peopleBasicInfoDto.getSequenceNbr());
+                if (!ObjectUtils.isEmpty(fire)) {
+                    //判断此消防人员所属队伍是否变换，
+                    //获取用户已绑定车辆id、
+                    UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(firefighters.getFirefighters().getAmosUserId()));
+                    if(userCar!=null&&!userCar.getTeamId().equals(firefighters.getFirefighters().getFireTeamId()+"")){
+                        userCarService.delete(userCar);
+                    }
+                    firefighter.setSequenceNbr(fire.getSequenceNbr());
+                    firefighter.setOrgUsrId(peopleBasicInfoDto.getSequenceNbr());
+                    firefighter.setEmployeeNumber(peopleBasicInfoDto.getPersonNumber());
+                    firefighter.setMobilePhone(peopleBasicInfoDto.getTelephone());
+                    firefighter.setCertificateNumber(peopleBasicInfoDto.getCertificatesNumber());
+                    // BUG2168 居住地户籍所在地为空判断 bykongfm
+                    if (!ObjectUtils.isEmpty(firefighter.getResidenceDetails())) {
+                        FeignClientResult<RegionModel> region = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
+                        firefighter.setResidence(region.getResult().getRegionName());
+                    }
+                    /*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao start 2021-10-19*/
+                    if (!ObjectUtils.isEmpty(firefighter.getJobTitleCode())) {
+                        DataDictionary gwmc = dataDictionaryService.getByCode(firefighter.getJobTitleCode(), "GWMC");
+                        firefighter.setJobTitle(gwmc.getName());
+                    }
+                    /*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao end 2021-10-19*/
+                    if (!ObjectUtils.isEmpty(firefighter.getNativePlace())) {
+                        FeignClientResult<RegionModel> nativePlace = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
+                        firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+                    }
+                    if (ObjectUtils.isEmpty(firefighter.getCompany())) {
+                        firefighter.setCompany(fire.getCompany());
+                        firefighter.setCompanyCode(fire.getCompanyCode());
+                        firefighter.setCompanyName(fire.getCompanyName());
+                    }
+                    if (ObjectUtils.isEmpty(firefighter.getBizOrgCode())) {
+                        firefighter.setBizOrgCode(fire.getBizOrgCode());
+                        firefighter.setBizOrgName(fire.getBizOrgName());
+                    }
+                    iFirefightersService.updateById(firefighter);
+                    ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
+                    // 删除缓存
+                    redisUtils.del(RedisKey.FIREFIGHTERS_ID + firefighter.getSequenceNbr(),
+                            RedisKey.FIREFIGHTERS_LIST_ID + firefighter.getSequenceNbr());
+                } else {
+                    // 修改时改为消防人员
+                    firefighters.getFirefighters().setOrgUsrId(firefighters.getFirefighters().getSequenceNbr());
+                    iFirefightersService.saveFirefightersByUser(firefighters);
+                }
+            }
+            return ResponseHelper.buildResponse(iFirefightersService.updatePeopleById(firefighters, id));
+        } catch (Exception e) {
+            throw new RuntimeException("系统异常");
+        }
+    }
 }