修改代码

.idea/libraries/Maven__com_yeejoin_amos_component_feign_1_1_0_SNAPSHOT.xml

-<component name="libraryTable">
-  <library name="Maven: com.yeejoin:amos-component-feign:1.1.0-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/yeejoin/amos-component-feign/1.1.0-SNAPSHOT/amos-component-feign-1.1.0-20200619.022144-19.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/yeejoin/amos-component-feign/1.1.0-SNAPSHOT/amos-component-feign-1.1.0-20200619.022144-19-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/yeejoin/amos-component-feign/1.1.0-SNAPSHOT/amos-component-feign-1.1.0-20200619.022144-19-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ 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/dto/FirefightersInfoDtos.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.entity.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "FirefightersInfoDtos", description = "消防队员")
+public class FirefightersInfoDtos {
+
+
+    @ApiModelProperty(value = "基本信息")
+    private Firefighters firefighters;
+
+    @ApiModelProperty(value = "联系人信息")
+    private FirefightersContacts firefightersContacts;
+
+    @ApiModelProperty(value = "岗位信息")
+    private FirefightersPost firefightersPost;
+
+    @ApiModelProperty(value = "学历信息")
+    private FirefightersEducation firefightersEducation;
+
+    @ApiModelProperty(value = "工作时间")
+    private FirefightersWorkexperience firefightersWorkexperience;
+
+
+
+    public FirefightersInfoDtos(Firefighters firefighters, FirefightersContacts firefightersContacts,FirefightersPost firefightersPost,FirefightersEducation firefightersEducation,FirefightersWorkexperience firefightersWorkexperience) {
+        super();
+        this.firefighters = firefighters;
+        this.firefightersContacts = firefightersContacts;
+        this.firefightersPost = firefightersPost;
+        this.firefightersEducation = firefightersEducation;
+        this.firefightersWorkexperience = firefightersWorkexperience;
+    }
+
+
+}

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

@@ -3004,7 +3004,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			peopleInfoDto.getFirefighters().setSequenceNbr(orgUsrDto.getSequenceNbr().toString());
 		}
 
-		if (peopleInfoDto.getFirefighters() != null && "2".equals(peopleInfoDto.getFirefighters().getPeopleType())) {
+		if (peopleInfoDto.getFirefighters() != null && "1601".equals(peopleInfoDto.getFirefighters().getPeopleType())) {
 			// 3.同步保存cb_firefighters消防人员基础信息
 			saveFirefighters(peopleInfoDto);
 		} else {
@@ -3252,8 +3252,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		QueryWrapper queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_usr_id", String.valueOf(id));
 		FirefightersDataDto firefightersDataDto = new FirefightersDataDto(
-				ifirefightersWorkexperienceService.getOne(queryWrapper),
-				ifirefightersEducationService.getOne(queryWrapper), iFirefightersPostService.getOne(queryWrapper));
+			ifirefightersWorkexperienceService.getOne(queryWrapper) == null? new FirefightersWorkexperience():ifirefightersWorkexperienceService.getOne(queryWrapper),
+			ifirefightersEducationService.getOne(queryWrapper) == null?new FirefightersEducation():ifirefightersEducationService.getOne(queryWrapper),
+			iFirefightersPostService.getOne(queryWrapper) ==null?new FirefightersPost():iFirefightersPostService.getOne(queryWrapper) );
 
 		return  new PeopleInfoDto(peopleBasicInfoDto, firefightersContacts, firefightersDataDto);
 	}

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

@@ -5,6 +5,9 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.*;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.*;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,29 +44,7 @@ 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.core.framework.PersonIdentify;
-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.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.PeopleBasicInfoDto;
-import com.yeejoin.amos.boot.module.common.api.dto.PeopleInfoDto;
-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;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContactsServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContractServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersEducationServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersPostServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersThoughtServiceImpl;
-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.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
@@ -92,6 +73,12 @@ public class FirefightersController extends BaseController {
     @Autowired
     FirefightersContactsServiceImpl ifirefightersContactsService;
     @Autowired
+    FirefightersPostServiceImpl firefightersPostService;
+    @Autowired
+    FirefightersEducationServiceImpl firefightersEducationService;
+    @Autowired
+    FirefightersWorkexperienceServiceImpl firefightersWorkexperienceService;
+    @Autowired
     FirefightersEducationServiceImpl ifirefightersEducationService;
     @Autowired
     FirefightersThoughtServiceImpl iFirefightersThoughtService;
@@ -285,13 +272,29 @@ public class FirefightersController extends BaseController {
             Object obj = redisUtils.get(RedisKey.FIREFIGHTERS_ID + id);
             return ResponseHelper.buildResponse(obj);
         } else {
+
             Firefighters firefighters = iFirefightersService.getById(id);
             QueryWrapper<FirefightersContacts> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("firefighters_id", id);
             FirefightersContacts firefightersContacts = ifirefightersContactsService.getOne(queryWrapper);
-            FirefightersInfoDto firefightersInfoDto = new FirefightersInfoDto(firefighters, firefightersContacts);
-            redisUtils.set(RedisKey.FIREFIGHTERS_ID + id, JSON.toJSON(firefightersInfoDto), time);
-            return ResponseHelper.buildResponse(firefightersInfoDto);
+
+            QueryWrapper<FirefightersPost> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("firefighters_id", id);
+            FirefightersPost result = firefightersPostService.getOne(queryWrapper1);
+
+            QueryWrapper<FirefightersEducation> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("firefighters_id", id);
+            FirefightersEducation firefightersEducation = firefightersEducationService.getOne(queryWrapper2);
+
+
+            QueryWrapper<FirefightersWorkexperience> queryWrapper3 = new QueryWrapper<>();
+            queryWrapper3.eq("firefighters_id", id);
+            FirefightersWorkexperience firefightersWorkexperience = firefightersWorkexperienceService.getOne(queryWrapper3);
+
+            FirefightersInfoDtos firefightersInfoDtos = new FirefightersInfoDtos(firefighters, firefightersContacts,result,firefightersEducation,firefightersWorkexperience);
+
+            redisUtils.set(RedisKey.FIREFIGHTERS_ID + id, JSON.toJSON(firefightersInfoDtos), time);
+            return ResponseHelper.buildResponse(firefightersInfoDtos);
         }
     }