xujun

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

@@ -45,10 +45,10 @@ public class ComTalentMembers extends BaseEntity {
     @Length(max=200, message = "专业特长不能大于200")
     private String spec;
     
-    /** 职务 */
-    @ApiModelProperty(value = "职务", position = 6)
-    @Length(max=50, message = "职务不能大于50")
-    private String duty;
+    /** 职称 */
+    @ApiModelProperty(value = "职称", position = 6)
+    @Length(max=50, message = "职称不能大于50")
+    private String title;
     
     /** 工作单位 */
     @ApiModelProperty(value = "工作单位", position = 7)

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

@@ -40,10 +40,10 @@ public class ComTalentMembersDTO extends BaseDTO {
     private String specName;
     
     @ApiModelProperty(value = "职务")
-    private String duty;
+    private String title;
 
     @ApiModelProperty(value = "职务名称")
-    private String dutyName;
+    private String titleName;
     
     @ApiModelProperty(value = "工作单位")
     private String workUnit;

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

@@ -37,7 +37,7 @@ public class ComTalentMembersQueryVO extends PaginationVO {
     private String spec;
 
     @ApiModelProperty(value = "职务")
-    private String duty;
+    private String title;
 
     @ApiModelProperty(value = "工作单位")
     private String workUnit;

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

@@ -206,7 +206,7 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
             case 2://申报人科研成绩
                 id = talentSaveStep2(dto);
                 break;
-            case 3://科学研究规划及团队人员名单
+            case 3://团队人员名单
                 id = talentSaveStep3(dto);
                 break;
             case 4://经费预算及培养计划和目标
@@ -273,8 +273,6 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
 
     @Transactional
     public String talentSaveStep3(ComTalentApplyDTO dto) {
-        ComTalentApply comTalentApply = convert2Entity(dto);
-        this.update(comTalentApply);
 
         List<ComTalentMembersDTO> MemberList = dto.getMembersList();
 

science-admin/src/main/resources/mapper/ComTalentMembersDAO.xml

@@ -48,7 +48,7 @@
     <select id="getListByTalentId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComTalentMembersDTO">
         SELECT a.*,d.name duty_name,f.name spec_name
         FROM com_talent_members a
-            left join system_parameter d on a.duty = d.id and d.type_id = 62
+            left join system_parameter d on a.title = d.id and d.type_id = 7
             left join system_parameter f on a.spec = f.id and f.type_id = 68
         where talent_id=#{talentId}
         order by a.show_index asc