项目统计指标开发

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue

@@ -210,7 +210,6 @@
           <el-button
             type="primary"
             @click="dealWarn"
-            v-if="activeNode == 1"
             :disabled="
               !warnForm.status || warnForm.status == '2' ? false : true
             "
@@ -218,9 +217,9 @@
           >
           <el-button
             type="primary"
-            v-if="activeNode == 2"
             @click="examineWarn"
             :disabled="warnForm.status == '0' ? false : true"
+            v-hasPermi="['warn:warn:shenhe']"
             >预警审核</el-button
           >
         </div>

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -74,9 +74,9 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                        @Param("pageSize") int pageSize);
 
 
-    List<HistogramDto> getHistogram();
+    List<HistogramDto> getHistogram(@Param("userId")String userId,@Param("userType")String userType);
 
-    List<Num> getNum();
+    List<Num> getNum(@Param("userId")String userId,@Param("userType") String userType);
 
     FlowDto statistics(@Param("proNo") String proNo,
                        @Param("proCode") String proCode);

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -291,7 +291,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
     }
 
     public HashMap<String, Use> getHistogram() {
-        List<HistogramDto> list = bsSgcjsjdBuiProInfoMapper.getHistogram();
+        SysUser user = UserUtils.getUser();
+        List<HistogramDto> list = bsSgcjsjdBuiProInfoMapper.getHistogram(user.getId(),user.getUserType());
         HashMap<String, Use> map = new HashMap<>();
         for (int i = 0; i < list.size(); i++) {
 
@@ -327,7 +328,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
     }
 
     public NumberDto getNum() {
-        List<Num> dto=bsSgcjsjdBuiProInfoMapper.getNum();
+        SysUser user = UserUtils.getUser();
+        List<Num> dto=bsSgcjsjdBuiProInfoMapper.getNum(user.getId(),user.getUserType());
         NumberDto numDto = new NumberDto();
         for (Num num : dto) {
             if (num.getName().equals("ms")) {

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -410,24 +410,36 @@
 
     <select id="getHistogram" resultMap="his">
         SELECT
-            sy.`NAME`,
-            t.num,
-            t.IS_MAJOR
+        sy.`NAME`,
+        t.num,
+        t.IS_MAJOR
         FROM
-            (
-                SELECT
-                    CONCAT( LEFT ( sx.`XZQHDM`, 4 ), '00' ) adcd,
-                    COUNT( 1 ) num,
-                    pi.IS_MAJOR
-                FROM
-                    bs_sgc_jsjd_bui_pro_info pi
-                        LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.PRO_NO = pp.PRO_NO
-                        AND pi.PRO_CODE = pp.PROJECT_CODE
-                        LEFT JOIN sys_xzqh sx ON pp.ADCD = sx.XZQHDM
-                        LEFT JOIN sys_xzqh xx ON sx.XZQHDM = xx.XZQHDM
-
-                GROUP BY
-                    LEFT ( pp.ADCD, 4 ),pi.IS_MAJOR ) t LEFT JOIN sys_xzqh sy ON sy.XZQHDM = t.adcd;
+        (
+        SELECT
+        CONCAT( LEFT ( sx.`XZQHDM`, 4 ), '00' ) adcd,
+        COUNT( 1 ) num,
+        pi.IS_MAJOR
+        FROM
+        bs_sgc_jsjd_bui_pro_info pi
+        LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.PRO_NO = pp.PRO_NO
+        AND pi.PRO_CODE = pp.PROJECT_CODE
+        LEFT JOIN sys_xzqh sx ON pp.ADCD = sx.XZQHDM
+        LEFT JOIN sys_xzqh xx ON sx.XZQHDM = xx.XZQHDM
+        <if test="userType==01">
+            WHERE
+            pi.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+            </where>
+        </if>
+        GROUP BY
+        LEFT ( pp.ADCD, 4 ),pi.IS_MAJOR ) t LEFT JOIN sys_xzqh sy ON sy.XZQHDM = t.adcd;
     </select>
 
     <resultMap id="xx" type="Num">
@@ -442,6 +454,19 @@
             bs_sgc_jsjd_bui_pro_info pi
                 LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.PRO_NO = pp.PRO_NO
                 AND pi.PRO_CODE = pp.PROJECT_CODE
+        <if test="userType==01">
+            WHERE
+            pi.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+            </where>
+        </if>
         GROUP BY pi.IS_MAJOR
     </select>