main
黄海 2 years ago
parent efbf7aea18
commit 00f18458bb

@ -842,7 +842,7 @@ public class CollectController extends Controller {
@IsLoginInterface({})
@IsNumericInterface({"job_id"})
@EmptyInterface({"target_id"})
public void getJob(int job_id,String target_id) {
public void getJob(int job_id, String target_id) {
Record record = cm.getJob(job_id, target_id);
renderJson(record);
}
@ -970,13 +970,11 @@ public class CollectController extends Controller {
*/
@Before({GET.class})
@IsLoginInterface({})
@IsNumericInterface({"job_id","direction"})
@IsNumericInterface({"job_id"})
@LayUiPageInfoInterface({"page", "limit"})
@EmptyInterface({"status_codes"})
public void viewJob(int job_id, String keyword, String status_codes,int direction, int page, int limit) {
//操作人员
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
Page<Record> list = cm.viewJob(person_id,job_id, keyword, status_codes,direction, page, limit);
public void viewJob(int job_id, String keyword, String status_codes, int page, int limit) {
Page<Record> list = cm.viewJob(job_id, keyword, status_codes, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(list));
}

@ -1393,21 +1393,16 @@ public class CollectModel {
* @param job_id
* @param keyword
* @param status_codes
* @param direction
* @param page
* @param limit
*/
public Page<Record> viewJob(String person_id, int job_id, String keyword, String status_codes, int direction, int page, int limit) {
public Page<Record> viewJob(int job_id, String keyword, String status_codes, int page, int limit) {
Kv kv = Kv.create();
kv.set("job_id", job_id);
//发送任务的来源者,可能是市,也可能是县区
String ancestorsIds = getAncestorsId(direction, person_id);
List<String> ancestorList = new ArrayList<>();
for (String s : ancestorsIds.split(",")) {
ancestorList.add(s);
}
kv.set("ancestorList", ancestorList);
//创建者单位ID
String creatorBureauId = getJob(job_id).getStr("bureau_id");
kv.set("creatorBureauId", creatorBureauId);
if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
@ -2493,66 +2488,4 @@ public class CollectModel {
String sql = "select duties_id from t_person_duty_charge where person_id=? and duties_id in (select distinct publish_role_id from t_collect_role_map where receive_role_id>0)";
return Db.find(sql, person_id).size() > 0;
}
/**
*
* 1: 2 3 4
*
* @param person_id
* @return
*/
private int getPersonBureauLevel(String person_id) {
//检查当前登录人员是不是发布任务的角色
Kv kvCheck = checkPublishRole(person_id);
//获取登录人员第一个发布任务的角色是什么
int rold_id = kvCheck.getInt("publish_role_id");
/**
rold_id=255
role_id=268
role_id = 252 253 254 271 272
role_id= 269 270
*/
switch (rold_id) {
case 255://市资产管理干事
return 1;
case 268://县区教育局办公室干事
return 2;
case 252: //市直
case 253:
case 254:
case 271:
case 272:
return 3;
case 269://县区教育局下属学校校办干事 县区教辅单位办公室干事
case 270:
return 4;
}
return 0;
}
/**
*
*
* @param direction 1:2
* @param person_id
* +id
* +id
* +id
* +id
* +id + id
* @return
*/
public String getAncestorsId(int direction, String person_id) {
int level_id = getPersonBureauLevel(person_id);
LoginPersonModel lm = new LoginPersonModel();
Record record = lm.getLoginInfoByPersonId(person_id);
String city_id = record.getStr("city_id");
String area_id = record.getStr("area_id");
if (level_id == 1 && direction == 1) return city_id;
if (level_id == 2 && direction == 1) return area_id;
if (level_id == 2 && direction == 2) return city_id;
if (level_id == 3 && direction == 2) return city_id;
if (level_id == 4 && direction == 2) return city_id + "," + area_id;
return null;
}
}

@ -89,9 +89,7 @@
#if(keyword)
and t2.org_name like #para(keyword, "like")
#end
#if(ancestorList)
and t4.bureau_id in #para(ancestorList, "in")
#end
and t4.bureau_id=#para(creatorBureauId)
order by t1.status_code desc,t2.org_name
#end
@ -105,9 +103,7 @@
#if(keyword)
and t2.person_name like #para(keyword, "like")
#end
#if(ancestorList)
and t4.bureau_id in #para(ancestorList, "in")
#end
and t4.bureau_id=#para(creatorBureauId)
order by t1.status_code desc,t2.person_name
#end

Loading…
Cancel
Save