From 03f27873fe5f2fb030f0057e2000700e448783ae Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sun, 20 Aug 2023 19:11:56 +0800
Subject: [PATCH] update code

---
 ruoyi-ui/src/layout/components/Navbar.vue                  | 2 +-
 .../resources/mapper/trouble/SmzSspProblemmodifyMapper.xml | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 9d41d290..d8b5a612 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -86,7 +86,7 @@ export default {
   },
   methods: {
     goBigScreen(){
-      window.open("/jhbs/")
+      window.open("//szgc.jhncidg.com:808/jhbs/")
     },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 27158052..a38f92f9 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and ssp.isDel=0
             <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
             <if test="infoType != null "> and ssp.infoType = #{infoType}</if>
+            <if test="roleType != null and roleType >0 "> and ssp.roleType = #{roleType}</if>
             <if test="problemArea != null  and problemArea != ''"> and ssp.problemArea like concat('%', #{problemArea}, '%')</if>
             <if test="workParts != null  and workParts != ''"> and ssp.workParts like concat('%', #{workParts}, '%')</if>
             <if test="changeInfo != null  and changeInfo != ''"> and ssp.changeInfo like concat('%', #{changeInfo}, '%')</if>
@@ -327,8 +328,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="groupByInfotypeCheckState" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
-        SELECT infotype,checkState,COUNT(1) id FROM smz_ssp_problemmodify WHERE isDel=0
+        SELECT infotype,checkState,COUNT(1) id FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0
         <if test="infoType !=null">and infoType=#{infoType}</if>
+        <if test="roleType !=null and roleType>0">and roleType=#{roleType}</if>
         <if test="projectId > 0"> and projectId=#{projectId}</if>
         <if test="projectId &lt;= 0">
         AND  projectId IN (
@@ -342,7 +344,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(1) cnt
         FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0
         <if test="infoType !=null">and infoType=#{infoType}</if>
-                                              and ((updateTime is null and  date(nickedTime) &lt; date(now()) ) or  date(updateTime )>date(nickedTime))
+        <if test="roleType !=null  and roleType>0">and roleType=#{roleType}</if>
+        and ((updateTime is null and  date(nickedTime) &lt; date(now()) ) or  date(updateTime )>date(nickedTime))
         <if test="projectId > 0"> and projectId=#{projectId}</if>
         <if test="projectId &lt;= 0">
             AND  projectId IN (