diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 4adb2744..890cafc8 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -1198,36 +1198,6 @@ public class CollectController extends Controller { renderJson(map); } - /** - * 功能:填报者保存填报结果 - * - * @param job_id - * @param json - */ - @Before({POST.class, RepeatIntercetpor.class}) - @IsLoginInterface({}) - @IsNumericInterface({"job_id"}) - @EmptyInterface({"json"}) - public void saveFormJob(int job_id, String json) { - //操作人员 - String person_id = SessionKit.get(getRequest(), getResponse(), "person_id"); - //根据人员ID,获取人员所在的单位ID - LoginPersonModel personModel = new LoginPersonModel(); - Record rs = personModel.getLoginInfoByPersonId(person_id); - String bureau_id = rs.get("bureau_id"); - String person_name = rs.getStr("person_name");//人员姓名 - String bureau_name = bm.getOrgInfoById(bureau_id).getStr("org_name");//单位名称 - String s_class_id = rs.getStr("s_class_id"); - cm.saveFormJob(job_id, bureau_id, bureau_name, s_class_id, person_id, person_name, json); - //回写完成标记 - cm.writeJobFinish(job_id, bureau_id, null); - - Map map = new HashMap<>(); - map.put("success", true); - map.put("message", "保存成功!"); - map.put("job_id", job_id); - renderJson(map); - } /** * 功能:获取指定任务指定单位的填报内容 @@ -1673,6 +1643,26 @@ public class CollectController extends Controller { renderJson(kvCheck); } + + /** + * 功能:查看我该填报或者我已填报的任务列表(人员) + * + * @param keyword 关键字 + * @param is_finish 是不是已完成填报 + * @param page 第几页 + * @param limit 每页多少个 + */ + @Before({GET.class}) + @IsLoginInterface({}) + @IsNumericInterface({"is_finish"}) + @LayUiPageInfoInterface({"page", "limit"}) + public void viewJobListPerson(String keyword, int is_finish, int page, int limit) { + //操作人员 + String person_id = SessionKit.get(getRequest(), getResponse(), "person_id"); + Page list = cm.viewJobListPerson(person_id, keyword, is_finish, page, limit); + renderJson(CommonUtil.renderJsonForLayUI(list)); + } + /*****↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/ /** 以下接口,用于发布到人员的任务,获取选择单位内部门、班级、人员、年级等功能,为了以后与天喻对接,全新实现,方便以后调整*/ @@ -1834,21 +1824,34 @@ public class CollectController extends Controller { } /** - * 功能:查看我该填报或者我已填报的任务列表(人员) + * 功能:填报者保存填报结果 * - * @param keyword 关键字 - * @param is_finish 是不是已完成填报 - * @param page 第几页 - * @param limit 每页多少个 + * @param job_id + * @param json */ - @Before({GET.class}) + @Before({POST.class, RepeatIntercetpor.class}) @IsLoginInterface({}) - @IsNumericInterface({"is_finish"}) - @LayUiPageInfoInterface({"page", "limit"}) - public void viewJobListPerson(String keyword, int is_finish, int page, int limit) { + @IsNumericInterface({"job_id"}) + @EmptyInterface({"json"}) + public void saveFormJob(int job_id, String json) { //操作人员 String person_id = SessionKit.get(getRequest(), getResponse(), "person_id"); - Page list = cm.viewJobListPerson(person_id, keyword, is_finish, page, limit); - renderJson(CommonUtil.renderJsonForLayUI(list)); + //根据人员ID,获取人员所在的单位ID + LoginPersonModel personModel = new LoginPersonModel(); + Record rs = personModel.getLoginInfoByPersonId(person_id); + String bureau_id = rs.get("bureau_id"); + String person_name = rs.getStr("person_name");//人员姓名 + String bureau_name = bm.getOrgInfoById(bureau_id).getStr("org_name");//单位名称 + String s_class_id = rs.getStr("s_class_id"); + cm.saveFormJob(job_id, bureau_id, bureau_name, s_class_id, person_id, person_name, json); + //回写完成标记 + cm.writeJobFinish(job_id, bureau_id, null); + + Map map = new HashMap<>(); + map.put("success", true); + map.put("message", "保存成功!"); + map.put("job_id", job_id); + renderJson(map); } + }