cyy il y a 1 an
Parent
commit
f0bd77afdf
1 fichiers modifiés avec 7 ajouts et 1 suppressions
  1. 7 1
      src/views/peopleManages/taskStatistics/index.vue

+ 7 - 1
src/views/peopleManages/taskStatistics/index.vue

@@ -990,10 +990,16 @@ export default {
             // ee.id_ AS eeID,ee.name_ AS eeName,ee.positions_,ry.zui_gao_xue_li_x_,ry.zhi_cheng_deng_ji
             // ee.id_ AS eeID,ee.name_ AS eeName,ee.positions_,ry.zui_gao_xue_li_x_,ry.zhi_cheng_deng_ji
             // FROM t_ryjbqk AS ry JOIN  ibps_party_employee AS ee ON ry.parent_id_= ee.id_
             // FROM t_ryjbqk AS ry JOIN  ibps_party_employee AS ee ON ry.parent_id_= ee.id_
             // )gy LEFT JOIN   ibps_party_entity en ON FIND_IN_SET(en.id_,gy.positions_)  where ${positionsWhere} and en.id_!='1166373874003083264' and en.name_ not like '%综合%' GROUP BY enName) jh`
             // )gy LEFT JOIN   ibps_party_entity en ON FIND_IN_SET(en.id_,gy.positions_)  where ${positionsWhere} and en.id_!='1166373874003083264' and en.name_ not like '%综合%' GROUP BY enName) jh`
+            console.log(this.$store.getters.deptList, 'this.positionsthis.positionsthis.positions')
+            const a = 'SELECT 1 AS n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7'
+            let sqlparty = `SELECT 1 AS n`
+            this.$store.getters.deptList.forEach((it, i) => {
+                sqlparty += ` UNION ALL SELECT ${i + 2} `
+            })
 
 
             const sql = `select jh.enName, IFNULL(jh.boShi,0) as boShi,IFNULL(jh.shuoShi,0) as shuoShi,IFNULL(jh.benKe,0) as benKe,IFNULL(jh.daZhuan,0) as daZhuan,IFNULL(jh.chuJi,0) as chuJi, IFNULL(jh.zhongJi,0) as zhongJi, IFNULL(jh.gaoJi,0) as gaoJi from (select  en.id_ ,en.name_ AS enName,               sum(gy.zui_gao_xue_li_x_ like '%博士%') as boShi,             sum(gy.zui_gao_xue_li_x_ like '%硕士%') as shuoShi,             sum(gy.zui_gao_xue_li_x_ = '本科') as benKe,             sum(gy.zui_gao_xue_li_x_ = '大专') as daZhuan,             sum(gy.zhi_cheng_deng_ji = '初级') AS chuJi,             sum(gy.zhi_cheng_deng_ji = '中级') AS zhongJi,             sum(gy.zhi_cheng_deng_ji = '高级') AS gaoJi FROM (SELECT             ee.id_ AS eeID,ee.name_ AS eeName,ee.positions_,ry.zui_gao_xue_li_x_,ry.zhi_cheng_deng_ji             FROM t_ryjbqk AS ry JOIN  ibps_party_employee AS ee ON ry.parent_id_= ee.id_              )gy right JOIN   ibps_party_entity en ON FIND_IN_SET(en.id_,gy.positions_)  where en.DEPTH_ like '%4%' and en.PARENT_ID_ like '%${this.depth3}%' and en.id_!='1166373874003083264' and en.name_ not like '%综合%' GROUP BY en.id_) jh                                                                                                                                                                                                         
             const sql = `select jh.enName, IFNULL(jh.boShi,0) as boShi,IFNULL(jh.shuoShi,0) as shuoShi,IFNULL(jh.benKe,0) as benKe,IFNULL(jh.daZhuan,0) as daZhuan,IFNULL(jh.chuJi,0) as chuJi, IFNULL(jh.zhongJi,0) as zhongJi, IFNULL(jh.gaoJi,0) as gaoJi from (select  en.id_ ,en.name_ AS enName,               sum(gy.zui_gao_xue_li_x_ like '%博士%') as boShi,             sum(gy.zui_gao_xue_li_x_ like '%硕士%') as shuoShi,             sum(gy.zui_gao_xue_li_x_ = '本科') as benKe,             sum(gy.zui_gao_xue_li_x_ = '大专') as daZhuan,             sum(gy.zhi_cheng_deng_ji = '初级') AS chuJi,             sum(gy.zhi_cheng_deng_ji = '中级') AS zhongJi,             sum(gy.zhi_cheng_deng_ji = '高级') AS gaoJi FROM (SELECT             ee.id_ AS eeID,ee.name_ AS eeName,ee.positions_,ry.zui_gao_xue_li_x_,ry.zhi_cheng_deng_ji             FROM t_ryjbqk AS ry JOIN  ibps_party_employee AS ee ON ry.parent_id_= ee.id_              )gy right JOIN   ibps_party_entity en ON FIND_IN_SET(en.id_,gy.positions_)  where en.DEPTH_ like '%4%' and en.PARENT_ID_ like '%${this.depth3}%' and en.id_!='1166373874003083264' and en.name_ not like '%综合%' GROUP BY en.id_) jh                                                                                                                                                                                                         
             UNION
             UNION
-            select jh.enName, IFNULL(jh.boShi,0) as boShi,IFNULL(jh.shuoShi,0) as shuoShi,IFNULL(jh.benKe,0) as benKe,IFNULL(jh.daZhuan,0) as daZhuan,IFNULL(jh.chuJi,0) as chuJi, IFNULL(jh.zhongJi,0) as zhongJi, IFNULL(jh.gaoJi,0) as gaoJi from (select  en.id_ ,en.name_ AS enName,               sum(gy.zui_gao_xue_li_x_ like '%博士%') as boShi,             sum(gy.zui_gao_xue_li_x_ like '%硕士%') as shuoShi,             sum(gy.zui_gao_xue_li_x_ = '本科') as benKe,             sum(gy.zui_gao_xue_li_x_ = '大专') as daZhuan,             sum(gy.zhi_cheng_deng_ji = '初级') AS chuJi,             sum(gy.zhi_cheng_deng_ji = '中级') AS zhongJi,             sum(gy.zhi_cheng_deng_ji = '高级') AS gaoJi FROM (SELECT             ee.id_ AS eeID,ee.name_ AS eeName,ee.positions_,ry.zui_gao_xue_li_x_,ry.zhi_cheng_deng_ji             FROM t_ryjbqk AS ry JOIN  ibps_party_employee AS ee ON ry.parent_id_= ee.id_              )gy right JOIN   ibps_party_entity en ON FIND_IN_SET(en.id_,gy.positions_)  where (en.id_ like '%${this.depth3}%' or en.PARENT_ID_ like '%${this.depth3}%') and en.id_!='1166373874003083264' and en.name_ not like '%综合%' ) jh`
+            select (select name_ from ibps_party_entity where id_='${this.depth3}') as enName,IFNULL(sum(zui_gao_xue_li_x_ like '%博士%'),0) as boShi, IFNULL(sum(zui_gao_xue_li_x_ like '%硕士%'),0) as shuoShi,IFNULL(sum(zui_gao_xue_li_x_ = '本科'),0) as benKe,IFNULL(sum(zui_gao_xue_li_x_ = '大专'),0) as daZhuan, IFNULL(sum(zhi_cheng_deng_ji = '初级'),0) as chuJi,IFNULL(sum(zhi_cheng_deng_ji = '中级'),0) as zhongJi, IFNULL(sum(zhi_cheng_deng_ji = '高级'),0) as gaoJi from t_ryjbqk where parent_id_ in (SELECT b.id_ as bid FROM (select a.* from (SELECT id_, name_,TRIM(SUBSTRING_INDEX(SUBSTRING_INDEX(positions_, ',', n), ',', -1)) AS positions_ FROM ibps_party_employee JOIN (${this.$store.getters.deptList.length > 2 ? sqlparty : a}) AS numbers WHERE LENGTH(positions_) - LENGTH(REPLACE(positions_, ',', '')) >= n - 1) a GROUP BY name_) b WHERE b.positions_ IN ( SELECT id_  FROM ibps_party_entity  WHERE path_ LIKE '%1257661032474607616%' AND party_type_ = 'position'))`
             curdPost('sql', sql).then((res) => {
             curdPost('sql', sql).then((res) => {
                 const data = res.variables.data
                 const data = res.variables.data
                 // 组装数据集,以学历职称为列,以部门为行:{" 大专":['1','2','3']}
                 // 组装数据集,以学历职称为列,以部门为行:{" 大专":['1','2','3']}