|
|
@@ -1016,6 +1016,14 @@ export default {
|
|
|
},
|
|
|
deep: true,
|
|
|
immediate: true
|
|
|
+ },
|
|
|
+ optionZSB: {
|
|
|
+ handler (newVal, oldVal) {
|
|
|
+ this.zsInfoData()
|
|
|
+ this.zsInfoDataPos()
|
|
|
+ },
|
|
|
+ deep: true,
|
|
|
+ immediate: true
|
|
|
}
|
|
|
},
|
|
|
created () {
|
|
|
@@ -1183,28 +1191,28 @@ export default {
|
|
|
// AND ee.name_ NOT LIKE '%金通%'
|
|
|
// AND ee.name_ NOT LIKE '%管理%'
|
|
|
// AND ee.id_ != '702117247933480960' `
|
|
|
- const sql = `select
|
|
|
- ee.name_,
|
|
|
- ee.jian_ding_zi_ge_z
|
|
|
- FROM
|
|
|
- (
|
|
|
- SELECT
|
|
|
- e.*
|
|
|
- FROM
|
|
|
- ibps_party_employee e
|
|
|
- JOIN ibps_party_entity en ON FIND_IN_SET( en.id_, e.POSITIONS_ ) > 0
|
|
|
- WHERE
|
|
|
- en.PATH_ LIKE '%${this.depth3}%'
|
|
|
- GROUP BY
|
|
|
- e.id_
|
|
|
- ) ee
|
|
|
- WHERE
|
|
|
- ee.name_ NOT LIKE '%系统%'
|
|
|
- AND ee.STATUS_ = 'actived'
|
|
|
- AND ee.name_ NOT LIKE '%金通%'
|
|
|
- AND ee.name_ NOT LIKE '%管理%'
|
|
|
- AND ee.id_ != '702117247933480960'`
|
|
|
- await curdPost('sql', sql).then((res) => {
|
|
|
+ // const sql = `select
|
|
|
+ // ee.name_,
|
|
|
+ // ee.jian_ding_zi_ge_z
|
|
|
+ // FROM
|
|
|
+ // (
|
|
|
+ // SELECT
|
|
|
+ // e.*
|
|
|
+ // FROM
|
|
|
+ // ibps_party_employee e
|
|
|
+ // JOIN ibps_party_entity en ON FIND_IN_SET( en.id_, e.POSITIONS_ ) > 0
|
|
|
+ // WHERE
|
|
|
+ // en.PATH_ LIKE '%${this.depth3}%'
|
|
|
+ // GROUP BY
|
|
|
+ // e.id_
|
|
|
+ // ) ee
|
|
|
+ // WHERE
|
|
|
+ // ee.name_ NOT LIKE '%系统%'
|
|
|
+ // AND ee.STATUS_ = 'actived'
|
|
|
+ // AND ee.name_ NOT LIKE '%金通%'
|
|
|
+ // AND ee.name_ NOT LIKE '%管理%'
|
|
|
+ // AND ee.id_ != '702117247933480960'`
|
|
|
+ await curdPost('query', { key: 'ryglkbrscx', params: [this.depth3] }).then((res) => {
|
|
|
data = res.variables.data
|
|
|
})
|
|
|
this.employeeNum = data.length
|
|
|
@@ -1259,52 +1267,52 @@ export default {
|
|
|
this.$store.getters.deptList.forEach((it, i) => {
|
|
|
sqlparty += ` UNION ALL SELECT ${i + 2} `
|
|
|
})
|
|
|
- const sql = `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,
|
|
|
- IFNULL( sum( zhi_cheng_deng_ji = '副高' ), 0 ) AS fuGao
|
|
|
- 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
|
|
|
- and name_ not like '%系统%'
|
|
|
- and name_ not like '%金通%'
|
|
|
- and name_ not like '%管理%'
|
|
|
- AND STATUS_ = 'actived'
|
|
|
- and id_ != '702117247933480960'
|
|
|
- ) a
|
|
|
- GROUP BY
|
|
|
- name_
|
|
|
- ) b
|
|
|
- WHERE
|
|
|
- b.positions_ IN ( SELECT id_ FROM ibps_party_entity WHERE path_ LIKE '%${this.first}%' AND party_type_ = 'position' ))`
|
|
|
+ // const sql = `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,
|
|
|
+ // IFNULL( sum( zhi_cheng_deng_ji = '副高' ), 0 ) AS fuGao
|
|
|
+ // 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
|
|
|
+ // and name_ not like '%系统%'
|
|
|
+ // and name_ not like '%金通%'
|
|
|
+ // and name_ not like '%管理%'
|
|
|
+ // AND STATUS_ = 'actived'
|
|
|
+ // and id_ != '702117247933480960'
|
|
|
+ // ) a
|
|
|
+ // GROUP BY
|
|
|
+ // name_
|
|
|
+ // ) b
|
|
|
+ // WHERE
|
|
|
+ // b.positions_ IN ( SELECT id_ FROM ibps_party_entity WHERE path_ LIKE '%${this.first}%' AND party_type_ = 'position' ))`
|
|
|
|
|
|
- await curdPost('sql', sql).then((res) => {
|
|
|
+ await curdPost('query', { key: 'ryglkbbtsjcx', params: [this.depth3] }).then((res) => {
|
|
|
data = res.variables.data
|
|
|
})
|
|
|
if (data.length === 0 || data[0] == null) {
|
|
|
@@ -1353,96 +1361,96 @@ export default {
|
|
|
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,
|
|
|
- IFNULL( jh.fuGao, 0 ) AS fuGao
|
|
|
- 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,
|
|
|
- sum( gy.zhi_cheng_deng_ji = '副高' ) AS fuGao
|
|
|
- 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_ where ee.name_ not like '%系统%' AND ee.STATUS_ = 'actived' and ee.name_ not like '%金通%' and ee.name_ not like '%管理%' and ee.id_ != '702117247933480960'
|
|
|
- ) 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
|
|
|
- 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,
|
|
|
- IFNULL( sum( zhi_cheng_deng_ji = '副高' ), 0 ) AS fuGao
|
|
|
- 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
|
|
|
- and name_ not like '%系统%'
|
|
|
- and name_ not like '%金通%'
|
|
|
- and name_ not like '%管理%'
|
|
|
- AND STATUS_ = 'actived'
|
|
|
- and id_ != '702117247933480960'
|
|
|
- ) a
|
|
|
- GROUP BY
|
|
|
- name_
|
|
|
- ) b
|
|
|
- WHERE
|
|
|
- b.positions_ IN ( SELECT id_ FROM ibps_party_entity WHERE path_ LIKE '%${this.depth3}%' AND party_type_ = 'position' ))`
|
|
|
+ // 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,
|
|
|
+ // IFNULL( jh.fuGao, 0 ) AS fuGao
|
|
|
+ // 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,
|
|
|
+ // sum( gy.zhi_cheng_deng_ji = '副高' ) AS fuGao
|
|
|
+ // 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_ where ee.name_ not like '%系统%' AND ee.STATUS_ = 'actived' and ee.name_ not like '%金通%' and ee.name_ not like '%管理%' and ee.id_ != '702117247933480960'
|
|
|
+ // ) 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
|
|
|
+ // 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,
|
|
|
+ // IFNULL( sum( zhi_cheng_deng_ji = '副高' ), 0 ) AS fuGao
|
|
|
+ // 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
|
|
|
+ // and name_ not like '%系统%'
|
|
|
+ // and name_ not like '%金通%'
|
|
|
+ // and name_ not like '%管理%'
|
|
|
+ // AND STATUS_ = 'actived'
|
|
|
+ // and id_ != '702117247933480960'
|
|
|
+ // ) a
|
|
|
+ // GROUP BY
|
|
|
+ // name_
|
|
|
+ // ) b
|
|
|
+ // WHERE
|
|
|
+ // b.positions_ IN ( SELECT id_ FROM ibps_party_entity WHERE path_ LIKE '%${this.depth3}%' AND party_type_ = 'position' ))`
|
|
|
|
|
|
- await curdPost('sql', sql).then((res) => {
|
|
|
+ await curdPost('query', { key: 'ryglkbfzzztsjcx', params: [this.depth3] }).then((res) => {
|
|
|
const data = res.variables.data
|
|
|
// 组装数据集，以学历职称为列，以部门为行:{" 大专":['1','2','3']}
|
|
|
const degreeSeriesDatas = this.PositionsDegreeOption.series
|
|
|
@@ -1512,36 +1520,26 @@ export default {
|
|
|
t_ryzsb
|
|
|
WHERE
|
|
|
parent_id_ IN (
|
|
|
+ select
|
|
|
+ ee.id_ as bid
|
|
|
+ FROM
|
|
|
+ (
|
|
|
SELECT
|
|
|
- b.id_ AS bid
|
|
|
+ e.*
|
|
|
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
|
|
|
- and name_ not like '%系统%'
|
|
|
- and name_ not like '%金通%'
|
|
|
- and name_ not like '%管理%'
|
|
|
- AND STATUS_ = 'actived'
|
|
|
- and id_ != '702117247933480960'
|
|
|
- ) a
|
|
|
- GROUP BY
|
|
|
- name_
|
|
|
- ) b
|
|
|
+ ibps_party_employee e
|
|
|
+ JOIN ibps_party_entity en ON FIND_IN_SET( en.id_, e.POSITIONS_ ) > 0
|
|
|
+ WHERE
|
|
|
+ en.PATH_ LIKE '%${this.depth3}%'
|
|
|
+ GROUP BY
|
|
|
+ e.id_
|
|
|
+ ) ee
|
|
|
WHERE
|
|
|
- b.positions_ IN ( SELECT id_ FROM ibps_party_entity WHERE path_ LIKE '%${this.first}%' AND party_type_ = 'position' ))`
|
|
|
+ ee.name_ NOT LIKE '%系统%'
|
|
|
+ AND ee.STATUS_ = 'actived'
|
|
|
+ AND ee.name_ NOT LIKE '%金通%'
|
|
|
+ AND ee.name_ NOT LIKE '%管理%'
|
|
|
+ AND ee.id_ != '702117247933480960')`
|
|
|
|
|
|
await curdPost('sql', sql).then((res) => {
|
|
|
data = res.variables.data
|
|
|
@@ -1607,36 +1605,26 @@ export default {
|
|
|
t_ryzsb
|
|
|
WHERE
|
|
|
parent_id_ IN (
|
|
|
+ select
|
|
|
+ ee.id_ as bid
|
|
|
+ FROM
|
|
|
+ (
|
|
|
SELECT
|
|
|
- b.id_ AS bid
|
|
|
+ e.*
|
|
|
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
|
|
|
- and name_ not like '%系统%'
|
|
|
- and name_ not like '%金通%'
|
|
|
- and name_ not like '%管理%'
|
|
|
- AND STATUS_ = 'actived'
|
|
|
- and id_ != '702117247933480960'
|
|
|
- ) a
|
|
|
- GROUP BY
|
|
|
- name_
|
|
|
- ) b
|
|
|
+ ibps_party_employee e
|
|
|
+ JOIN ibps_party_entity en ON FIND_IN_SET( en.id_, e.POSITIONS_ ) > 0
|
|
|
+ WHERE
|
|
|
+ en.PATH_ LIKE '%${this.depth3}%'
|
|
|
+ GROUP BY
|
|
|
+ e.id_
|
|
|
+ ) ee
|
|
|
WHERE
|
|
|
- b.positions_ IN ( SELECT id_ FROM ibps_party_entity WHERE path_ LIKE '%${this.depth3}%' AND party_type_ = 'position' ))`
|
|
|
+ ee.name_ NOT LIKE '%系统%'
|
|
|
+ AND ee.STATUS_ = 'actived'
|
|
|
+ AND ee.name_ NOT LIKE '%金通%'
|
|
|
+ AND ee.name_ NOT LIKE '%管理%'
|
|
|
+ AND ee.id_ != '702117247933480960')`
|
|
|
|
|
|
await curdPost('sql', sql).then((res) => {
|
|
|
const data = res.variables.data
|
|
|
@@ -1725,12 +1713,16 @@ export default {
|
|
|
},
|
|
|
// 根据部门和时间获取考试统计数据
|
|
|
async getExamStatisticsData () {
|
|
|
+ console.log('111111111')
|
|
|
if (this.positionsIdArr.length) {
|
|
|
const users = this.getPositionPeopleIds(this.positionsIdArr[0])
|
|
|
const userIds = users.map(user => user.userId)
|
|
|
const renyuan = userIds.map(i => `'${i}'`).join(',') !== '' ? `and examinee in (${userIds.map(i => `'${i}'`).join(',')})` : ''
|
|
|
const sql = `select * from v_examination where paperState = '已完成' and examType!='自主考核' ${renyuan} GROUP BY examinee,examId ORDER BY createTime asc `
|
|
|
- let { variables: { data }} = await this.$common.request('sql', sql)
|
|
|
+ const parm1 = { key: 'ryglkbkswrytjsjcx', params: [null] }
|
|
|
+ const parm2 = { key: 'ryglkbksyrytjsjcx', params: [userIds.map(i => `${i}`).join(',')] }
|
|
|
+ const parm = userIds.map(i => `'${i}'`).join(',') !== '' ? parm2 : parm1
|
|
|
+ let { variables: { data }} = await this.$common.request('query', parm)
|
|
|
if (this.startDate && this.endDate) {
|
|
|
data = data.filter(item => {
|
|
|
return new Date(item.startDate).getTime() >= new Date(this.startDate).getTime() && new Date(item.startDate).getTime() <= new Date(this.endDate).getTime()
|
|
|
@@ -1786,16 +1778,20 @@ export default {
|
|
|
this.optionTrainingStatisticsConfig.series[2].data = dArr.map(item => item.participationRate)
|
|
|
},
|
|
|
handleFunc (e) {
|
|
|
- this.depth3 = e.v[0]
|
|
|
- this.sqlPositionsDatasIni = e.i
|
|
|
- this.positionIni = e.v
|
|
|
- this.simplifyPosition(e.v)
|
|
|
+ // console.log(e, 'eeeeeeeeee')
|
|
|
+ const { selection, selectionDept, filterDept } = e
|
|
|
+ this.depth3 = filterDept.filter(i => i.depth === 3)[0].positionId
|
|
|
+ this.sqlPositionsDatasIni = filterDept
|
|
|
+ const arr = selectionDept.path.split('.')
|
|
|
+ const selArr = selectionDept.depth === 4 ? [arr[arr.length - 2], arr[arr.length - 1]] : [arr[arr.length - 1]]
|
|
|
+ this.positionIni = selArr
|
|
|
+ this.simplifyPosition(selArr)
|
|
|
this.handleAllGetFunc()
|
|
|
// clearInterval(this.interval)
|
|
|
// this.intervalHandle()
|
|
|
- if (e.v.length >= 2) {
|
|
|
- this.positionsIdArr = [e.v[1]]
|
|
|
- }
|
|
|
+ // if (selArr.length >= 2) {
|
|
|
+ this.positionsIdArr = selection
|
|
|
+ // }
|
|
|
this.getTrainingStatisticsData()
|
|
|
this.getExamStatisticsData()
|
|
|
},
|
cyy