xujun

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

@@ -228,15 +228,9 @@ public class ComProjectAuditDTO extends BaseDTO {
     /** 人才类别 */
     @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)
+    private String talentCategoryName;
 
     /** 评分 */
     @ApiModelProperty(value = "评分", position = 4)

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

@@ -44,6 +44,14 @@ public class ComTalentAssignDTO extends BaseDTO {
     @ExcelProperty("姓名")
     @ApiModelProperty(value = "姓名", position = 3)
     private String personName;
+    /** 人才类别Id */
+    @ExcelProperty("人才类别Id")
+    @ApiModelProperty(value = "人才类别Id", position = 3)
+    private String talentCategory;
+    /** 人才类别名称 */
+    @ExcelProperty("人才类别名称")
+    @ApiModelProperty(value = "人才类别名称", position = 3)
+    private String talentCategoryName;
     /** 电话号码 */
     @ApiModelProperty(value = "电话号码", position = 10)
     private String mobile;

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

@@ -24,6 +24,42 @@ public class ComTalentGroupAssignDTO extends BaseDTO {
     @Length(max=36, message = "专家Id不能大于36")
     private String expertId;
 
+    /** 专家姓名 */
+    @ApiModelProperty(value = "专家姓名", position = 13)
+    private String expertName;
+
+    /** 专家证件号 */
+    @ApiModelProperty(value = "专家证件号", position = 13)
+    private String expertCertId;
+
+    /** 专家职称Id */
+    @ApiModelProperty(value = "专家职称Id", position = 13)
+    private String title;
+
+    /** 专家职称名称 */
+    @ApiModelProperty(value = "专家职称名称", position = 13)
+    private String titleName;
+
+    /** 性别 */
+    @ApiModelProperty(value = "性别", position = 13)
+    private String sex;
+
+    /** 工作单位 */
+    @ApiModelProperty(value = "工作单位", position = 13)
+    private String workUnit;
+
+    /** 所属单位 */
+    @ApiModelProperty(value = "所属单位", position = 13)
+    private String unitName;
+
+    /** 邮箱 */
+    @ApiModelProperty(value = "邮箱", position = 13)
+    private String email;
+
+    /** 手机号 */
+    @ApiModelProperty(value = "手机号", position = 13)
+    private String mobile;
+
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 3)
     @Length(max=500, message = "备注不能大于500")

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

@@ -10,6 +10,7 @@ import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComProjectAuditDAO;
 import com.yiboshi.science.entity.ComProjectAuditNote;
 import com.yiboshi.science.entity.ComProjectAudit;
+import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
 import com.yiboshi.science.param.query.ComProjectAuditQueryVO;
@@ -43,6 +44,9 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
     @Autowired
     private ComProjectAuditNoteService comProjectAuditNoteService;
 
+    @Autowired
+    private SystemParameterService systemParameterService;
+
     private final SystemProperties properties;
 
     public ComProjectAuditServiceImpl(SystemProperties properties) {
@@ -580,6 +584,12 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         setCriteriaForQuery(vo, criteria);
         Page<ComProjectAuditQueryVO> page = new Page<>(vo.getPageIndex(), vo.getPageSize());
         List<ComProjectAuditDTO> dtoList = comProjectAuditDAO.getUnAssignTalentListByPage(page, criteria, vo.getReportYear()).getRecords();
+        dtoList.forEach(e -> {
+            if (null != e.getTalentCategory()) {
+                SystemParameter parameter = systemParameterService.getParameterById(e.getTalentCategory());
+                e.setTalentCategoryName(parameter.getName());
+            }
+        });
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }
 

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

@@ -224,14 +224,13 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
             completed = 0;
             assignState = 0;
         } else {
-            int personCount = 0;
+            int personCount = list.size();
             for (ComTalentAssignDTO obj : list) {
                 if (Objects.nonNull(obj.getAuditState()) && obj.getAuditState().equals(2)) {
-                    personCount++;
                     totalScore.add(obj.getTotalScore());
                 }
             }
-            DecimalFormat df1 = new DecimalFormat("0.00");
+
             BigDecimal personCountBD = BigDecimal.valueOf(personCount);
             averageScore = totalScore.divide(personCountBD, 2, RoundingMode.HALF_UP);
             if (list.size() > personCount)

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

@@ -4,15 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComTalentGroupAssignDAO;
 import com.yiboshi.science.entity.ComTalentGroupAssign;
+import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.param.dto.*;
 import com.yiboshi.science.param.query.ComTalentGroupAssignQueryVO;
 import com.yiboshi.science.service.ComExpertSpecService;
 import com.yiboshi.science.service.ComTalentGroupAssignService;
+import com.yiboshi.science.service.SystemParameterService;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 人才分组分配表 Service 实现类
@@ -31,6 +34,9 @@ public class ComTalentGroupAssignServiceImpl extends BaseServiceImpl<ComTalentGr
     @Autowired
     private ComExpertSpecService comExpertSpecService;
 
+    @Autowired
+    private SystemParameterService systemParameterService;
+
     @Override
     protected void setCriteriaForQuery(ComTalentGroupAssignQueryVO vo, QueryWrapper<ComTalentGroupAssignQueryVO> criteria) {
 
@@ -52,8 +58,15 @@ public class ComTalentGroupAssignServiceImpl extends BaseServiceImpl<ComTalentGr
             dto.setSpecList(list);
 
         List<ComTalentAssignDTO> assignList = comTalentGroupAssignDAO.getTalentAssignByGroupIdExpertId(dto.getGroupId(), dto.getExpertId());
-        if (null != assignList && assignList.size() > 0)
+        if (null != assignList && assignList.size() > 0) {
+            assignList.forEach(e -> {
+                if (Objects.nonNull(e.getTalentCategory())) {
+                    SystemParameter parameter = systemParameterService.getParameterById(e.getTalentCategory());
+                    e.setTalentCategoryName(parameter.getName());
+                }
+            });
             dto.setTalentAssignList(assignList);
+        }
 
         return dto;
     }

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

@@ -8,6 +8,7 @@ import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.dao.ComTalentApplyDAO;
 import com.yiboshi.science.dao.ComTalentGroupDAO;
 import com.yiboshi.science.entity.*;
+import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
 import com.yiboshi.science.param.query.ComTalentGroupQueryVO;
 import com.yiboshi.science.service.*;
@@ -248,7 +249,7 @@ public class ComTalentGroupServiceImpl extends BaseServiceImpl<ComTalentGroupDAO
         });
 
         List<ComTalentGroupDetailDTO> TalentInfoList = comTalentGroupDetailService.getTalentListByGroupIds(GroupList);
