From c1ff6aadefef08b1d3d99b8f5b8216029e92312c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 24 Jul 2025 23:13:02 +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 --- .../interceptor/ParamSecureHandler.java | 1 + .../controller/ProjectNewController.java | 19 ++++++++--- .../screen/domain/ProjectLevel.java | 32 +++++++++++++++++++ .../screen/mapper/ProjectNewMapper.java | 4 +++ .../screen/service/IProjectNewService.java | 4 +++ .../service/impl/ProjectNewServiceImpl.java | 6 ++++ .../resources/mapper/ProjectNewMapper.xml | 5 +++ 7 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectLevel.java diff --git a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java index 51fe8df..3cb969a 100644 --- a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java +++ b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java @@ -83,6 +83,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { "/largeScreen/tb_project_new/list4progress", "/largeScreen/tb_project_new/listRiskDetail", "/largeScreen/tb_project_new/list4cost", + "/largeScreen/tb_project_new/list4level", }; diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java index 151ba2d..86e506e 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java @@ -11,9 +11,7 @@ import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import com.securitycontrol.screen.WordUtils; -import com.securitycontrol.screen.domain.ProjectProgressNew; -import com.securitycontrol.screen.domain.ProjectRisk; -import com.securitycontrol.screen.domain.ScreemDocData; +import com.securitycontrol.screen.domain.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; @@ -26,7 +24,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.securitycontrol.screen.domain.ProjectNew; import com.securitycontrol.screen.service.IProjectNewService; /** @@ -54,6 +51,13 @@ public class ProjectNewController extends BaseController { return getDataTable(list); } + @ApiOperation(value = "查询工程等级表") + @GetMapping("/list4level") + public TableDataInfo list4grade(ProjectNew projectNew) { + List list = projectNewService.selectProjectLevelList(projectNew); + return getDataTable(list); + } + @ApiOperation(value = "查询工程信息列表") //@RequiresPermissions("screen:new:list") @GetMapping("/listRiskDetail") @@ -117,18 +121,25 @@ public class ProjectNewController extends BaseController { ProjectNew projectProgress7 = new ProjectNew(); projectProgress1.setMonth("九月"); projectProgress1.setMonthProgress("10"); + projectProgress1.setMonthProgress2("11"); projectProgress2.setMonth("十月"); projectProgress2.setMonthProgress("21"); + projectProgress2.setMonthProgress2("23"); projectProgress3.setMonth("十一月"); projectProgress3.setMonthProgress("32"); + projectProgress3.setMonthProgress2("35"); projectProgress4.setMonth("十二月"); projectProgress4.setMonthProgress("45"); + projectProgress4.setMonthProgress2("49"); projectProgress5.setMonth("元月"); projectProgress5.setMonthProgress("67"); + projectProgress5.setMonthProgress2("71"); projectProgress6.setMonth("二月"); projectProgress6.setMonthProgress("82"); + projectProgress6.setMonthProgress2("85"); projectProgress7.setMonth("三月"); projectProgress7.setMonthProgress("95"); + projectProgress7.setMonthProgress2("97"); list.add(projectProgress1); list.add(projectProgress2); list.add(projectProgress3); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectLevel.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectLevel.java new file mode 100644 index 0000000..bbfe429 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectLevel.java @@ -0,0 +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 ProjectLevel extends ScreenDto { + private String id; + + private String month; + + private String level; + + private String count; + + /** 创建者 */ + 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/mapper/ProjectNewMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java index 70d59bb..e383608 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java @@ -1,6 +1,8 @@ package com.securitycontrol.screen.mapper; import java.util.List; + +import com.securitycontrol.screen.domain.ProjectLevel; import com.securitycontrol.screen.domain.ProjectNew; import com.securitycontrol.screen.domain.ProjectRisk; import com.securitycontrol.screen.domain.ScreemDocData; @@ -28,6 +30,8 @@ public interface ProjectNewMapper { */ public List selectProjectNewList(ProjectNew projectNew); + public List selectProjectLevelList(ProjectNew projectNew); + public List selectProjectRiskDetailList(ProjectNew projectNew); /** diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java index ed1dc89..278e0a7 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java @@ -1,6 +1,8 @@ package com.securitycontrol.screen.service; import java.util.List; + +import com.securitycontrol.screen.domain.ProjectLevel; import com.securitycontrol.screen.domain.ProjectNew; import com.securitycontrol.screen.domain.ProjectRisk; import com.securitycontrol.screen.domain.ScreemDocData; @@ -30,6 +32,8 @@ public interface IProjectNewService { public List selectProjectRiskDetailList(ProjectNew projectNew); + public List selectProjectLevelList(ProjectNew projectNew); + /** * 新增工程信息 * diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java index b020339..55d7ba4 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java @@ -3,6 +3,7 @@ package com.securitycontrol.screen.service.impl; import java.util.Collections; import java.util.List; +import com.securitycontrol.screen.domain.ProjectLevel; import com.securitycontrol.screen.domain.ProjectRisk; import com.securitycontrol.screen.domain.ScreemDocData; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +55,11 @@ public class ProjectNewServiceImpl implements IProjectNewService { return projects; } + @Override + public List selectProjectLevelList(ProjectNew projectNew) { + return projectNewMapper.selectProjectLevelList(projectNew); + } + @Override public List selectProjectRiskDetailList(ProjectNew projectNew) { return projectNewMapper.selectProjectRiskDetailList(projectNew); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml index a52f44a..a7aa5b0 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml @@ -50,6 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +