1.调整看板考勤

2.调整看板底部展示内容
3.取消看板摄像头展示,改为在建船只进度
4.增加看板左侧菜单

src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java

@@ -1,7 +1,14 @@
 package com.dsic.gj_erp.controller.kban;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmBzry;
+import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import com.dsic.gj_erp.service.jcsj.DmBzryService;
+import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.zyjh.ZyjhService;
+import com.google.common.collect.ImmutableMap;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +24,15 @@ import java.util.Map;
 public class KbanController {
 
     private final ZyjhService zyjhService;
+    private final DmBzryService cqService;
+
+    /**
+     * 在建船只,各船只进度
+     */
+    @GetMapping("gcjd")
+    public ResultBean<?> gcjd(){
+        return new ResultBean<>(zyjhService.gcjd());
+    }
 
     /**
      * 各垮计划完成情况
@@ -56,10 +72,12 @@ public class KbanController {
      */
     @GetMapping("kq")
     public ResultBean<?> kq(){
+        List<DmBzry> ryList=cqService.list(Wrappers.<DmBzry>lambdaQuery()
+                .isNotNull(DmBzry::getUserCode).isNotNull(DmBzry::getZt));
+
         Map<String,Object> map=new HashMap<>();
-        map.put("出勤",283);
-        map.put("请假",15);
-        map.put("缺勤",2);
+        map.put("total",ryList.size());
+        map.put("rows",ryList);
         return new ResultBean<>(map);
     }
 }

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java

@@ -47,4 +47,6 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
   List<Map<String,Object>> gyfcl();
 
   List<Map<String,Object>> gxjhwcqk(String from,String to);
+
+  List<Map<String,Object>> gcjd(List<String> czbh);
 }

src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java

@@ -3,21 +3,36 @@ package com.dsic.gj_erp.service.zyjh;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao;
 import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
+import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
+import com.google.common.collect.ImmutableMap;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
+@AllArgsConstructor
 public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
+    private final DmCbxxpService dmCbxxpService;
+
+
+    public List<Map<String, Object>> gcjd(){
+        ImmutableMap<String, Boolean> map = ImmutableMap.of("flag", true);
+        List<DmCbxxp> list = dmCbxxpService.getList(map);
+        List<String> czbhList=list.stream().map(DmCbxxp::getCbmc).collect(Collectors.toList());
+        return baseMapper.gcjd(czbhList);
+    }
+
     public List<Map<String, Object>> gxjhwcqk(){
         DateTime date = DateUtil.lastMonth();
         String from= DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -684,6 +684,19 @@
         where dm_ydjh.qgrq BETWEEN #{begin} and #{end}
     </select>
 
+    <select id="gcjd" resultType="java.util.Map">
+        SELECT
+            DISTINCT dc_ch ,
+            SUM(1) over(PARTITION by dc_ch) total,
+            SUM(CASE isnull(qgfkrq,'') WHEN '' then 0 else 1 end) over(PARTITION by dc_ch) complete
+        from
+            dm_ydjh where dc_ch in
+            <foreach collection="czbh" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        order by dc_ch
+    </select>
+
     <update id="xfbc"  parameterType="arraylist">
         update pgd_tzjh
         set zt='01'