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

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

@@ -840,10 +840,10 @@ public class CollectController extends Controller {
      */
     @Before({GET.class})
     @IsLoginInterface({})
-    @IsNumericInterface({"job_id"})
+    @IsNumericInterface({"job_id","status_code"})
     @EmptyInterface({"target_id"})
-    public void getJob(int job_id, String target_id) {
-        Record record = cm.getJob(job_id, target_id);
+    public void getJob(int job_id, String target_id,int status_code) {
+        Record record = cm.getJob(job_id, target_id,status_code);
         renderJson(record);
     }
 

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -266,9 +266,9 @@ public class CollectModel {
         return Db.findFirst(sql, job_id);
     }
 
-    public Record getJob(int job_id, String target_id) {
-        String sql = "select * from t_collect_job as t1 inner join t_collect_job_target as t2 on t1.job_id=t2.job_id where t1.job_id=? and t2.target_id=?";
-        return Db.findFirst(sql, job_id, target_id);
+    public Record getJob(int job_id, String target_id, int status_code) {
+        String sql = "select * from t_collect_job as t1 inner join t_collect_job_target as t2 on t1.job_id=t2.job_id where t1.job_id=? and t2.target_id=? and t2.status_code=?";
+        return Db.findFirst(sql, job_id, target_id, status_code);
     }
 
 
@@ -1655,9 +1655,9 @@ public class CollectModel {
         //保存原始JSON数据+修改完成标识
         sql = "update t_collect_job_target set form_fill_json=?,fill_time=now(),status_code=? where job_id=? and target_id=? and status_code=?";
         if (target_type_id == 1) {
-            Db.update(sql, json, getNextStausCode(status_code), job_id, bureau_id,status_code);
+            Db.update(sql, json, getNextStausCode(status_code), job_id, bureau_id, status_code);
         } else {
-            Db.update(sql, json, getNextStausCode(status_code), job_id, person_id,status_code);
+            Db.update(sql, json, getNextStausCode(status_code), job_id, person_id, status_code);
         }
 
         //保存多选结果