diff --git a/web-client/src/main/java/com/zcloud/domain/dto/clientobject/DomainDepartmentCO.java b/web-client/src/main/java/com/zcloud/domain/dto/clientobject/DomainDepartmentCO.java index 9bf05ed..fbf9792 100644 --- a/web-client/src/main/java/com/zcloud/domain/dto/clientobject/DomainDepartmentCO.java +++ b/web-client/src/main/java/com/zcloud/domain/dto/clientobject/DomainDepartmentCO.java @@ -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 = "领域部门人员列表") diff --git a/web-client/src/main/java/com/zcloud/domain/dto/clientobject/ProjectTaskScoreInfoCO.java b/web-client/src/main/java/com/zcloud/domain/dto/clientobject/ProjectTaskScoreInfoCO.java index a6089a0..eb213f8 100644 --- a/web-client/src/main/java/com/zcloud/domain/dto/clientobject/ProjectTaskScoreInfoCO.java +++ b/web-client/src/main/java/com/zcloud/domain/dto/clientobject/ProjectTaskScoreInfoCO.java @@ -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; diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/dataobject/ProjectTaskScoreInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/dataobject/ProjectTaskScoreInfoDO.java index abd8b41..b40b939 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/dataobject/ProjectTaskScoreInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/dataobject/ProjectTaskScoreInfoDO.java @@ -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; } diff --git a/web-infrastructure/src/main/resources/mapper/ProjectTaskScoreInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/ProjectTaskScoreInfoMapper.xml index 7c86d16..318e18b 100644 --- a/web-infrastructure/src/main/resources/mapper/ProjectTaskScoreInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ProjectTaskScoreInfoMapper.xml @@ -18,9 +18,10 @@ group by pt.id