'commit'

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

@@ -1554,7 +1554,15 @@ public class CollectController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"job_id"})
     public void setForwardFinish(int job_id) {
-        cm.setForwardFinish(job_id);
+        //操作人员
+        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.setForwardFinish(job_id, bureau_id);
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");

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

@@ -1601,9 +1601,9 @@ public class CollectModel {
      *
      * @param job_id 任务ID
      */
-    public void setForwardFinish(int job_id) {
-        String sql = "update t_collect_job_target set forward_progress=2,forward_finish_time=now() where job_id=?";
-        Db.update(sql, job_id);
+    public void setForwardFinish(int job_id,String bureau_id) {
+        String sql = "update t_collect_job_target set forward_progress=2,forward_finish_time=now() where job_id=? and bureau_id=?";
+        Db.update(sql, job_id,bureau_id);
     }
 
     /**

src/main/resource/Sql/Collect.sql

@@ -6,8 +6,8 @@
         (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.fill_type_id in (1,3)) as total_count,
         (select count(1) from t_collect_job_sheet as t2 where t2.job_id=t1.job_id and t2.is_check=1) as already_check_sheet,
         (select count(1) from t_collect_job_sheet as t2 where t2.job_id=t1.job_id) as all_sheet,
-        (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.fill_type_id in (2,3) and t2.forward_progress=2) as forward_finish_count, --转发完成数量
-        (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.fill_type_id in (2,3)) as forward_count --转发数量
+        (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.forward_progress in (0,1,2)) as forward_count, --转发数量
+        (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.forward_progress=2)  as forward_finish_count --转发完成数量
         from t_collect_job as t1 where publish_role_id = #para(publish_role_id)
         #if(job_name)
             and t1.job_name like #para(job_name, "like")