From a6742849b233ea59c838a925c29c209f1f3145f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 9 Oct 2024 09:58:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=9C=8B=E6=9D=BF=E8=80=83?= =?UTF-8?q?=E5=8B=A4=202.=E8=B0=83=E6=95=B4=E7=9C=8B=E6=9D=BF=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9=203.=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E7=9C=8B=E6=9D=BF=E6=91=84=E5=83=8F=E5=A4=B4=E5=B1=95?= =?UTF-8?q?=E7=A4=BA,=E6=94=B9=E4=B8=BA=E5=9C=A8=E5=BB=BA=E8=88=B9?= =?UTF-8?q?=E5=8F=AA=E8=BF=9B=E5=BA=A6=204.=E5=A2=9E=E5=8A=A0=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/kban/KbanController.java | 24 ++++++++++++++++--- .../dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java | 2 ++ .../dsic/gj_erp/service/zyjh/ZyjhService.java | 17 ++++++++++++- .../resources/mappers/jhgk/DmYdjhMapper.xml | 13 ++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java index eb3d562..68daf7f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java +++ b/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 ryList=cqService.list(Wrappers.lambdaQuery() + .isNotNull(DmBzry::getUserCode).isNotNull(DmBzry::getZt)); + Map 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); } } diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java index 141f03c..916e7e8 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java @@ -47,4 +47,6 @@ public interface DmYdjhMapper extends BaseMapper { List> gyfcl(); List> gxjhwcqk(String from,String to); + + List> gcjd(List czbh); } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 8c0d73a..336fa69 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/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 { + private final DmCbxxpService dmCbxxpService; + + + public List> gcjd(){ + ImmutableMap map = ImmutableMap.of("flag", true); + List list = dmCbxxpService.getList(map); + List czbhList=list.stream().map(DmCbxxp::getCbmc).collect(Collectors.toList()); + return baseMapper.gcjd(czbhList); + } + public List> gxjhwcqk(){ DateTime date = DateUtil.lastMonth(); String from= DateUtil.beginOfMonth(date).toString("yyyy/MM/dd"); diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index fb7f656..c13870b 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -684,6 +684,19 @@ where dm_ydjh.qgrq BETWEEN #{begin} and #{end} + + update pgd_tzjh set zt='01'