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

src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java

@@ -106,6 +106,20 @@ public class YpController extends Controller {
         renderJson(kv);
     }
 
+    /**
+     * 功能：停止任务
+     *
+     * @param task_id
+     */
+    @Before(POST.class)
+    @IsNumericInterface({"task_id"})
+    public void stopTask(int task_id) {
+        model.stopTask(task_id);
+        Kv kv = Kv.by("success", true);
+        kv.set("message", "保存成功！");
+        renderJson(kv);
+    }
+
     /**
      * 功能：根据身份证号计算班型
      * 身份证号生成器：http://www.chineseidcard.com/?region=110101&birthday=20210307&sex=1&num=5&r=28
@@ -179,18 +193,18 @@ public class YpController extends Controller {
      * 功能：导出excel
      *
      * @param task_id
-     * @param bx_id
+     * @param bx_id 0:全部，否则指定的班型ID
      */
     @Before(GET.class)
     @IsNumericInterface({"task_id", "page", "limit"})
-    public void exportExcel(int task_id, int bx_id) {
+    public void exportExcel(int task_id,int bx_id) {
         //模板文件
         String excelPath = PathKit.getRootClassPath() + PropKit.get("excelExportTemplatePathSuffix").replace("\\", "/");
         String filePath = excelPath + "YangPuZhaoShengExcel.json";
         //转成 json对象
         JSONObject jo = FileUtil.readJsonFile(filePath);
         //导出
-        Page<Record> rs = model.getTaskInfo(task_id, bx_id, 1, 99999);
+        Page<Record> rs = model.getTaskInfo(task_id, bx_id,1, 99999);
         String excelFile = excelPath + "excelTemp/" + UUID.randomUUID().toString().toUpperCase() + ".xls";
         ExcelExportUtil.export(rs, jo, excelFile);
         //提供下载
@@ -275,4 +289,14 @@ public class YpController extends Controller {
         kv.set("message", "保存成功！");
         renderJson(kv);
     }
+
+    /**
+    功能：获取指定任务下的班型选择情况
+     */
+    @Before(GET.class)
+    @IsNumericInterface({"task_id"})
+    public void getBx(int task_id) {
+        List<Record> list = model.getBx(task_id);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
 }

src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java

@@ -9,7 +9,9 @@ import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.SqlPara;
 
 import java.util.Calendar;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class YpModel {
 
@@ -84,10 +86,33 @@ public class YpModel {
      * @param task_id
      */
     public void startTask(int task_id) {
-        String sql = "update t_yp_task set b_use=1,is_run=1 where task_id=?";
+        String sql = "update t_yp_task set is_run=0 where is_run=1";
+        Db.update(sql);
+        sql = "update t_yp_task set b_use=1,is_run=1 where task_id=?";
         Db.update(sql, task_id);
     }
 
+    /**
+     * 功能：停止任务
+     *
+     * @param task_id
+     */
+    public void stopTask(int task_id) {
+        String sql = "update t_yp_task set is_run=0 where task_id=?";
+        Db.update(sql, task_id);
+    }
+
+    /**
+     * 功能：获取全局所有班型
+     *
+     * @return
+     */
+    public List<Record> getAllBx() {
+        String sql = "select * from t_yp_bx where b_use=1";
+        List<Record> list = Db.find(sql);
+        return list;
+    }
+
     /**
      * 功能：根据身份证号计算班型
      *
@@ -102,9 +127,7 @@ public class YpModel {
         }
         //解析出出生日期
         String birth = IdcardUtil.getBirthByIdCard(sfzh);
-
-        String sql = "select * from t_yp_bx where b_use=1";
-        List<Record> list = Db.find(sql);
+        List<Record> list = getAllBx();
 
         //当前年份
         Calendar calendar = Calendar.getInstance();
@@ -208,6 +231,7 @@ public class YpModel {
     public Page<Record> getTaskInfo(int task_id, int bx_id, int page, int limit) {
         Kv kv = Kv.by("task_id", task_id);
         kv.set("bx_id", bx_id);
+        if (bx_id > 0) kv.set("bx_id", bx_id);
         SqlPara sqlPara = Db.getSqlPara("yp.getTaskInfo", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;
@@ -231,4 +255,29 @@ public class YpModel {
         String sql = "delete from t_yp_task_bx_limit where task_id=? and bx_id=?";
         Db.update(sql, task_id, bx_id);
     }
+
+    /**
+     * 功能：获取指定任务下的班型选择情况
+     *
+     * @param task_id
+     * @return
+     */
+    public List<Record> getBx(int task_id) {
+        List<Record> all = getAllBx();
+        //本次任务的班型
+        String sql = "select * from t_yp_task_bx_limit where task_id=?";
+        List<Record> list = Db.find(sql, task_id);
+        Set<Integer> set = new HashSet<>();
+        for (Record record : list) {
+            set.add(record.getInt("bx_id"));
+        }
+        for (Record record : all) {
+            if (set.contains(record.getInt("bx_id"))) {
+                record.set("selected", true);
+            } else {
+                record.set("selected", false);
+            }
+        }
+        return all;
+    }
 }

src/main/resource/Sql/yp.sql

@@ -1,7 +1,12 @@
--- 应用接入命名空间
-#namespace("yp")
-  #sql("getTaskInfo")
-    select * from t_yp_record where task_id=#para(task_id) and bx_id=#para(bx_id)
-  #end
-
+-- 应用接入命名空间
+#namespace("yp")
+  #sql("getTaskInfo")
+    select t1.*,t2.bx_name from t_yp_record as t1 inner join t_yp_bx as t2 on t1.bx_id=t2.bx_id
+    where t1.task_id=#para(task_id)
+    #if(bx_id)
+        and  t1.bx_id=#para(bx_id)
+    #end
+    order by t1.bx_id
+  #end
+
 #end

target/classes/Sql/yp.sql

@@ -1,7 +1,12 @@
 -- 应用接入命名空间
 #namespace("yp")
   #sql("getTaskInfo")
-    select * from t_yp_record where task_id=#para(task_id) and bx_id=#para(bx_id)
+    select t1.*,t2.bx_name from t_yp_record as t1 inner join t_yp_bx as t2 on t1.bx_id=t2.bx_id
+    where t1.task_id=#para(task_id)
+    #if(bx_id)
+        and  t1.bx_id=#para(bx_id)
+    #end
+    order by t1.bx_id
   #end
 
 #end