From 2f16afb2488c667c95078670f4d6fd34029f5d9a Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 24 Jul 2025 22:08:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/domain/ProjectNew.java | 17 ++++++- .../screen/domain/ProjectProgressNew.java | 17 ++++++- .../screen/domain/ProjectRisk.java | 23 +++++++++- .../mapper/ProjectProgressNewMapper.xml | 46 ++++++++++--------- 4 files changed, 78 insertions(+), 25 deletions(-) diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java index 7e2f76c..1c161cc 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.securitycontrol.common.core.web.domain.BaseEntity; +import com.securitycontrol.entity.screen.dto.ScreenDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -18,7 +19,7 @@ import lombok.ToString; @Data @ToString -public class ProjectNew extends BaseEntity { +public class ProjectNew extends ScreenDto { private static final long serialVersionUID = 1L; /** 主键 */ @@ -91,4 +92,18 @@ public class ProjectNew extends BaseEntity { private String monthProgress; private String monthProgress2; + + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java index a0eb6e9..1e2065c 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java @@ -3,6 +3,7 @@ package com.securitycontrol.screen.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.securitycontrol.common.core.web.domain.BaseEntity; +import com.securitycontrol.entity.screen.dto.ScreenDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -17,7 +18,7 @@ import lombok.ToString; @Data @ToString -public class ProjectProgressNew extends BaseEntity { +public class ProjectProgressNew extends ScreenDto { private static final long serialVersionUID = 1L; /** 主键id */ @@ -98,4 +99,18 @@ public class ProjectProgressNew extends BaseEntity { private String categoryValue; + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java index 22c7a15..6bd5196 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java @@ -1,11 +1,32 @@ package com.securitycontrol.screen.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.securitycontrol.entity.screen.dto.ScreenDto; import lombok.Data; +import java.util.Date; + @Data -public class ProjectRisk { +public class ProjectRisk extends ScreenDto { private String id; + private String proId; + private String proPart; + private String riskDesc; + + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml index fed4a9f..23dbf1f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml @@ -29,38 +29,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, project_id, project_name, task_code, task_name, plan_start_time, - plan_end_time, actual_start_time, actual_end_time, process_diff, total_effort, - complete_effort, delay_actor, resource_match_status, key_path_flag, - create_by, create_time, update_by, update_time, delay_status, delay_policy, analyze_result - from tb_project_progress_new + select tpn.id, tpn.project_id, tpn.project_name, tpn.task_code, tpn.task_name, tpn.plan_start_time, + tpn.plan_end_time, tpn.actual_start_time, tpn.actual_end_time, tpn.process_diff, tpn.total_effort, + tpn.complete_effort, tpn.delay_actor, tpn.resource_match_status, tpn.key_path_flag, + tpn.create_by, tpn.create_time, tpn.update_by, tpn.update_time, tpn.delay_status, tpn.delay_policy, tpn.analyze_result + from tb_project_progress_new tpn + left join tb_project_new pn on pn.pro_name = tpn.project_name