|
|
@@ -545,7 +545,7 @@ export default {
|
|
|
// 内外部文件查阅时候查所有文件
|
|
|
const allSql = ``
|
|
|
// 共用文件
|
|
|
- const comSql = `${selectSql} t_wjxxb wj ${leftSql}
|
|
|
+ const comSql = `${selectSql} t_wjxxb wj ${leftSql}
|
|
|
where wj.shi_fou_guo_shen_ ='有效' and (${this.depArrs.join(
|
|
|
' or '
|
|
|
)}) ${wheres1} `
|
|
|
@@ -565,7 +565,8 @@ export default {
|
|
|
,'）') as file_info_,
|
|
|
wj.wen_jian_xi_lei_,wj.wen_jian_bian_hao,wj.wen_jian_ming_che,wj.ban_ben_,wj.wen_jian_fu_jian_ AS fu_jian_,wj.fa_bu_shi_jian_ as fa_fang_shi_jian_,sq.cha_yue_jie_zhi_s from
|
|
|
t_wjxxb wj
|
|
|
- left join (select *from t_skwjcysqsqzb order by create_time_ desc limit 1) sq on wj.id_=sq.wen_jian_id_
|
|
|
+ left join (SELECT a.* FROM t_skwjcysqsqzb a inner join (select wen_jian_id_, MAX(cha_yue_jie_zhi_s ) as max_time from t_skwjcysqsqzb WHERE parent_id_ IN ( SELECT id_ FROM t_skwjcysqsq WHERE shi_fou_guo_shen_ = '已完成' AND bian_zhi_ren_= '${this.userId}') group by wen_jian_id_) b ON a.wen_jian_id_ = b.wen_jian_id_ AND a.cha_yue_jie_zhi_s = b.max_time where a.parent_id_ in ( SELECT id_ from t_skwjcysqsq WHERE shi_fou_guo_shen_='已完成'AND bian_zhi_ren_ = '${this.userId}')
|
|
|
+ )sq ON wj.id_ = sq.wen_jian_id_
|
|
|
${leftSql}
|
|
|
WHERE wj.shi_fou_guo_shen_ ='有效'and ((sq.cha_yue_jie_zhi_s >DATE_FORMAT(NOW(), '%Y-%m-%d')) OR (sq.cha_yue_jie_zhi_s =DATE_FORMAT(NOW(), '%Y-%m-%d')))
|
|
|
and wj.quan_xian_xin_xi_ like '%${this.userId}%' ${wheres3} `
|
|
|
@@ -611,9 +612,9 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- oldRecordSql = `select wj.*,en.name_ AS org_name,ee.name_ as ry_name FROM t_ywyxjlb wj
|
|
|
- left join ibps_party_employee ee on wj.bian_zhi_ren_ = ee.id_
|
|
|
- LEFT JOIN ibps_party_entity en ON en.id_= bian_zhi_bu_men_
|
|
|
+ oldRecordSql = `select wj.*,en.name_ AS org_name,ee.name_ as ry_name FROM t_ywyxjlb wj
|
|
|
+ left join ibps_party_employee ee on wj.bian_zhi_ren_ = ee.id_
|
|
|
+ LEFT JOIN ibps_party_entity en ON en.id_= bian_zhi_bu_men_
|
|
|
where (${buMenWhere.join(
|
|
|
' or '
|
|
|
)}) ${wheres1} order by bian_zhi_shi_jian desc`
|
cyy