修改接口

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

@@ -58,4 +58,9 @@ public class FirefightersEducation extends BaseEntity {
     @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
     
+    @ApiModelProperty(value = "学历资质文件")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
+    private String qualifications;
+    
+
 }

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

@@ -78,8 +78,8 @@ public class FirefightersPost extends BaseEntity {
     @ApiModelProperty(value = "消防救援衔级别代码字典code")
     private String levelCode;
 
-    @ApiModelProperty(value = "资质证书字典code")
-    private String qualificationCertificateCode;
+//    @ApiModelProperty(value = "资质证书字典code")
+//    private String qualificationCertificateCode;
 
     @ApiModelProperty(value = "消防专家领域字典code")
     private String areasExpertiseCode;

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

@@ -105,11 +105,7 @@ public class FirefightersContractController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
-    	
-    	@SuppressWarnings("rawtypes")
-		QueryWrapper queryWrapper=new QueryWrapper<>();
-    	queryWrapper.eq("firefightersId", id);
-    	FirefightersContract firefightersContract= iFirefightersContractService.getOne(queryWrapper);
+    	FirefightersContract firefightersContract= iFirefightersContractService.getById(id);
     	 return CommonResponseUtil.success(firefightersContract);  	 
     }
 

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

@@ -78,9 +78,12 @@ public class FirefightersController extends BaseController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防队员", notes = "新增消防队员")
     public ResponseModel saveFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){
-    	iFirefightersService.save(firefighters.getFirefighters());  	    	
-    	ifirefightersContactsService.save(firefighters.getFirefightersContacts());
-    	return CommonResponseUtil.success();    
+        Firefighters firefighter= firefighters.getFirefighters();
+    	iFirefightersService.save(firefighter);
+        FirefightersContacts firefightersContact= firefighters.getFirefightersContacts();
+        firefightersContact.setFirefightersId(firefighter.getSequenceNbr());
+    	ifirefightersContactsService.save(firefightersContact);
+    	return CommonResponseUtil.success(firefighter);
     }
 
     /**

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

@@ -100,11 +100,7 @@ public class FirefightersThoughtController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据消防员id查询", notes = "根据消防员id查询")
     public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
-    	
-    	@SuppressWarnings("rawtypes")
-		QueryWrapper queryWrapper=new QueryWrapper<>();
-    	queryWrapper.eq("firefighters_id", id);
-    	FirefightersThought firefightersThought= iFirefightersThoughtService.getOne(queryWrapper);
+    	FirefightersThought firefightersThought= iFirefightersThoughtService.getById(id);
     	return CommonResponseUtil.success(firefightersThought);  	 
     }