xujun

science-admin/src/main/java/com/yiboshi/science/dao/ComPersonResumeDAO.java

@@ -13,5 +13,5 @@ import java.util.List;
  */
 public interface ComPersonResumeDAO extends BaseMapper<ComPersonResume>, BaseDAO<ComPersonResumeQueryVO, ComPersonResumeDTO, ComPersonResume> {
 
-    List<ComPersonResumeDTO> getListByTaltentId(String TalentId);
+    List<ComPersonResumeDTO> getListByTalentId(String TalentId);
 }

science-admin/src/main/java/com/yiboshi/science/dao/ComPersonScientificGainDAO.java

@@ -13,5 +13,5 @@ import java.util.List;
  */
 public interface ComPersonScientificGainDAO extends BaseMapper<ComPersonScientificGain>, BaseDAO<ComPersonScientificGainQueryVO, ComPersonScientificGainDTO, ComPersonScientificGain> {
 
-    List<ComPersonScientificGainDTO> getListByTaltentId(String TalentId);
+    List<ComPersonScientificGainDTO> getListByTalentId(String TalentId);
 }

science-admin/src/main/java/com/yiboshi/science/dao/ComTalentBudgetDAO.java

@@ -13,5 +13,5 @@ import java.util.List;
  */
 public interface ComTalentBudgetDAO extends BaseMapper<ComTalentBudget>, BaseDAO<ComTalentBudgetQueryVO, ComTalentBudgetDTO, ComTalentBudget> {
 
-    List<ComTalentBudgetDTO> getListByTaltentId(String talentId);
+    List<ComTalentBudgetDTO> getListByTalentId(String talentId);
 }

science-admin/src/main/java/com/yiboshi/science/dao/ComTalentMembersDAO.java

@@ -14,5 +14,5 @@ import java.util.List;
 
 public interface ComTalentMembersDAO extends BaseMapper<ComTalentMembers>, BaseDAO<ComTalentMembersQueryVO, ComTalentMembersDTO, ComTalentMembers> {
 
-    List<ComTalentMembersDTO> getListByTaltentId(String talentId);
+    List<ComTalentMembersDTO> getListByTalentId(String talentId);
 }

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

@@ -135,6 +135,18 @@ public class ComTalentApplyDTO extends BaseDTO {
     /** 学位 */
     @ApiModelProperty(value = "学位", position = 9)
     private String degree;
+    /** 最高学位授予时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date degreeTime;
+    /** 最高学位授予单位 */
+    @ApiModelProperty(value = "最高学位授予单位", position = 9)
+    private String degreeUnit;
+    /** 是否为研究生导师 */
+    @ApiModelProperty(value = "是否为研究生导师", position = 8)
+    private String graduateTeacher;
+    /** 党派 */
+    @ApiModelProperty(value = "党派", position = 9)
+    private String politicalParty;
 
     /** 民族 */
     @ApiModelProperty(value = "民族", position = 11)

science-admin/src/main/java/com/yiboshi/science/service/ComPersonResumeService.java

@@ -14,5 +14,5 @@ public interface ComPersonResumeService extends BaseService<ComPersonResumeQuery
 
     void insertList(List<ComPersonResumeDTO> list, String PersonId, String TypeId);
 
-    List<ComPersonResumeDTO> getListByTaltentId(String TalentId);
+    List<ComPersonResumeDTO> getListByTalentId(String TalentId);
 }

science-admin/src/main/java/com/yiboshi/science/service/ComPersonScientificGainService.java

@@ -14,5 +14,5 @@ public interface ComPersonScientificGainService extends BaseService<ComPersonSci
 
     void insertList(List<ComPersonScientificGainDTO> list, String TalentId, String TypeId);
 
-    List<ComPersonScientificGainDTO> getListByTaltentId(String TalentId);
+    List<ComPersonScientificGainDTO> getListByTalentId(String TalentId);
 }

science-admin/src/main/java/com/yiboshi/science/service/ComTalentBudgetService.java

@@ -15,7 +15,7 @@ public interface ComTalentBudgetService extends BaseService<ComTalentBudgetQuery
 
     void insertList(List<ComTalentBudgetDTO> list, String TalentId);
 
-    List<ComTalentBudgetDTO> getListByTaltentId(String talentId);
+    List<ComTalentBudgetDTO> getListByTalentId(String talentId);
 
     List<ComTalentBudgetDTO> getList();
 }

science-admin/src/main/java/com/yiboshi/science/service/ComTalentMembersService.java

@@ -14,5 +14,5 @@ public interface ComTalentMembersService extends BaseService<ComTalentMembersQue
 
     void insertList(List<ComTalentMembersDTO> list, String TalentId);
 
-    List<ComTalentMembersDTO> getListByTaltentId(String talentId);
+    List<ComTalentMembersDTO> getListByTalentId(String talentId);
 }

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

@@ -50,7 +50,7 @@ public class ComPersonResumeServiceImpl extends BaseServiceImpl<ComPersonResumeD
         }
     }
 
-    public List<ComPersonResumeDTO> getListByTaltentId(String TalentId) {
-        return comPersonResumeDAO.getListByTaltentId(TalentId);
+    public List<ComPersonResumeDTO> getListByTalentId(String TalentId) {
+        return comPersonResumeDAO.getListByTalentId(TalentId);
     }
 }

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

@@ -50,7 +50,7 @@ public class ComPersonScientificGainServiceImpl extends BaseServiceImpl<ComPerso
         }
     }
 
