From e06ba6777eb5c9aaae9769b89b4bd90d764df520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 26 Jan 2024 16:30:31 +0800 Subject: [PATCH 1/2] 'commit' --- .../Collect/Controller/CollectController.java | 18 ++++++++++++------ .../QingLong/Collect/Model/CollectModel.java | 6 +++--- 2 files changed, 15 insertions(+), 9 deletions(-) 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 7d69c382..aa81cddb 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -855,10 +855,16 @@ public class CollectController extends Controller { */ @Before({POST.class, RepeatIntercetpor.class}) @IsLoginInterface({}) - @IsNumericInterface({"job_id"}) + @IsNumericInterface({"job_id","status_code"}) @EmptyInterface({"deadline_time"}) - public void extensionJob(int job_id, String deadline_time) throws ParseException { - cm.extensionJob(job_id, deadline_time); + public void extensionJob(int job_id, String deadline_time, int status_code) throws ParseException { + //操作人员 + 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"); + cm.extensionJob(job_id, deadline_time, bureau_id, status_code); Map map = new HashMap<>(); map.put("success", true); map.put("message", "保存成功!"); @@ -891,8 +897,8 @@ public class CollectController extends Controller { */ @Before({GET.class}) @IsLoginInterface({}) - @IsNumericInterface({"job_id", "type_id","status_code"}) - public void getJobBureauFillInfo(int job_id, String bureau_id, int type_id,int status_code) throws Exception { + @IsNumericInterface({"job_id", "type_id", "status_code"}) + public void getJobBureauFillInfo(int job_id, String bureau_id, int type_id, int status_code) throws Exception { if (StrKit.isBlank(bureau_id)) { //操作人员 String person_id = SessionKit.get(getRequest(), getResponse(), "person_id"); @@ -911,7 +917,7 @@ public class CollectController extends Controller { String pdfName = job_name + "【" + bureau_name + "】"; //1、找到upload_excel_filename_user - Record record = cm.viewFilledJob(job_id, bureau_id,status_code); + Record record = cm.viewFilledJob(job_id, bureau_id, status_code); String upload_excel_filename_user = record.getStr("upload_excel_filename_user"); if (StrKit.isBlank(upload_excel_filename_user)) { Kv kv = Kv.by("success", false); diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 975b5828..0a57d7b0 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -1328,10 +1328,10 @@ public class CollectModel { * * @param job_id 任务号 */ - public void extensionJob(int job_id, String deadline_time) throws ParseException { - String sql = "update t_collect_job set deadline_time=? where job_id=?"; + public void extensionJob(int job_id, String deadline_time, String bureau_id, int status_code) throws ParseException { + String sql = "update t_collect_job_target set deadline_time=? where job_id=? and bureau_id=? and status_code=?"; Date date = dateFormat.parse(deadline_time); - Db.update(sql, date, job_id); + Db.update(sql, date, job_id, bureau_id, status_code); } /** From 8832efa0c366e27803fab73b1d54dbee038f34ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 26 Jan 2024 16:35:33 +0800 Subject: [PATCH 2/2] 'commit' --- .../QingLong/Collect/Controller/CollectController.java | 6 +++--- .../com/dsideal/QingLong/Collect/Model/CollectModel.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 aa81cddb..41e2d782 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -855,16 +855,16 @@ public class CollectController extends Controller { */ @Before({POST.class, RepeatIntercetpor.class}) @IsLoginInterface({}) - @IsNumericInterface({"job_id","status_code"}) + @IsNumericInterface({"job_id"}) @EmptyInterface({"deadline_time"}) - public void extensionJob(int job_id, String deadline_time, int status_code) throws ParseException { + public void extensionJob(int job_id, String deadline_time) throws ParseException { //操作人员 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"); - cm.extensionJob(job_id, deadline_time, bureau_id, status_code); + cm.extensionJob(job_id, deadline_time, bureau_id); Map map = new HashMap<>(); map.put("success", true); map.put("message", "保存成功!"); diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 0a57d7b0..07e166bc 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -1328,10 +1328,10 @@ public class CollectModel { * * @param job_id 任务号 */ - public void extensionJob(int job_id, String deadline_time, String bureau_id, int status_code) throws ParseException { - String sql = "update t_collect_job_target set deadline_time=? where job_id=? and bureau_id=? and status_code=?"; + public void extensionJob(int job_id, String deadline_time, String bureau_id) throws ParseException { + String sql = "update t_collect_job_target set deadline_time=? where job_id=? and bureau_id=?"; Date date = dateFormat.parse(deadline_time); - Db.update(sql, date, job_id, bureau_id, status_code); + Db.update(sql, date, job_id, bureau_id); } /**