Skip to content

Y
yn-health-science
Commit 2402f974 authored by wangxl's avatar wangxl
Browse files
Options

1

parent 336dbf0e
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 34 deletions
science-admin/src/main/java/com/yiboshi/science/dao/ComTalentAssignDAO.java
View file @ 2402f974
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.AssignCount;
import com.yiboshi.science.entity.ComTalentAssign;
import com.yiboshi.science.param.dto.ComTalentAssignDTO;
import com.yiboshi.science.param.dto.ComTalentGroupDTO;
import com.yiboshi.science.param.query.ComTalentAssignQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -22,4 +25,6 @@ public interface ComTalentAssignDAO extends BaseMapper<ComTalentAssign>, BaseDAO
List<AssignCount> getAssignCount(String expertId);
List<ComTalentGroupDTO> getTalentGroupAssignById(String id, String expertId);
Page<ComTalentAssignDTO> getTalentAssignListByPage(Page<ComTalentAssignQueryVO> page, @Param("ew") Wrapper<ComTalentAssignQueryVO> queryWrapper);
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComTalentAssignDTO.java
View file @ 2402f974
......@@ -15,34 +15,27 @@ import java.util.List;
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "人才专家分配明细表DTO")
public class ComTalentAssignDTO extends BaseDTO {
/** 专家Id */
@ApiModelProperty(value = "专家Id", position = 1)
@Length(max=36, message = "专家Id不能大于36")
private String expertId;
/** 人才Id */
@ApiModelProperty(value = "人才Id", position = 2)
@Length(max=36, message = "人才Id不能大于36")
private String talentId;
/** 分配年度 */
@ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear;
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState;
/** 总分 */
@ApiModelProperty(value = "总分", position = 9)
private BigDecimal totalScore;
/** 备注 */
@ApiModelProperty(value = "备注", position =10)
@Length(max=65535, message = "备注不能大于65535")
private String remark;
/** 证件号 */
@ExcelProperty("证件号")
@ApiModelProperty(value = "证件号", position = 1)
......@@ -54,17 +47,28 @@ public class ComTalentAssignDTO extends BaseDTO {
/** 电话号码 */
@ApiModelProperty(value = "电话号码", position = 10)
private String mobile;
/** 性别 */
@ApiModelProperty(value = "性别", position = 5)
private String sex;
/** 现从事专业 */
@ApiModelProperty(value = "现从事专业", position = 11 )
@Length(max=36, message = "现从事专业不能大于36")
private String profession;
/** 现从事专业 */
@ApiModelProperty(value = "现从事专业", position = 40)
private String professionName;
/** 职称 */
@ApiModelProperty(value = "职称", position = 13)
private String title;
/** 职称名称 */
@ApiModelProperty(value = "职称名称", position = 13)
private String titleName;
/** 评审状态 */
@ApiModelProperty(value = "评审状态", position =10)
private String stateName;
/** 评审专业 */
@ApiModelProperty(value = "评审专业", position = 13)
private List<ComExpertSpecDTO> specList;
/** 评分列表 */
@ApiModelProperty(value = "评分列表", position = 13)
private List<ComEvaluationValueDTO> scoreList;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComTalentAssignController.java
View file @ 2402f974
......@@ -37,6 +37,28 @@ public class ComTalentAssignController extends BaseController<ComTalentAssignSer
return getPaginationResponseDataModel(vo);
}
@ApiOperation(value = "1.02 分页查询", httpMethod = "GET", notes = "1.02 根据参数获取列表")
@GetMapping
@RequestMapping("/getAuditListByPage")
public ResponseDataModel<Pagination<ComTalentAssignDTO>> getAuditListByPage(@Validated ComTalentAssignQueryVO vo, BindingResult bindingResult) {
vo.setExpertId(SecurityUserHolder.getExpertId());
return getPaginationResponseDataModel(vo);
}
@ApiOperation(value = "1.02 分页查询", httpMethod = "GET", notes = "1.02 根据参数获取列表")
@GetMapping
@RequestMapping("/getTalentAssignListByPage")
public ResponseDataModel<Pagination<ComTalentAssignDTO>> getTalentAssignListByPage(@Validated ComTalentAssignQueryVO vo, BindingResult bindingResult) {
Pagination<ComTalentAssignDTO> page = comTalentAssignService.getTalentAssignListByPage(vo);
if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
page.getDataList().forEach((e) -> {
e.setCertId(hideAllIdCardNum(e.getCertId()));
e.setStateName(e.getAuditState().equals(2) ? "已评审" : e.getAuditState().equals(1) ? "未提交" : "未评审");
});
}
return ResponseDataModel.ok(page);
}
private ResponseDataModel<Pagination<ComTalentAssignDTO>> getPaginationResponseDataModel(@Validated ComTalentAssignQueryVO vo) {
Pagination<ComTalentAssignDTO> page = comTalentAssignService.getListByPage(vo);
if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
......@@ -48,13 +70,7 @@ public class ComTalentAssignController extends BaseController<ComTalentAssignSer
return ResponseDataModel.ok(page);
}
@ApiOperation(value = "1.02 分页查询", httpMethod = "GET", notes = "1.02 根据参数获取列表")
@GetMapping
@RequestMapping("/getAuditListByPage")
public ResponseDataModel<Pagination<ComTalentAssignDTO>> getAuditListByPage(@Validated ComTalentAssignQueryVO vo, BindingResult bindingResult) {
vo.setExpertId(SecurityUserHolder.getExpertId());
return getPaginationResponseDataModel(vo);
}
@ApiOperation(value = "1.02", httpMethod = "POST", notes = "项目分配")
@RequestMapping("/assignTalent")
......
science-admin/src/main/java/com/yiboshi/science/service/ComTalentAssignService.java
View file @ 2402f974
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.AssignCount;
import com.yiboshi.science.entity.ComTalentAssign;
import com.yiboshi.science.param.dto.ComTalentAssignDTO;
......@@ -15,6 +16,13 @@ import java.util.Map;
*/
public interface ComTalentAssignService extends BaseService<ComTalentAssignQueryVO, ComTalentAssignDTO, ComTalentAssign> {
/**
* 多表分页查询
*
* @param vo 查询条件
* @return 分页对象
*/
Pagination<ComTalentAssignDTO> getTalentAssignListByPage(ComTalentAssignQueryVO vo);
/**
* 分配项目
*
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentAssignServiceImpl.java
View file @ 2402f974
......@@ -63,9 +63,6 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
if (Objects.nonNull(vo.getAssignYear())) {
criteria.eq("assign_year", vo.getAssignYear());
}
// if (Objects.nonNull(vo.getTotalScore())) {
// criteria.eq("total_score", vo.getTotalScore());
// }
if (Objects.nonNull(vo.getAuditState())) {
criteria.eq("a.audit_state", vo.getAuditState());
}
......@@ -78,21 +75,9 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
if (Objects.nonNull(vo.getSex())) {
criteria.eq("c.sex", vo.getSex());
}
// if (Objects.nonNull(vo.getProjName())) {
// criteria.like("f.proj_name", vo.getProjName());
// }
// if (Objects.nonNull(vo.getSystemType())) {
// criteria.eq("f.system_type", vo.getSystemType());
// }
// if (Objects.nonNull(vo.getProjNo())) {
// criteria.like("f.proj_no", vo.getProjNo());
// }
if (Objects.nonNull(vo.getAppUnitName())) {
criteria.like("i.unit_name", vo.getAppUnitName());
}
// if (Objects.nonNull(vo.getIsShow())) {
// criteria.eq("a.is_show", vo.getIsShow());
// }
}
@Override
......@@ -107,6 +92,19 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
}
@Override
public Pagination<ComTalentAssignDTO> getTalentAssignListByPage(ComTalentAssignQueryVO vo) {
QueryWrapper criteria = new QueryWrapper();
setCriteriaForQuery(vo, criteria);
Page<ComTalentAssignQueryVO> page = new Page<>(vo.getPageIndex(), vo.getPageSize());
List<ComTalentAssignDTO> dtoList = comTalentAssignDAO.getTalentAssignListByPage(page, criteria).getRecords();
dtoList.forEach(e -> {
e.setSpecList(comExpertSpecService.getListByExpertId(e.getExpertId()));
});
return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
}
@Transactional
public String assignTalent(Map<String, Object> map) {
List<String> talents = null;
......
science-admin/src/main/resources/mapper/ComTalentAssignDAO.xml
View file @ 2402f974
......@@ -25,6 +25,18 @@
</where>
ORDER BY f.id,a.created ASC
</select>
<select id="getTalentAssignListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
SELECT a.*, c.cert_id, c.person_name, c.sex, c.mobile, c.duty, c.title, c.profession, i.name as title_name, j.name as professionName
FROM com_talent_assign a
left join com_talent_apply b on a.talent_id=b.id
left join com_person c on a.person_id = b.id
left join system_parameter i on c.title = i.id and i.type_id = 7
left join system_parameter j on c.profession = j.id and j.type_id = 69
<where>
${ew.sqlSegment}
</where>
order by a.report_year, a.talent_type
</select>
<select id="getAssignExpertListByTalentId" 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
,d.name education_name,e.name title_name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment