From 78bae8957c52f320608c3e7567990c2eea0c5d3b Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 16 Mar 2026 10:52:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(task):=20=E6=B7=BB=E5=8A=A0=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=E5=88=B0=E9=A1=B9=E7=9B=AE=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=84=E5=88=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/dto/clientobject/DomainDepartmentCO.java      | 2 +-
 .../domain/dto/clientobject/ProjectTaskScoreInfoCO.java  | 6 ++++++
 .../persistence/dataobject/ProjectTaskScoreInfoDO.java   | 9 +++++++++
 .../main/resources/mapper/ProjectTaskScoreInfoMapper.xml | 3 ++-
 4 files changed, 18 insertions(+), 2 deletions(-)

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
     </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}