1

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

@@ -27,6 +27,10 @@ public class ComEvaluationItemDTO extends BaseDTO {
     /** 内容 */
     @ApiModelProperty(value = "内容", position = 2)
     @Length(max=200, message = "内容不能大于200")
+    private String description;
+    /** 内容 */
+    @ApiModelProperty(value = "内容", position = 2)
+    @Length(max=200, message = "内容不能大于200")
     private String content;
     /** 单项得分 */
     @ApiModelProperty(value = "单项得分", position = 2)

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

@@ -35,6 +35,10 @@ public class ComEvaluationValueDTO extends BaseDTO {
     @ApiModelProperty(value = "总分", position = 3)
     private BigDecimal score;
 
+    /** 内容 */
+    @ApiModelProperty(value = "内容", position = 2)
+    @Length(max=200, message = "内容不能大于200")
+    private String description;
     /** 内容 */
     @ApiModelProperty(value = "内容", position = 2)
     @Length(max=200, message = "内容不能大于200")

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

@@ -161,6 +161,12 @@ public class ComProjectAssignDTO extends BaseDTO {
     /** 用户名 */
     @ApiModelProperty(value = "用户名", position = 13)
     private String username;
+    /** 人才类别 */
+    @ApiModelProperty(value = "人才类别")
+    private String talentCategory;
+    /** 人才类别名称 */
+    @ApiModelProperty(value = "人才类别名称")
+    private String talentCategoryName;
 
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 1 )

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

@@ -46,6 +46,12 @@ public class ComTalentAssignDTO extends BaseDTO {
     @ExcelProperty("人才姓名")
     @ApiModelProperty(value = "姓名", position = 3)
     private String personName;
+    /** 性别 */
+    @ApiModelProperty(value = "性别", position = 5)
+    private String sex;
+    /** 电话号码 */
+    @ApiModelProperty(value = "电话号码", position = 16)
+    private String mobile;
     /** 人才类别Id */
     @ExcelProperty("人才类别Id")
     @ApiModelProperty(value = "人才类别Id", position = 3)

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

@@ -76,6 +76,9 @@ public class ComProjectAuditQueryVO extends PaginationVO{
     /** 项目类别 */
     @ApiModelProperty(value = "项目类别", position = 3)
     private String projClass;
+    /** 专业 */
+    @ApiModelProperty(value = "专业", position = 41)
+    private String profession;
     /** 项目类型  1 科研项目  2重点学科项目 */
     @ApiModelProperty(value = "项目名称", position = 1 )
     private Integer systemType;

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

@@ -11,6 +11,7 @@ import com.yiboshi.science.param.query.ComProjectAssignQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComExpertSpecService;
 import com.yiboshi.science.service.ComProjectAssignService;
+import com.yiboshi.science.service.SystemParameterService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,9 @@ public class ComProjectAssignController extends BaseController<ComProjectAssignS
     @Autowired
     private ComExpertSpecService comExpertSpecService;
 
+    @Autowired
+    private SystemParameterService systemParameterService;
+
     @ApiOperation(value = "1.02 分页查询", httpMethod = "GET", notes = "1.02 根据参数获取列表")
     @GetMapping
     @RequestMapping("/getListByPage")
@@ -53,6 +57,7 @@ public class ComProjectAssignController extends BaseController<ComProjectAssignS
         Pagination<ComProjectAssignDTO> page = comProjectAssignService.getListByPage(vo);
         if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
             page.getDataList().forEach((e) -> {
+                e.setTalentCategoryName(systemParameterService.getParaName(e.getTalentCategory()));
                 e.setCertId(hideAllIdCardNum(e.getCertId()));
                 e.setStateName(e.getAuditState().equals(2) ? "已评审" : e.getAuditState().equals(1) ? "未提交" : "未评审");
             });

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

@@ -14,6 +14,7 @@ import com.yiboshi.science.param.query.ComTalentApplyQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComProjectService;
 import com.yiboshi.science.service.ComTalentApplyService;
+import com.yiboshi.science.service.SystemParameterService;
 import com.yiboshi.science.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,6 +38,9 @@ public class ComTalentApplyController extends BaseController<ComTalentApplyServi
     @Autowired
     private ComProjectService comProjectService;
 
+    @Autowired
+    private SystemParameterService systemParameterService;
+
     @ApiOperation(value = "分页查询", httpMethod = "GET", notes = "根据参数获取列表")
     @GetMapping
     @RequestMapping(value = "/getListByPage")
@@ -51,6 +55,7 @@ public class ComTalentApplyController extends BaseController<ComTalentApplyServi
             page.getDataList().forEach((e) -> {
                 e.setCertId(hideAllIdCardNum(e.getCertId()));
                 e.setMobile(hideAllPhoneNum(e.getMobile()));
+                e.setTalentCategoryName(systemParameterService.getParaName(e.getTalentCategory()));
                 if (null != e.getTalentState()) {
                     e.setTalentStateName(CommonEnum.talentState.getEnum(e.getTalentState()).getDescription());
                     if (e.getTalentState() >= 20 && !e.getTalentState().equals(30)) {

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

@@ -5,7 +5,9 @@ import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
 import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
 import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
 import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
+import org.apache.poi.hpsf.Decimal;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -22,7 +24,7 @@ public interface ComEvaluationValueService extends BaseService<ComEvaluationValu
      * @param list
      * @param assignId
      */
-    void insertListByAssignId(List<ComEvaluationValueDTO> list, String assignId);
+    BigDecimal insertListByAssignId(List<ComEvaluationValueDTO> list, String assignId);
 
     /** 删除对象列表
      *

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

@@ -4,22 +4,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComEvaluationValueDAO;
 import com.yiboshi.science.entity.ComEvaluationValue;
-import com.yiboshi.science.entity.ComProjectEquipment;
 import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
 import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
-import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
+import com.yiboshi.science.param.dto.ComProjectAssignDTO;
 import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
 import com.yiboshi.science.service.ComEvaluationItemService;
 import com.yiboshi.science.service.ComEvaluationValueService;
 import com.yiboshi.science.utils.StringUtil;
 import lombok.AllArgsConstructor;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -94,17 +94,22 @@ public class ComEvaluationValueServiceImpl extends BaseServiceImpl<ComEvaluation
      * @param assignId
      */
     @Override
-    public void insertListByAssignId(List<ComEvaluationValueDTO> list, String assignId) {
+    public BigDecimal insertListByAssignId(List<ComEvaluationValueDTO> list, String assignId) {
+        BigDecimal totalScore = new BigDecimal(0);
         this.deleteListByAssignId(assignId);
         if (null != list) {
-            list.forEach((d) -> {
+            for (ComEvaluationValueDTO d : list) {
                 if (!isObjectNull(d)) {
+                    if (Objects.nonNull(d.getScore())) {
+                        totalScore = totalScore.add(d.getScore());
+                    }
                     d.setAssignId(assignId);
                     ComEvaluationValue e = convert2Entity(d);
                     this.insert(e);
                 }
-            });
+            }
         }
+        return totalScore;
     }
 
     /**

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

@@ -100,8 +100,8 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         if (Objects.nonNull(vo.getAuditPersonName())) {
             criteria.like("cp.person_name", vo.getAuditPersonName());
         }
-        if (Objects.nonNull(vo.getAppPersonName())) {
-            criteria.like("e.person_name", vo.getAppPersonName());
+        if (Objects.nonNull(vo.getProfession())) {
+            criteria.like("e.profession", vo.getProfession());
         }
         if (Objects.nonNull(vo.getCheckYear())) {
             criteria.eq("check_year", vo.getCheckYear());
@@ -596,10 +596,8 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         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());
-            }
+            e.setTalentCategoryName(systemParameterService.getParaName(e.getTalentCategory()));
+            e.setProfessionName(systemParameterService.getParaName(e.getProfession()));
         });
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }

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

@@ -13,6 +13,7 @@ import com.yiboshi.science.param.dto.ComTalentGroupDTO;
 import com.yiboshi.science.param.query.ComTalentAssignQueryVO;
 import com.yiboshi.science.service.*;
 import lombok.AllArgsConstructor;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -168,8 +169,9 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
         if (null == comTalentAssign)
             throw new BusinessException("分配记录不存在或已删除！");
         ComTalentAssign entity = convert2Entity(dto);
+        BigDecimal totalScore=comEvaluationValueService.insertListByAssignId(dto.getScoreList(),dto.getId());
+        entity.setTotalScore(totalScore);
         this.update(entity);
-        comEvaluationValueService.insertListByAssignId(dto.getScoreList(),dto.getId());
         if (Objects.nonNull(dto.getAuditState()) && dto.getAuditState().equals(2)) {
             this.updateAssignState(entity.getTalentId());
         }

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

@@ -344,9 +344,9 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
 
     public List<SelectListItem> getMultiLevelList(Integer typeId) {
         List<SelectListItem> list = new ArrayList<>();
-        Object obj = redisUtils.get(RedisKey.MultiLevelList);
+        Object obj = redisUtils.get(RedisKey.MultiLevelList+typeId);
         if (null != obj)
-            list = (List<SelectListItem>) redisUtils.get(RedisKey.MultiLevelList);
+            list = (List<SelectListItem>) redisUtils.get(RedisKey.MultiLevelList+typeId);
         if (null == list || list.size() == 0) {
             list = new ArrayList<>();
             List<SystemParameter> parentList = this.getListByType(typeId);
@@ -365,7 +365,7 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
                     f.setChildren(ThirdList);
                 });
             });
-            redisUtils.set(RedisKey.MultiLevelList, list, 7, TimeUnit.DAYS);
+            redisUtils.set(RedisKey.MultiLevelList+typeId, list, 7, TimeUnit.DAYS);
         }
         return list;
     }
@@ -382,12 +382,12 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
 
     public List<SpecDTO> getMultiLevelIdList(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;
     }

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

@@ -9,7 +9,7 @@
     <select id="getListByAssignId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComEvaluationValueDTO">
         SELECT b.*,a.item_id,a.assign_id,a.detail,a.count,a.score,
                c.id parentId3,c.content content3,c.remark remark3,
-               b.id parentId2,b.content content2,
+               d.id parentId2,d.content content2,
                e.id parentId1,e.content content1
         FROM com_evaluation_value a
         left join com_evaluation_item b on a.item_id=b.id

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

@@ -94,7 +94,6 @@
             ${ew.sqlSegment}
         </where>
     </select>
-
     <select id="getTalentAuditListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
         a.*,c.id talent_id,c.total_score,c.average_score,c.total_fund totalFunding,c.talent_category,
@@ -108,6 +107,7 @@
         left join com_unit g on substring(d.tree_code, 1, 10) = g.tree_code
         left join system_parameter p on e.profession = p.id
         left join system_parameter p1 on p.parent_id = p1.id
+        left join system_parameter p2 on p1.parent_id = p2.id
         left join com_person cp on a.com_person=cp.id
         <where>
             ${ew.sqlSegment}
@@ -291,12 +291,15 @@
     </select>
     <select id="getUnAssignTalentListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
-        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
+        a.*,c.id talent_id,c.total_score,c.average_score,c.total_fund totalFunding,c.talent_category,
+        e.cert_id, e.person_name, e.sex, e.mobile, e.duty, e.title, e.spec, e.profession,
+        d.unit_name app_unit_name, (case when g.unit_name = d.unit_name then '直属' else REPLACE(g.unit_name,'卫生健康局','') end) as upUnitName
         FROM com_project_audit a
         left join com_talent_apply c on a.audit_object_id = c.id
+        left join com_person e on c.person_id = e.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 com_unit g on substring(d.tree_code, 1, 10) = g.tree_code
+        left join system_parameter p on e.profession = 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>

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

@@ -10,13 +10,12 @@
     </sql>
 
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComTalentApplyDTO">
-        select a.*, b.cert_id, b.person_name, b.sex, b.mobile, b.duty, b.title, b.profession, i.name as title_name, j.name as professionName,l.name as talent_category_name
+        select a.*, b.cert_id, b.person_name, b.sex, b.mobile, b.duty, b.title, b.profession, i.name as title_name, j.name as professionName
         from com_talent_apply a
         left join com_person b on a.person_id = b.id
         left join com_unit d on a.app_unit_id = d.id
         left join system_parameter i on b.title = i.id and i.type_id = 7
         left join system_parameter j on b.profession = j.id and j.type_id = 69
-        left join system_parameter l on a.talent_category = l.id and l.type_id = 21
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -6,11 +6,11 @@
         t.id as id, t.expert_id as expertId, t.talent_id as talentId, t.assign_year as assignYear, t.total_score as gradeScore, t.remark as remark, t.created as created, t.updated as updated
     </sql>
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComTalentAssignDTO">
-        SELECT  a.*,c.person_name as expert_name,c.cert_id as expert_cert_id,c.sex expert_sex,c.title expert_title,c.mobile expert_mobile,
-                e.talent_category,
-                g.unit_name expert_unit_name,
-                f.cert_id, f.person_name, f.sex, f.mobile, f.duty, f.title, f.profession,
-                i.group_name
+        SELECT  a.*,c.person_name as expert_name,c.cert_id as expert_cert_id,c.sex expert_sex,c.title expert_title,c.mobile expert_mobile,d.unit_name appUnitName,
+        e.talent_category,
+        g.unit_name expert_unit_name,
+        f.cert_id, f.person_name, f.sex, f.mobile, f.duty, f.title, f.profession,
+        i.group_name
         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
@@ -18,7 +18,7 @@
         left join com_talent_apply e on a.talent_id=e.id
         left join com_person f on e.app_person_id = f.id
         left join com_unit g on f.unit_id = g.id
-        left join com_talent_group_detail h on h.id = a.talent_id
+        left join com_talent_group_detail h on h.talent_id = a.talent_id
         left join com_talent_group i on h.group_id = i.id
         <where>
             ${ew.sqlSegment}