-    public List<ComPersonScientificGainDTO> getListByTaltentId(String TalentId) {
-        return comPersonScientificGainDAO.getListByTaltentId(TalentId);
+    public List<ComPersonScientificGainDTO> getListByTalentId(String TalentId) {
+        return comPersonScientificGainDAO.getListByTalentId(TalentId);
     }
 }

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

@@ -148,21 +148,26 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
             throw new BusinessException("人才申报记录不存在或已删除！");
 
         // 申报人
-        ComPersonDTO comPersonDTO = comPersonService.getPersonById(dto.getAppPersonId());
+        ComPersonDTO comPersonDTO = comPersonService.getPersonById(dto.getPersonId());
         if (null != comPersonDTO) {
             loadPersonInfo(dto, comPersonDTO);
         }
 
-        List<ComTalentMembersDTO> memList = comTalentMembersService.getListByTaltentId(dto.getId());
+        List<ComTalentMembersDTO> memList = comTalentMembersService.getListByTalentId(dto.getId());
         dto.setMembersList(memList);
 
-        List<ComTalentBudgetDTO> bugetList = comTalentBudgetService.getListByTaltentId(dto.getId());
-        dto.setBudgetList(bugetList);
+        List<ComTalentBudgetDTO> bugetList = comTalentBudgetService.getListByTalentId(dto.getId());
+        if (null != bugetList && bugetList.size() > 0)
+            dto.setBudgetList(bugetList);
+        else {
+            bugetList = comTalentBudgetService.getList();
+            dto.setBudgetList(bugetList);
+        }
 
-        List<ComPersonResumeDTO> resumeList = comPersonResumeService.getListByTaltentId(dto.getId());
+        List<ComPersonResumeDTO> resumeList = comPersonResumeService.getListByTalentId(dto.getId());
         dto.setResumeList(resumeList);
 
-        List<ComPersonScientificGainDTO> scientificList = comPersonScientificGainService.getListByTaltentId(dto.getId());
+        List<ComPersonScientificGainDTO> scientificList = comPersonScientificGainService.getListByTalentId(dto.getId());
         dto.setScientificList(scientificList);
 
         return dto;
@@ -173,12 +178,19 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
         dto.setCertId(comPersonDTO.getCertId());
         dto.setSex(comPersonDTO.getSex());
         dto.setBirthday(comPersonDTO.getBirthday());
+        dto.setNation(comPersonDTO.getNation());
+        dto.setDegree(comPersonDTO.getDegree());
+        dto.setDegreeTime(comPersonDTO.getDegreeTime());
+        dto.setDegreeUnit(comPersonDTO.getDegreeUnit());
+        dto.setGraduateTeacher(comPersonDTO.getGraduateTeacher());
+        dto.setPoliticalParty(comPersonDTO.getPoliticalParty());
         //dto.setNationName(comPersonDTO.getNationName());
         //dto.setDegreeName(comPersonDTO.getDegreeName());
-        dto.setTitleName(comPersonDTO.getTitleName());
-        dto.setDutyName(comPersonDTO.getDuty());
-        dto.setSpecName(comPersonDTO.getSpecName());
+        dto.setTitle(comPersonDTO.getTitle());
+        dto.setDuty(comPersonDTO.getDuty());
+        dto.setSpec(comPersonDTO.getSpec());
         dto.setMobile(comPersonDTO.getMobile());
+        dto.setFax(comPersonDTO.getFax());
         dto.setEmail(comPersonDTO.getEmail());
     }
 

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

@@ -55,8 +55,8 @@ public class ComTalentBudgetServiceImpl extends BaseServiceImpl<ComTalentBudgetD
         }
     }
 
-    public List<ComTalentBudgetDTO> getListByTaltentId(String talentId) {
-        return comTalentBudgetDAO.getListByTaltentId(talentId);
+    public List<ComTalentBudgetDTO> getListByTalentId(String talentId) {
+        return comTalentBudgetDAO.getListByTalentId(talentId);
     }
 
     public List<ComTalentBudgetDTO> getList() {

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

@@ -48,7 +48,7 @@ public class ComTalentMembersServiceImpl extends BaseServiceImpl<ComTalentMember
         }
     }
 
-    public List<ComTalentMembersDTO> getListByTaltentId(String talentId) {
-        return comTalentMembersDAO.getListByTaltentId(talentId);
+    public List<ComTalentMembersDTO> getListByTalentId(String talentId) {
+        return comTalentMembersDAO.getListByTalentId(talentId);
     }
 }

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

@@ -46,9 +46,9 @@
 
     <select id="getListByTalentId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComTalentBudgetDTO">
         SELECT a.*,b.name as budgetName,b.code,b.gb_code type,b.tree_code level,b.system_code
-        FROM com_project_budget a
+        FROM com_talent_budget a
         left join system_parameter b on a.budget_id = b.id and b.type_id = 20
-        where talent_id=#{talentId} order by b.show_index asc
+        where talent_id=#{talentId} order by a.show_index asc
     </select>
 
 </mapper> 
\ No newline at end of file

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

@@ -45,12 +45,12 @@
         ORDER BY create_time DESC
     </select>
 
-    <select id="getListByTaltentId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComTalentMembersDTO">
+    <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 f on a.spec = f.id and f.type_id = 68
-        where talnet_id=#{talnetId}
+        where talent_id=#{talentId}
         order by a.show_index asc
     </select>
 </mapper> 
\ No newline at end of file