feat(task): 添加企业信息到项目任务评分功能
parent
44cb22da0a
commit
78bae8957c
|
|
@ -48,7 +48,7 @@ public class DomainDepartmentCO {
|
|||
private String createName;
|
||||
//创建时间
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
1
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty(value = "领域部门人员列表")
|
||||
|
|
|
|||
|
|
@ -26,6 +26,12 @@ public class ProjectTaskScoreInfoCO implements Serializable {
|
|||
//课题任务主键id
|
||||
@ApiModelProperty(value = "课题任务主键id")
|
||||
private String projectTaskId;
|
||||
//企业id
|
||||
@ApiModelProperty(value = "企业id")
|
||||
private Long corpinfoId;
|
||||
//企业名称
|
||||
@ApiModelProperty(value = "企业名称")
|
||||
private String corpinfoName;
|
||||
//部门主键id
|
||||
@ApiModelProperty(value = "部门主键id")
|
||||
private Long departmentId;
|
||||
|
|
|
|||
|
|
@ -45,6 +45,15 @@ public class ProjectTaskScoreInfoDO extends BaseDO {
|
|||
@ApiModelProperty(value = "评分")
|
||||
private BigDecimal score;
|
||||
|
||||
//企业id
|
||||
@ApiModelProperty(value = "企业id")
|
||||
@TableField(exist = false)
|
||||
private Long corpinfoId;
|
||||
//企业名称
|
||||
@ApiModelProperty(value = "企业名称")
|
||||
@TableField(exist = false)
|
||||
private String corpinfoName;
|
||||
|
||||
public ProjectTaskScoreInfoDO(String projectTaskScoreInfoId) {
|
||||
this.projectTaskScoreInfoId = projectTaskScoreInfoId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,10 @@
|
|||
group by pt.id
|
||||
</select>
|
||||
<select id="getListByTaskId" resultType="com.zcloud.domain.persistence.dataobject.ProjectTaskScoreInfoDO">
|
||||
select ts.*, d.name as departmentName, u.name as userName
|
||||
select ts.*, d.name as departmentName, u.name as userName,c.corp_name as corpinfoName,c.id as corpinfoId
|
||||
from project_task_score_info ts
|
||||
left join department d on ts.department_id = d.id
|
||||
left join corp_info c on d.corpinfo_id = c.id
|
||||
left join user u on ts.user_id = u.id
|
||||
where ts.delete_enum = 'false'
|
||||
and ts.project_task_id=#{projectTaskId}
|
||||
|
|
|
|||
Loading…
Reference in New Issue