-        Integer reportYear = comBatchService.getReportYear(systemType, null);
+        Integer reportYear = comBatchService.getReportYear(systemType, CommonEnum.timeType.talentApply.getCode());
         List<String> TalentList = new ArrayList<>();
         TalentInfoList.forEach(p -> {
             TalentList.add(p.getTalentId());
@@ -341,20 +342,20 @@ public class ComTalentGroupServiceImpl extends BaseServiceImpl<ComTalentGroupDAO
         List<ComTalentGroupDetailDTO> talent = comTalentGroupDetailService.getTalentListByGroupIds(groupIds);
         List<String> expanded = new ArrayList<>();
         List<String> specs = new ArrayList<>();
-        talent.forEach(e -> {
-            if (!expanded.contains(e.getPpkey()))
-                expanded.add(e.getPpkey());
-            if (!expanded.contains(e.getPkey()))
-                expanded.add(e.getPkey());
-            if (!specs.contains(e.getKnowledgeId()))
-                specs.add(e.getKnowledgeId());
-        });
-        Map<String, Object> projInfo = new HashMap<String, Object>(4) {
+//        talent.forEach(e -> {
+//            if (!expanded.contains(e.getPpkey()))
+//                expanded.add(e.getPpkey());
+//            if (!expanded.contains(e.getPkey()))
+//                expanded.add(e.getPkey());
+//            if (!specs.contains(e.getKnowledgeId()))
+//                specs.add(e.getKnowledgeId());
+//        });
+        Map<String, Object> talentInfo = new HashMap<String, Object>(4) {
             {
                 put("expanded", expanded);
                 put("spec", specs);
             }
         };
-        return projInfo;
+        return talentInfo;
     }
 }

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

@@ -288,7 +288,7 @@
     </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
+        a.*,c.id talent_id,c.talent_category,e.cert_id,e.person_name app_person_name,p.name as knowledgeName,d.unit_name app_unit_name,e.sex,e.mobile,e.birthday
         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

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

@@ -19,7 +19,7 @@
         left join com_talent_group_detail j on f.id = j.talent_id
         left join com_talent_group k on j.group_id = k.id
         left join com_person l ON f.person_id = l.id
-        left join system_parameter m on l.knowledge_id=m.id and m.type_id=68
+        left join system_parameter m on l.spec = m.id and m.type_id = 68
         <where>
             ${ew.sqlSegment}
         </where>
@@ -53,7 +53,7 @@
         FROM com_talent_assign a
                  LEFT JOIN com_expert b ON a.expert_id = b.id
                  LEFT JOIN com_person c ON b.person_id = c.id
-        where a.talent_id = #{talentId} order by a.expert_type asc,a.total_score desc,c.person_name asc
+        where a.talent_id = #{talentId} order by c.person_name, a.total_score desc,c.person_name asc
     </select>
     <select id="getAssignExpertById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComTalentAssignDTO">
         SELECT a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name

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

@@ -17,14 +17,14 @@
     </select>
 
     <select id="getAssignExpertList" resultType="com.yiboshi.science.param.dto.ComTalentGroupAssignDTO">
-        select a.*, c.person_name, c.cert_id, c.sex, c.work_unit, c.mobile, c.email from com_talent_group_assign a
+        select a.*, c.person_name as expertName, c.cert_id, c.sex, c.work_unit, c.mobile, c.email from com_talent_group_assign a
             LEFT JOIN com_expert b ON a.expert_id = b.id
             LEFT JOIN com_person c ON b.person_id = c.id
         where a.group_id = #{groupId} order by created
     </select>
 
     <select id="getAssignGroupExpertById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComTalentGroupAssignDTO">
-        SELECT a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,
+        SELECT a.*, c.person_name as expertName,c.cert_id as expertCertId,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,
                g.unit_name,d.name education_name,e.name title_name,f.group_name
         FROM com_talent_group_assign a
                  LEFT JOIN com_expert b ON a.expert_id = b.id

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

@@ -12,8 +12,7 @@
     </select>
 
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComTalentGroupDTO">
-        select  a.*
-        from com_talent_group a
+        select  a.* from com_talent_group a
         <where>
             ${ew.sqlSegment}
         </where>