Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -858,7 +858,13 @@ public class CollectController extends Controller {
     @IsNumericInterface({"job_id"})
     @EmptyInterface({"deadline_time"})
     public void extensionJob(int job_id, String deadline_time) throws ParseException {
-        cm.extensionJob(job_id, deadline_time);
+        //操作人员
+        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);
         Map<String, Object> 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);

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) 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);
+        Db.update(sql, date, job_id, bureau_id);
     }
 
     /**