From 9803a552ad6a07ddb30558dc3b536025ca6f0fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 28 Oct 2024 15:12:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B7=A5=E5=8E=82=E6=97=A5=E5=8E=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=8F=AD=E6=AC=A1=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java     |  2 +-
 .../gj_erp/controller/jcsj/EmGcrlController.java   | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
index bb45952..4765d93 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
@@ -60,7 +60,7 @@ public class EmGcrl implements Serializable {
     @ApiModelProperty(value = "最近的工作日")
     private String    gzr;
 
-    @ApiModelProperty(value = "排班:1:早;2:晚班;3:双班")
+    @ApiModelProperty(value = "排班:0:白班;1:二班;2:夜班;3:双班")
     private String pb;
 
     private Double bbgs=7.0;
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java
index 55aa61e..e55f881 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java
@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.controller.jcsj;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -39,11 +40,18 @@ public class EmGcrlController {
         List<EmGcrl> emGcrls=emGcrlService.list(new QueryWrapper<EmGcrl>().orderByAsc("gl"));
         Map<String,List<EmGcrl>> years= emGcrls.stream().collect(Collectors.groupingBy(EmGcrl::getNf));
         List<String> restDays= emGcrls.stream().filter(l->l.getXxr().equals("0")).map(EmGcrl::getGl).collect(Collectors.toList());
+        //排班数据
+        List<String> eb=emGcrls.stream().filter(l->"1".equals(l.getPb())).map(EmGcrl::getGl).collect(Collectors.toList());
+        List<String> sb=emGcrls.stream().filter(l->"3".equals(l.getPb())).map(EmGcrl::getGl).collect(Collectors.toList());
+        List<String> yb=emGcrls.stream().filter(l->"2".equals(l.getPb())).map(EmGcrl::getGl).collect(Collectors.toList());
         int nextYear=Integer.parseInt(emGcrls.get(emGcrls.size()-1).getNf())+1;
         Map map=new HashMap();
         map.put("years",years.keySet());
         map.put("restDays",restDays);
         map.put("nextYear",nextYear);
+        map.put("eb",eb);
+        map.put("yb",yb);
+        map.put("sb",sb);
         return new ResultBean(map);
     }
 
@@ -51,7 +59,11 @@ public class EmGcrlController {
     @ApiOperation(value = "批量修改")
     @PostMapping(value = "/update")
     public ResultBean update(@RequestBody EmGcrl emGcrl) {
-        emGcrlService.update(new UpdateWrapper<EmGcrl>().set("xxr",emGcrl.getXxr()).eq("gl",emGcrl.getGl()));
+        emGcrlService.update(new UpdateWrapper<EmGcrl>()
+                .set(StrUtil.isNotEmpty(emGcrl.getXxr()),"xxr",emGcrl.getXxr())
+                .set(StrUtil.isNotEmpty(emGcrl.getPb()),"pb",emGcrl.getPb())
+                .eq("gl",emGcrl.getGl())
+        );
 
         return new ResultBean();
     }