1

science-admin/src/main/java/com/yiboshi/science/entity/ComPerson.java

@@ -92,6 +92,10 @@ public class ComPerson extends BaseEntity {
     @ApiModelProperty(value = "专业", position = 11 )
     @Length(max=36, message = "专业不能大于36")
     private String spec;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 11 )
+    @Length(max=36, message = "现从事专业不能大于36")
+    private String profession;
     /** 邮箱 */
     @ApiModelProperty(value = "邮箱", position = 12 )
     @Length(max=100, message = "邮箱不能大于100")

science-admin/src/main/java/com/yiboshi/science/param/dto/ComPersonDTO.java

@@ -74,6 +74,10 @@ public class ComPersonDTO extends BaseDTO {
     /** 专业 */
     @ApiModelProperty(value = "专业", position = 14)
     private String spec;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 11 )
+    @Length(max=36, message = "现从事专业不能大于36")
+    private String profession;
     /** 邮箱 */
     @ApiModelProperty(value = "邮箱", position = 15)
     private String email;
@@ -187,6 +191,9 @@ public class ComPersonDTO extends BaseDTO {
     /** 专业 */
     @ApiModelProperty(value = "专业", position = 40)
     private String specName;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 40)
+    private String professionName;
 
     /** 验证码 */
     @ApiModelProperty(value = "验证码", position = 42)

science-admin/src/main/java/com/yiboshi/science/param/dto/ComTalentApplyDTO.java

@@ -182,6 +182,13 @@ public class ComTalentApplyDTO extends BaseDTO {
     /** 专业名称 */
     @ApiModelProperty(value = "专业名称", position = 14)
     private String specName;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 11 )
+    @Length(max=36, message = "现从事专业不能大于36")
+    private String profession;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 40)
+    private String professionName;
     /** 二级学科名称 */
     @ApiModelProperty(value = "二级学科名称", position = 14)
     private String parentName;

science-admin/src/main/java/com/yiboshi/science/param/query/ComPersonQueryVO.java

@@ -61,6 +61,10 @@ public class ComPersonQueryVO extends PaginationVO {
     /** 专业 */
     @ApiModelProperty(value = "专业", position = 14)
     private String spec;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 11 )
+    @Length(max=36, message = "现从事专业不能大于36")
+    private String profession;
     /** 邮箱 */
     @ApiModelProperty(value = "邮箱", position = 15)
     private String email;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentApplyServiceImpl.java

@@ -231,7 +231,7 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
         dto.setPersonId(comPersonDTO.getId());
         dto.setCertId(comPersonDTO.getCertId());
         dto.setPersonName(comPersonDTO.getPersonName());
-        dto.setSex(comPersonDTO.getSex());
+        dto.setProfession(comPersonDTO.getProfession());
         dto.setNation(comPersonDTO.getNation());
         dto.setBirthday(comPersonDTO.getBirthday());
         dto.setDegree(comPersonDTO.getDegree());
@@ -320,7 +320,7 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
         //dto.setDegreeName(comPersonDTO.getDegreeName());
         dto.setTitle(comPersonDTO.getTitle());
         dto.setDuty(comPersonDTO.getDuty());
-        dto.setSpec(comPersonDTO.getSpec());
+        dto.setProfession(comPersonDTO.getProfession());
         dto.setMobile(comPersonDTO.getMobile());
         dto.setFax(comPersonDTO.getFax());
         dto.setEmail(comPersonDTO.getEmail());

science-admin/src/main/java/com/yiboshi/science/service/impl/SystemParameterServiceImpl.java

@@ -444,12 +444,12 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
 
     public List<SpecDTO> getParameterArray(Integer typeId) {
         List<SpecDTO> list = null;
-        Object obj = redisUtils.get(RedisKey.SpecArrayList);
+        Object obj = redisUtils.get(RedisKey.SpecArrayList+ typeId);
         if (null != obj)
-            list = (List<SpecDTO>) redisUtils.get(RedisKey.SpecArrayList);
+            list = (List<SpecDTO>) redisUtils.get(RedisKey.SpecArrayList+ typeId);
         if (null == list || list.size() == 0) {
             list = systemParameterDAO.getParameterArray(typeId);
-            redisUtils.set(RedisKey.SpecArrayList, list, 7, TimeUnit.DAYS);
+            redisUtils.set(RedisKey.SpecArrayList+ typeId, list, 7, TimeUnit.DAYS);
         }
         return list;
     }