|
|
@@ -582,22 +582,22 @@ export default {
|
|
|
let this_ = this;
|
|
|
const sql = `select *FROM (SELECT ie.ID_ AS jcId,ie.NAME_ AS jcName,COUNT(tj.zhuang_tai_ = '待数据输入' OR NULL) AS jianCeWeiWanCheng,COUNT(tj.zhuang_tai_ = '待数据校验' OR tj.zhuang_tai_ = '已完成' OR NULL) AS jianCeYiWanCheng FROM
|
|
|
t_lhjczb tj,ibps_party_employee ie
|
|
|
- WHERE ie.positions_ like '%1040709034740547584%' and tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_
|
|
|
+ WHERE ie.status_ = 'actived' and ie.positions_ like '%1040709034740547584%' and tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_
|
|
|
) jc LEFT JOIN
|
|
|
(
|
|
|
SELECT ie.ID_ AS fhId,ie.NAME_ AS fhName,COUNT(tj.zhuang_tai_ = '待数据校验' OR NULL) AS fuHeWeiWanCheng,COUNT(tj.zhuang_tai_ = '已完成' OR NULL) AS fuHeYiWanCheng FROM
|
|
|
t_lhjczb tj,ibps_party_employee ie
|
|
|
- WHERE ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_
|
|
|
+ WHERE ie.status_ = 'actived' and ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_
|
|
|
) fh ON jc.jcName = fh.fhName
|
|
|
UNION (
|
|
|
SELECT *FROM (SELECT ie.ID_ AS jcId, ie.NAME_ AS jcName,COUNT(tj.zhuang_tai_ = '待数据输入' OR NULL) AS jianCeWeiWanCheng,COUNT(tj.zhuang_tai_ = '待数据校验' OR tj.zhuang_tai_ = '已完成' OR NULL) AS jianCeYiWanCheng FROM
|
|
|
t_lhjczb tj,ibps_party_employee ie
|
|
|
- WHERE tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_
|
|
|
+ WHERE ie.status_ = 'actived' and tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_
|
|
|
) jc RIGHT JOIN
|
|
|
(
|
|
|
SELECT ie.ID_ AS fhId,ie.NAME_ AS fhName,COUNT(tj.zhuang_tai_ = '待数据校验' OR NULL) AS fuHeWeiWanCheng,COUNT(tj.zhuang_tai_ = '已完成' OR NULL) AS fuHeYiWanCheng FROM
|
|
|
t_lhjczb tj,ibps_party_employee ie
|
|
|
- WHERE ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_
|
|
|
+ WHERE ie.status_ = 'actived' and ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_
|
|
|
) fh ON jc.jcName = fh.fhName
|
|
|
)`;
|
|
|
// console.log(sql,"sql")
|
|
|
@@ -777,7 +777,7 @@ export default {
|
|
|
let data = [];
|
|
|
let personInfo = [];
|
|
|
// let ranksObj = {};
|
|
|
- let sql = `select a.id_,a.parent_id_,b.name_,a.zui_gao_xue_li_x_,a.zhi_cheng_deng_ji,b.jian_ding_zi_ge_z,a.ru_zhi_shi_jian_ from t_ryjbqk as a join ibps_party_employee as b on a.parent_id_= b.id_ where a.id_ !='861622496187645952' AND b.status_ != 'deleted'`;
|
|
|
+ let sql = `select a.id_,a.parent_id_,b.name_,a.zui_gao_xue_li_x_,a.zhi_cheng_deng_ji,b.jian_ding_zi_ge_z,a.ru_zhi_shi_jian_ from t_ryjbqk as a join ibps_party_employee as b on a.parent_id_= b.id_ where a.id_ !='861622496187645952' AND b.status_ = 'actived'`;
|
|
|
await curdPost("sql", sql).then((res) => {
|
|
|
data = res.variables.data;
|
|
|
});
|
|
|
@@ -804,7 +804,7 @@ export default {
|
|
|
sum(a.zhi_cheng_deng_ji = '中级') as middleRank,
|
|
|
sum(a.zhi_cheng_deng_ji = '高级') as senior,
|
|
|
sum(a.zhi_cheng_deng_ji = ''||a.zhi_cheng_deng_ji is null) as other
|
|
|
- from t_ryjbqk as a join ibps_party_employee as b on a.parent_id_= b.id_ where b.id_ != '702117247933480960' AND b.status_ != 'deleted'`;
|
|
|
+ from t_ryjbqk as a join ibps_party_employee as b on a.parent_id_= b.id_ where b.id_ != '702117247933480960' AND b.status_ = 'actived'`;
|
|
|
await curdPost("sql", sql).then((res) => {
|
|
|
data = res.variables.data;
|
|
|
});
|