xujun

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

@@ -40,6 +40,7 @@ public interface ComProjectAuditDAO extends BaseMapper<ComProjectAudit>, BaseDAO
     List<DataStatisticsDTO> getKnowledgeCount(@Param("ew") Wrapper<ComProject> queryWrapper);
     List<KnowledgeStatisticsDTO> getKnowledgeStatistic(@Param("ew") Wrapper<ComProjectAuditQueryVO> queryWrapper);
     Page<ComProjectAuditDTO> getUnAssignProjectListByPage(Page<ComProjectAuditQueryVO> page, @Param("ew") Wrapper<ComProjectAuditQueryVO> queryWrapper, Integer reportYear);
+    Page<ComProjectAuditDTO> getUnAssignTalentListByPage(Page<ComProjectAuditQueryVO> page, @Param("ew") Wrapper<ComProjectAuditQueryVO> queryWrapper, Integer reportYear);
     List<ComProjectGroupDetailDTO> getProjectGroupKnowledgeId(Integer groupYear);
     List<ComProjectAuditDTO> getAuditProjectList(@Param("ew") Wrapper<ComProject> queryWrapper);
 

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

@@ -24,7 +24,7 @@ public class ComTalentGroup extends BaseEntity {
     @ApiModelProperty(value = "人才分组排序", position = 2)
     private Integer displayOrder;
 
-    @ApiModelProperty(value = "人才分组中的项目数", position = 4)
+    @ApiModelProperty(value = "人才分组中的人才数", position = 4)
     private Integer talentCount;
 
     @ApiModelProperty(value = "人才分组中的专家数", position = 5)

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

@@ -222,6 +222,21 @@ public class ComProjectAuditDTO extends BaseDTO {
     @ApiModelProperty(value = "答辩总得分", position = 4)
     private BigDecimal defenseScore;
 
+    /** 人才申报ID */
+    @ApiModelProperty(value = "人才申报ID", position = 4)
+    private String talentId;
+    /** 人才类别 */
+    @ApiModelProperty(value = "人才类别", position = 4)
+    private String talentCategory;
+    /** 研究类别 */
+    @ApiModelProperty(value = "研究类别", position = 4)
+    private String researchType;
+    /** 研究起始时间 */
+    @ApiModelProperty(value = "研究起始时间", position = 4)
+    private Date researchStart;
+    /** 研究截止时间 */
+    @ApiModelProperty(value = "研究截止时间", position = 4)
+    private Date researchEnd;
 
     /** 评分 */
     @ApiModelProperty(value = "评分", position = 4)

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

@@ -48,10 +48,10 @@ public class ComTalentGroupDTO extends BaseDTO {
     @Length(max=36, message = "专家Id不能大于36")
     private String expertId;
 
-    /** 项目Id */
-    @ApiModelProperty(value = "项目Id", position = 10)
-    @Length(max=36, message = "项目Id不能大于36")
-    private String projId;
+    /** 人才Id */
+    @ApiModelProperty(value = "人才Id", position = 10)
+    @Length(max=36, message = "人才Id不能大于36")
+    private String talentId;
 
     /** 项目分配Id */
     @ApiModelProperty(value = "项目分配Id", position = 11)

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

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
+
 @Data
 @EqualsAndHashCode(callSuper=true)
 @ApiModel(description = "人才分组明细表DTO")
@@ -44,6 +46,14 @@ public class ComTalentGroupDetailDTO extends BaseDTO {
     @ApiModelProperty(value = "证件号", position = 2)
     private String certId;
 
+    /** 出生日期 */
+    @ApiModelProperty(value = "出生日期", position = 2)
+    private Date birthday;
+
+    /** 性别 */
+    @ApiModelProperty(value = "性别", position = 2)
+    private String sex;
+
     /** 申报单位Id */
     @ApiModelProperty(value = "申报单位Id", position = 6)
     private String appUnitId;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAuditController.java

@@ -241,4 +241,15 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
         vo.setAuditMethod(CommonEnum.auditMethod.last.getCode());
         return ResponseDataModel.ok(comProjectAuditService.getUnAssignProjectListByPage(vo));
     }
+
+    @ApiOperation(value = "获取未分配的人才列表", httpMethod = "GET", notes = "获取未分配的人才列表")
+    @GetMapping
+    @RequestMapping("/getUnAssignTalentListByPage")
+    public ResponseDataModel<Pagination<ComProjectAuditDTO>> getUnAssignTalentListByPage(@Validated ComProjectAuditQueryVO vo, BindingResult bindingResult) {
+        vo.setAuditUnitId(SecurityUserHolder.getUnitId());
+        vo.setKnowledgeId(null);
+        vo.setAuditType(6);
+        vo.setAuditMethod(CommonEnum.auditMethod.last.getCode());
+        return ResponseDataModel.ok(comProjectAuditService.getUnAssignTalentListByPage(vo));
+    }
 }

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

@@ -176,6 +176,13 @@ public interface ComProjectAuditService extends BaseService<ComProjectAuditQuery
      */
     Pagination<ComProjectAuditDTO> getUnAssignProjectListByPage(ComProjectAuditQueryVO vo);
 
+    /**
+     * 获取未分配的人才列表
+     * @param vo
+     * @return
+     */
+    Pagination<ComProjectAuditDTO> getUnAssignTalentListByPage(ComProjectAuditQueryVO vo);
+
     /**
      *
      * @param vo

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

@@ -575,6 +575,14 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }
 
+    public Pagination<ComProjectAuditDTO> getUnAssignTalentListByPage(ComProjectAuditQueryVO vo) {
+        QueryWrapper criteria = new QueryWrapper();
+        setCriteriaForQuery(vo, criteria);
+        Page<ComProjectAuditQueryVO> page = new Page<>(vo.getPageIndex(), vo.getPageSize());
+        List<ComProjectAuditDTO> dtoList = comProjectAuditDAO.getUnAssignTalentListByPage(page, criteria, vo.getReportYear()).getRecords();
+        return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
+    }
+
     public List<ComProjectAuditDTO> getAuditProjectList(ComProjectAuditQueryVO vo) {
         QueryWrapper criteria = new QueryWrapper();
         setCriteriaForQuery(vo, criteria);

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

@@ -286,6 +286,21 @@
         </where>
         and c.id not in (select proj_id from com_project_group_detail where group_id in (select id from com_project_group where group_year = #{reportYear}))
     </select>
+    <select id="getUnAssignTalentListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
+        SELECT
+        a.*,c.id talent_id,c.talent_category,c.research_type,c.research_start,c.research_end,e.cert_id,e.person_name app_person_name,p.name as knowledgeName,d.unit_name app_unit_name
+        FROM com_project_audit a
+        left join com_talent_apply c on a.audit_object_id = c.id
+        left join com_unit d on c.app_unit_id = d.id
+        left join com_person e on c.app_person_id = e.id
+        left join system_parameter p on e.spec = p.id
+        left join system_parameter p1 on p.parent_id = p1.id
+        left join system_parameter p2 on p1.parent_id = p2.id
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        and c.id not in (select talent_id from com_talent_group_detail where group_id in (select id from com_talent_group where group_year = #{reportYear}))
+    </select>
     <select id="getProjectGroupKnowledgeId" resultType="com.yiboshi.science.param.dto.ComProjectGroupDetailDTO">
         select distinct knowledge_id from com_project_group_detail where group_id in (select id from com_project_group where group_year = #{reportYear})
     </select>

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

@@ -22,11 +22,11 @@
     </select>
 
     <select id="getTalentDetailListbyPage" resultType="com.yiboshi.science.param.dto.ComTalentGroupDetailDTO">
-        select a.*, b.app_unit_id, f.unit_name as app_unit_name, b.proj_no, b.app_no, b.proj_class, b.proj_name, d.name as knowledge_name, c.cert_id, c.person_name
+        select a.*, b.app_unit_id, f.unit_name as app_unit_name, d.name as specName, c.cert_id, c.person_name, c.birthday, c.sex, c.mobile
         from com_talent_group_detail a
         left join com_talent_apply b on a.talent_id = b.id
         left join com_person c on b.person_id = c.id
-        left join system_parameter d on b.knowledge_id = d.id
+        left join system_parameter d on c.spec = d.id
         left join system_parameter e on d.parent_id = e.id
         left join com_unit f on b.app_unit_id = f.id
         <where>
@@ -35,15 +35,15 @@
     </select>
 
     <select id="getTalentListByGroupIds" resultType="com.yiboshi.science.param.dto.ComTalentGroupDetailDTO">
-        select a.id, a.group_id, a.proj_id, a.remark, a.created, a.updated,
+        select a.id, a.group_id, a.talent_id, a.remark, a.created, a.updated,
         g.unit_name app_unit_name,h.person_name person_name,h.cert_id,
-        b.knowledge_id, b.proj_no, b.proj_name,b.app_unit_id,b.app_person_id, d.name as knowledge_name,
+        h.spec, b.app_unit_id,b.app_person_id, d.name as knowledge_name,
         e.id pkey,e.parent_id ppkey
         from com_talent_group_detail a
         left join com_talent_apply b on a.talent_id = b.id
-        left join com_unit g on b.app_unit_id=g.id
-        left join com_person h on b.person_id=h.id
-        left join system_parameter d on b.knowledge_id = d.id
+        left join com_unit g on b.app_unit_id = g.id
+        left join com_person h on b.person_id = h.id
+        left join system_parameter d on h.spec = d.id
         left join system_parameter e on e.id=d.parent_id
         where a.group_id in
         <foreach collection="groupIds" index="index" item="item" open="(" separator="," close=")">