项目进度分析

securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java

@@ -81,6 +81,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
             "/largeScreen/deviceEnergyAnalysis/selectAnomalyByDateRange",
             "/largeScreen/deviceEnergyAnalysis/selectLatestAll",
             "/largeScreen/tb_project_new/list4progress",
+            "/largeScreen/tb_project_new/listRiskDetail",
 
     };
 

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java

@@ -12,6 +12,7 @@ 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -53,6 +54,15 @@ public class ProjectNewController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "查询工程信息列表")
+    //@RequiresPermissions("screen:new:list")
+    @GetMapping("/listRiskDetail")
+    public TableDataInfo listRiskDetail(ProjectNew projectNew) {
+        startPage();
+        List<ProjectRisk> list = projectNewService.selectProjectRiskDetailList(projectNew);
+        return getDataTable(list);
+    }
+
     @ApiOperation(value = "查询工程进度表")
     @GetMapping("/list4progress")
     public TableDataInfo list4chart() {
@@ -64,25 +74,25 @@ public class ProjectNewController extends BaseController {
         ProjectNew projectProgress5 = new ProjectNew();
         ProjectNew projectProgress6 = new ProjectNew();
         ProjectNew projectProgress7 = new ProjectNew();
-        projectProgress1.setMonth("一月");
+        projectProgress1.setMonth("九月");
         projectProgress1.setMonthProgress("90");
         projectProgress1.setMonthProgress2("90");
-        projectProgress2.setMonth("二月");
+        projectProgress2.setMonth("十月");
         projectProgress2.setMonthProgress("75");
         projectProgress2.setMonthProgress2("73");
-        projectProgress3.setMonth("三月");
+        projectProgress3.setMonth("十一月");
         projectProgress3.setMonthProgress("56");
         projectProgress3.setMonthProgress2("60");
-        projectProgress4.setMonth("四月");
+        projectProgress4.setMonth("十二月");
         projectProgress4.setMonthProgress("45");
         projectProgress4.setMonthProgress2("44");
-        projectProgress5.setMonth("五月");
+        projectProgress5.setMonth("元月");
         projectProgress5.setMonthProgress("33");
         projectProgress5.setMonthProgress2("31");
-        projectProgress6.setMonth("六月");
+        projectProgress6.setMonth("二月");
         projectProgress6.setMonthProgress("22");
         projectProgress6.setMonthProgress2("20");
-        projectProgress7.setMonth("七月");
+        projectProgress7.setMonth("三月");
         projectProgress7.setMonthProgress("9");
         projectProgress7.setMonthProgress2("5");
         list.add(projectProgress1);

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java

@@ -57,25 +57,25 @@ public class ProjectProgressNewController extends BaseController {
         ProjectProgressNew projectProgress5 = new ProjectProgressNew();
         ProjectProgressNew projectProgress6 = new ProjectProgressNew();
         ProjectProgressNew projectProgress7 = new ProjectProgressNew();
-        projectProgress1.setMonth("一月");
+        projectProgress1.setMonth("九月");
         projectProgress1.setMonthValue("60");
         projectProgress1.setMonthValue2("80");
-        projectProgress2.setMonth("二月");
+        projectProgress2.setMonth("十月");
         projectProgress2.setMonthValue("90");
         projectProgress2.setMonthValue2("100");
-        projectProgress3.setMonth("三月");
+        projectProgress3.setMonth("十一月");
         projectProgress3.setMonthValue("50");
         projectProgress3.setMonthValue2("65");
-        projectProgress4.setMonth("四月");
+        projectProgress4.setMonth("十二月");
         projectProgress4.setMonthValue("80");
         projectProgress4.setMonthValue2("92");
-        projectProgress5.setMonth("五月");
+        projectProgress5.setMonth("元月");
         projectProgress5.setMonthValue("100");
         projectProgress5.setMonthValue2("108");
-        projectProgress6.setMonth("六月");
+        projectProgress6.setMonth("二月");
         projectProgress6.setMonthValue("75");
         projectProgress6.setMonthValue2("88");
-        projectProgress7.setMonth("七月");
+        projectProgress7.setMonth("三月");
         projectProgress7.setMonthValue("85");
         projectProgress7.setMonthValue2("98");
         list.add(projectProgress1);

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java

@@ -0,0 +1,9 @@
+package com.securitycontrol.screen.domain;
+
+import lombok.Data;
+
+@Data
+public class ProjectRisk {
+    private String proPart;
+    private String riskDesc;
+}

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java

@@ -2,6 +2,7 @@ package com.securitycontrol.screen.mapper;
 
 import java.util.List;
 import com.securitycontrol.screen.domain.ProjectNew;
+import com.securitycontrol.screen.domain.ProjectRisk;
 import com.securitycontrol.screen.domain.ScreemDocData;
 
 /**
@@ -27,6 +28,8 @@ public interface ProjectNewMapper {
      */
     public List<ProjectNew> selectProjectNewList(ProjectNew projectNew);
 
+    public List<ProjectRisk> selectProjectRiskDetailList(ProjectNew projectNew);
+
     /**
      * 新增工程信息
      *

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java

@@ -2,6 +2,7 @@ package com.securitycontrol.screen.service;
 
 import java.util.List;
 import com.securitycontrol.screen.domain.ProjectNew;
+import com.securitycontrol.screen.domain.ProjectRisk;
 import com.securitycontrol.screen.domain.ScreemDocData;
 
 /**
@@ -27,6 +28,8 @@ public interface IProjectNewService {
      */
     public List<ProjectNew> selectProjectNewList(ProjectNew projectNew);
 
+    public List<ProjectRisk> selectProjectRiskDetailList(ProjectNew projectNew);
+
     /**
      * 新增工程信息
      * 

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.ProjectRisk;
 import com.securitycontrol.screen.domain.ScreemDocData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +44,11 @@ public class ProjectNewServiceImpl implements IProjectNewService {
         return projectNewMapper.selectProjectNewList(projectNew);
     }
 
+    @Override
+    public List<ProjectRisk> selectProjectRiskDetailList(ProjectNew projectNew) {
+        return projectNewMapper.selectProjectRiskDetailList(projectNew);
+    }
+
     /**
      * 新增工程信息
      * 

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml

@@ -49,6 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskName != null  and taskName != ''"> and task_name = #{taskName}</if>
         </where>
     </select>
+
+    <select id="selectProjectRiskDetailList" parameterType="com.securitycontrol.screen.domain.ProjectNew" resultType="com.securitycontrol.screen.domain.ProjectRisk">
+        select id, pro_id, pro_part, risk_desc
+        from tb_project_risk_new
+        where pro_id = #{proId}
+    </select>
     
     <select id="selectProjectNewByProId" parameterType="String" resultMap="ProjectNewResult">
         <include refid="selectProjectNewVo"/>