From 2e2806083591cfa2d42bc19398e4d1f17b27a6a7 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 17 Jun 2024 13:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/controller/XcIndexController.java       |  6 ++++++
 .../screen/mapper/XcIndexMapper.java               | 10 ++++++++++
 .../screen/service/XcIndexService.java             |  9 +++++++++
 .../screen/service/impl/AccessMgeServiceImpl.java  |  1 -
 .../screen/service/impl/XcIndexServiceImpl.java    | 11 +++++++++++
 .../src/main/resources/mapper/XcIndexMapper.xml    | 14 ++++++++++++++
 6 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/XcIndexController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/XcIndexController.java
index 67bd8d8..936b53f 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/XcIndexController.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/XcIndexController.java
@@ -76,4 +76,10 @@ public class XcIndexController extends BaseController {
   public AjaxResult getProSchedule(ScreenParamDto dto){
     return service.getProSchedule(dto);
   }
+
+  @ApiOperation(value = "项目风险")
+  @GetMapping("getProRiskNum")
+  public AjaxResult getProRiskNum(ScreenParamDto dto){
+    return service.getProRiskNum(dto);
+  }
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/XcIndexMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/XcIndexMapper.java
index ddc3084..a76e28f 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/XcIndexMapper.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/XcIndexMapper.java
@@ -70,4 +70,14 @@ public interface XcIndexMapper {
      */
     @MapKey("bidCode")
     Map<String, Object> getProSchedule(ScreenParamDto dto);
+
+    /**
+     * 项目风险数量
+     * @param dto
+     * @return Map<String, Object>
+     * @author cwchen
+     * @date 2024/6/17 12:01
+     */
+    @MapKey("bidCode")
+    Map<String, Object> getProRiskNum(ScreenParamDto dto);
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/XcIndexService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/XcIndexService.java
index f00f94a..2e405e9 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/XcIndexService.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/XcIndexService.java
@@ -57,4 +57,13 @@ public interface XcIndexService {
      * @date 2024/6/14 10:58
      */
     AjaxResult getProSchedule(ScreenParamDto dto);
+
+    /**
+     * 项目风险
+     * @param dto
+     * @return AjaxResult
+     * @author cwchen
+     * @date 2024/6/17 12:00
+     */
+    AjaxResult getProRiskNum(ScreenParamDto dto);
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
index 56574c0..46fa11a 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java
@@ -101,7 +101,6 @@ public class AccessMgeServiceImpl implements AccessMgeService {
                             vo.setBase64(base64);
                         }
                         vo.setPersonName(handleData(vo.getSourceData(),"personName"));
-                        vo.setAccesssTime(handleData(vo.getSourceData(),"dataTime"));
                     }
                     if(i == 0 || i == 1){
                         noWarnList.add(vo);
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java
index e7067aa..187244f 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java
@@ -245,4 +245,15 @@ public class XcIndexServiceImpl  implements XcIndexService {
             return AjaxResult.error();
         }
     }
+
+    @Override
+    public AjaxResult getProRiskNum(ScreenParamDto dto) {
+        try {
+            Map<String,Object> mapData = mapper.getProRiskNum(dto);
+            return AjaxResult.success(mapData.get(dto.getBidCode()));
+        } catch (Exception e) {
+            log.error("项目进度",e);
+            return AjaxResult.error();
+        }
+    }
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/XcIndexMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/XcIndexMapper.xml
index a4349eb..d6515f6 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/XcIndexMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/XcIndexMapper.xml
@@ -64,4 +64,18 @@
         FROM tb_pro_reality_progress
         WHERE bid_code = #{bidCode}
     </select>
+    <!--项目风险数量-->
+    <select id="getProRiskNum" resultType="java.util.Map">
+        SELECT bid_code AS bidCode,
+               two_risk_num AS twoRiskNum,
+               three_risk_num AS threeRiskNum,
+               four_risk_num AS fourRiskNum,
+               five_risk_num AS fiveRiskNum,
+               two_class_num AS twoClassNum,
+               three_class_num AS threeClassNum,
+               four_class_num AS fourClassNum,
+               five_class_num AS fiveClassNum
+        FROM tb_pro_risk
+        WHERE bid_code = #{bidCode}
+    </select>
 </mapper>
\ No newline at end of file