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

src/main/java/com/dsideal/QingLong/Zjcq/Controller/ZjcqController.java

@@ -92,6 +92,21 @@ public class ZjcqController extends Controller {
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
+    /**
+     * 功能：删除验收
+     *
+     * @param ys_id
+     */
+    @Before({POST.class})
+    @IsLoginInterface({})
+    public void delYs(int ys_id) {
+        zm.delYs(ys_id);
+        Kv kv = Kv.create();
+        kv.set("success", true);
+        kv.set("message", "保存成功！");
+        renderJson(kv);
+    }
+
     /**
      * 功能：导入Docx
      *

src/main/java/com/dsideal/QingLong/Zjcq/Model/ZjcqModel.java

@@ -1,5 +1,8 @@
 package com.dsideal.QingLong.Zjcq.Model;
 
+import com.dsideal.QingLong.Interceptor.IsLoginInterface;
+import com.jfinal.aop.Before;
+import com.jfinal.ext.interceptor.POST;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
@@ -35,7 +38,7 @@ public class ZjcqModel {
             Db.save("t_zhuanjia_record_detail", "ys_id,person_id", r);
         }
         sql = "update t_zhuanjia_record set is_finish=1,person_count=? where ys_id=?";
-        Db.update(sql,  person_ids.split(",").length,ys_id);
+        Db.update(sql, person_ids.split(",").length, ys_id);
     }
 
     /**
@@ -80,4 +83,16 @@ public class ZjcqModel {
         }
         return list;
     }
+
+    /**
+     * 功能：删除验收
+     *
+     * @param ys_id
+     */
+    public void delYs(int ys_id) {
+        String sql = "delete from t_zhuanjia_record where ys_id=?";
+        Db.update(sql, ys_id);
+        sql = "delete from t_zhuanjia_record_detail where ys_id=?";
+        Db.update(sql, ys_id);
+    }
 }