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

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

@@ -483,14 +483,14 @@ public class CollectController extends Controller {
         ZipSecureFile.setMinInflateRatio(-1.0d);
         UploadFile excelFile = getFile();//得到文件对象
         int job_id = getInt("job_id");
-        int status_code = getInt("status_code");
-        if (status_code == 0) {
+        if (get("status_code") == null) {
             Kv kv = Kv.create();
             kv.set("success", false);
             kv.set("message", "status_code必须是4位整数！");
             renderJson(kv);
             return;
         }
+        int status_code = getInt("status_code");
         //操作人员
         String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
         //根据人员ID，获取人员所在的单位ID
@@ -891,8 +891,8 @@ public class CollectController extends Controller {
      */
     @Before({GET.class})
     @IsLoginInterface({})
-    @IsNumericInterface({"job_id", "type_id"})
-    public void getJobBureauFillInfo(int job_id, String bureau_id, int type_id) 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 +911,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);
+        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);
@@ -981,7 +981,7 @@ public class CollectController extends Controller {
         LoginPersonModel personModel = new LoginPersonModel();
         Record rs = personModel.getLoginInfoByPersonId(person_id);
         String bureau_id = rs.get("bureau_id");
-        Page<Record> list = cm.viewJob(job_id,bureau_id, keyword, status_codes, self_or_next, page, limit);
+        Page<Record> list = cm.viewJob(job_id, bureau_id, keyword, status_codes, self_or_next, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -1009,7 +1009,7 @@ public class CollectController extends Controller {
         //获取登录人员第一个发布任务的角色是什么
         int publish_role_id = kvCheck.getInt("publish_role_id");
 
-        Page<Record> list = cm.viewJobList(publish_role_id,bureau_id, keyword, status_codes, page, limit);
+        Page<Record> list = cm.viewJobList(publish_role_id, bureau_id, keyword, status_codes, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -733,9 +733,9 @@ public class CollectModel {
      * @param target_id
      * @return
      */
-    public Record viewFilledJob(int job_id, String target_id) {
-        String sql = "select * from t_collect_job_target where job_id=? and target_id=?";
-        return Db.findFirst(sql, job_id, target_id);
+    public Record viewFilledJob(int job_id, String target_id, int status_code) {
+        String sql = "select * from t_collect_job_target where job_id=? and target_id=? and status_code=?";
+        return Db.findFirst(sql, job_id, target_id, status_code);
     }