diff --git a/WebRoot/Excel/fc1a15f9-a246-4878-8f8d-d9c18d66022d.xlsx b/WebRoot/Excel/fc1a15f9-a246-4878-8f8d-d9c18d66022d.xlsx new file mode 100644 index 00000000..9858082d Binary files /dev/null and b/WebRoot/Excel/fc1a15f9-a246-4878-8f8d-d9c18d66022d.xlsx differ diff --git a/src/main/resource/Sql/Collect.sql b/src/main/resource/Sql/Collect.sql index 25459161..461a941b 100644 --- a/src/main/resource/Sql/Collect.sql +++ b/src/main/resource/Sql/Collect.sql @@ -131,17 +131,16 @@ -- 查看面向人员的任务情况 #sql("viewPersonJob") - select t1.*,t2.person_name as target_name,t4.job_type,t4.target_type_id from t_collect_job_target as t1 - inner join t_sys_loginperson as t2 on t1.target_id=t2.person_id + select t1.*,t4.job_type,t4.target_type_id,t1.target_name as person_name from t_collect_job_target as t1 inner join t_collect_job as t4 on t1.job_id=t4.job_id where t1.job_id=#para(job_id) and t1.status_code in #para(idList, "in") #if(keyword) - and t2.person_name like #para(keyword, "like") + and t1.target_name like #para(keyword, "like") #end and t4.bureau_id=#para(creatorBureauId) and t1.bureau_id=#para(bureau_id) - order by t1.status_code desc,t2.person_name + order by t1.status_code desc,t1.target_name #end -- 获取组内单位ids diff --git a/src/main/resource/application.properties b/src/main/resource/application.properties index f9581f37..fc8ce368 100644 --- a/src/main/resource/application.properties +++ b/src/main/resource/application.properties @@ -100,4 +100,4 @@ Secret=SECd1f1038b6958ab37b8ac8fd61e9e154106d72d7d4ef4dd435d10a11ffdf27215 publishPath=http://10.10.21.20/QingLong/Logs/ # 数据采集系统是否对接第三方基础数据 -third_party_base_data=1 \ No newline at end of file +third_party_base_data=0 \ No newline at end of file