From 84d046dcb8a9c102fe207bf7fb13d467f1daa2ae Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sun, 23 Jul 2023 10:06:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tktj/controller/KcTingkeController.java | 37 ++++++++++++++++--- .../kc/tktj/mapper/KcTingkeMapper.java | 1 + .../kc/tktj/mapper/xml/KcTingkeMapper.xml | 11 ++++++ .../kc/tktj/service/IKcTingkeService.java | 2 + .../service/impl/KcTingkeServiceImpl.java | 5 +++ 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java index dacd5847..962a3e73 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.beust.jcommander.internal.Sets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -35,12 +36,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; - /** +/** * @Description: kc_tingke * @Author: jeecg-boot * @Date: 2023-03-29 @@ -475,5 +473,34 @@ public class KcTingkeController extends JeecgController getUserTingkeInfo(KcTingke kcTingke, + HttpServletRequest req) { + KcXqxnHistory common = changeTingKeTongJi.getXqConfig(null); + KcTingke kcTingkePar = new KcTingke(); + if(common != null) { + //清洗数据核心 + Date startSjDate = common.getStartTime(); + Date endSjDate = common.getEndTime(); + String startSj = DateUtil.format(startSjDate, DatePattern.NORM_DATETIME_FORMAT); + String endSj = DateUtil.format(endSjDate, DatePattern.NORM_DATETIME_FORMAT); + QueryWrapper evaQw = new QueryWrapper<>(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if("admin".equals(sysUser.getUsername())){ + sysUser.setUsername("2016900057"); + } + kcTingke.setUserid(sysUser.getUsername()); + kcTingke.setStartTime(startSj.substring(0,10)); + kcTingke.setEndTime(endSj.substring(0,10)); + List countTjList = kcTingkeService.getUserTingkeInfo(kcTingke); + if(countTjList!=null&&countTjList.size()>0){ + kcTingkePar = countTjList.get(0); + } + + } + return Result.OK(kcTingkePar); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java index 40d3c580..fefd767b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java @@ -47,4 +47,5 @@ public interface KcTingkeMapper extends BaseMapper { IPage> keTangList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List getUserTingkeInfo(KcTingke kcTingke); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml index da2321d0..d42c4526 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -896,4 +896,15 @@ + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java index ae9161dd..aa817327 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java @@ -46,4 +46,6 @@ public interface IKcTingkeService extends IService { IPage> keTangList(Page page, QueryWrapper queryWrapper); + + List getUserTingkeInfo(KcTingke kcTingke); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java index 837b2d12..ec4d9715 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java @@ -87,4 +87,9 @@ public class KcTingkeServiceImpl extends ServiceImpl i public IPage> keTangList(Page page, QueryWrapper queryWrapper) { return baseMapper.keTangList(page,queryWrapper); } + + @Override + public List getUserTingkeInfo(KcTingke kcTingke) { + return baseMapper.getUserTingkeInfo(kcTingke); + } }