From 91a6f03f5da3098092540fb8635a56675cdf2f2a Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Tue, 20 Jun 2023 04:00:23 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8820=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SyncTingKeTongJi.java | 23 +++++- .../tools/ChangeTingKeTongJi.java | 17 ++++- .../qa/controller/KcEvaluationController.java | 20 ++--- .../tktj/controller/KcTingkeController.java | 75 ++++++++++++++----- .../modules/kc/tktj/entity/KcTingke.java | 5 ++ .../kc/tktj/mapper/KcTingkeMapper.java | 6 +- .../kc/tktj/mapper/xml/KcTingkeMapper.xml | 55 ++++++++++++++ .../kc/tktj/service/IKcTingkeService.java | 6 +- .../service/impl/KcTingkeServiceImpl.java | 9 ++- 9 files changed, 176 insertions(+), 40 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTingKeTongJi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTingKeTongJi.java index 6a554df4..eccdebf1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTingKeTongJi.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTingKeTongJi.java @@ -13,6 +13,8 @@ import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService; +import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; +import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService; import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; import org.jeecg.modules.kc.qa.entity.KcEvaluation; @@ -37,7 +39,8 @@ public class SyncTingKeTongJi extends BaseSync { @Autowired private ChangeTingKeTongJi changeTingKeTongJi; - //----------------------------------旧系统------------------------------------------ + @Autowired + private IKcXqxnHistoryService kcXqxnHistoryService; /** * 若参数变量名修改 QuartzJobController中也需对应修改 @@ -57,12 +60,28 @@ public class SyncTingKeTongJi extends BaseSync { */ public void run(Map param){ String xqxn = ""; + boolean isAll = false; if(param != null){ if(param.containsKey("xqxn")){ xqxn = (String)param.get("xqxn"); } + if(param.containsKey("isAll")){ + String isAllStr = (String)param.get("isAll"); + if(StringUtils.isNotBlank(isAllStr)){ + isAll = Boolean.parseBoolean(isAllStr); + } + } + } + if(isAll){ + QueryWrapper qw = new QueryWrapper<>(); + qw.orderByDesc("end_time"); + List list = kcXqxnHistoryService.list(qw); + list.forEach(x -> { + changeTingKeTongJi.changeTingKeTongji(x.getTitle()); + }); + }else{ + changeTingKeTongJi.changeTingKeTongji(xqxn); } - changeTingKeTongJi.changeTingKeTongji(xqxn); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java index 68149935..b287696a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java @@ -120,12 +120,23 @@ public class ChangeTingKeTongJi { QueryWrapper evaQw = new QueryWrapper<>(); evaQw.select("count(userid) as pkNum,userid"); + + evaQw.apply("(tingketime,kechengbiaoid,userid) in ( select max(tingketime) as tingketime,kechengbiaoid,userid from kc_tingke where true "+ + "and tingketime >= STR_TO_DATE( '"+ startSj +"', '%Y-%m-%d' ) "+ + "AND tingketime <= STR_TO_DATE( '" + endSj +"', '%Y-%m-%d' ) "+ + "and kechengbiaoid is not null "+ + "GROUP BY userid, kechengbiaoid "+ + "ORDER BY tingketime desc "+ + ")" + ); + evaQw.eq(StringUtils.isNotBlank(userId),"userid",userId); - evaQw.apply("tingketime >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); - evaQw.apply("tingketime <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); - evaQw.isNotNull("kechengbiaoid"); +// evaQw.apply("tingketime >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); +// evaQw.apply("tingketime <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); + //evaQw.isNotNull("kechengbiaoid"); evaQw.groupBy("userid"); evaQw.orderByAsc("tingketime"); + List countTjList = kcTingkeService.list(evaQw); //Map countTj = Maps.newHashMap(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java index 9adf6f83..65cb80ed 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java @@ -83,16 +83,16 @@ public class KcEvaluationController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluation, req.getParameterMap()); if(StringUtils.isNotBlank(kcEvaluation.getXnxq())){ - KcXqxnHistory common = changeTingKeTongJi.getXqConfig(); + KcXqxnHistory common = changeTingKeTongJi.getXqConfig(kcEvaluation.getXnxq()); 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); String xqxn = common.getTitle(); - if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){ - queryWrapper.apply("up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); - queryWrapper.apply("up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); - } +// if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){ + queryWrapper.apply("up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); + queryWrapper.apply("up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); +// } } Page page = new Page(pageNo, pageSize); @@ -118,16 +118,16 @@ public class KcEvaluationController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap()); if(StringUtils.isNotBlank(kcEvaluation.getXnxq())){ - KcXqxnHistory common = changeTingKeTongJi.getXqConfig(); + KcXqxnHistory common = changeTingKeTongJi.getXqConfig(kcEvaluation.getXnxq()); 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); String xqxn = common.getTitle(); - if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){ - queryWrapper.apply("a.up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); - queryWrapper.apply("a.up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); - } +// if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){ + queryWrapper.apply("a.up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); + queryWrapper.apply("a.up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); +// } } queryWrapper.isNotNull("a.minkcid"); Page page = new Page(pageNo, pageSize); 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 b0fa94db..dacd5847 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 @@ -1,32 +1,29 @@ package org.jeecg.modules.kc.tktj.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import cn.hutool.core.date.DatePattern; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; +import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; import org.jeecg.modules.kc.qa.entity.KcEvaluation; import org.jeecg.modules.kc.qa.service.IKcEvaluationService; import org.jeecg.modules.kc.tktj.entity.KcKkdw; import org.jeecg.modules.kc.tktj.entity.KcTingke; import org.jeecg.modules.kc.tktj.entity.KcTkmx; import org.jeecg.modules.kc.tktj.service.IKcTingkeService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecg.common.system.base.controller.JeecgController; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; @@ -35,10 +32,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; + +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; /** * @Description: kc_tingke @@ -438,5 +438,42 @@ public class KcTingkeController extends JeecgController> keTangList(KcTingke kcTingke, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcTingke, req.getParameterMap()); + if(org.apache.commons.lang.StringUtils.isNotBlank(kcTingke.getXnxq())){ + KcXqxnHistory common = changeTingKeTongJi.getXqConfig(kcTingke.getXnxq()); + 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); + String xqxn = common.getTitle(); +// if(org.apache.commons.lang.StringUtils.equals(xqxn,kcTingke.getXnxq())){ + queryWrapper.apply("a.tingketime >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); + queryWrapper.apply("a.tingketime <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); +// } + } + + queryWrapper.isNotNull("a.kechengbiaoid"); + queryWrapper.isNotNull("kb.id"); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = kcTingkeService.keTangList(page, queryWrapper); + return Result.OK(pageList); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java index c2e94259..47759e97 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java @@ -252,5 +252,10 @@ public class KcTingke implements Serializable { @TableField(exist = false) private String pkNum; + + @TableField(exist = false) + private String xnxq; + + // private java.lang.String tingketime; } 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 077ed0fc..40d3c580 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 @@ -1,14 +1,13 @@ package org.jeecg.modules.kc.tktj.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.apache.poi.ss.formula.functions.T; import org.jeecg.modules.kc.tktj.entity.KcKkdw; import org.jeecg.modules.kc.tktj.entity.KcTingke; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.kc.tktj.entity.KcTkmx; import java.util.List; @@ -45,4 +44,7 @@ public interface KcTingkeMapper extends BaseMapper { List getSftk(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage> indexListPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage> keTangList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } 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 4071ce6d..b274a199 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 @@ -835,6 +835,61 @@ + \ 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 a5009803..ae9161dd 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 @@ -3,9 +3,10 @@ package org.jeecg.modules.kc.tktj.service; 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.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.kc.qa.entity.KcEvaluation; import org.jeecg.modules.kc.tktj.entity.KcKkdw; import org.jeecg.modules.kc.tktj.entity.KcTingke; -import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.kc.tktj.entity.KcTkmx; import java.util.List; @@ -42,4 +43,7 @@ public interface IKcTingkeService extends IService { List getSftk(QueryWrapper queryWrapper); IPage> indexListPage(Page page, QueryWrapper queryWrapper); + + + IPage> keTangList(Page page, QueryWrapper queryWrapper); } 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 626824b9..837b2d12 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 @@ -3,7 +3,7 @@ package org.jeecg.modules.kc.tktj.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.poi.ss.formula.functions.T; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.kc.tktj.entity.KcKkdw; import org.jeecg.modules.kc.tktj.entity.KcTingke; import org.jeecg.modules.kc.tktj.entity.KcTkmx; @@ -11,8 +11,6 @@ import org.jeecg.modules.kc.tktj.mapper.KcTingkeMapper; import org.jeecg.modules.kc.tktj.service.IKcTingkeService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import java.util.List; import java.util.Map; @@ -84,4 +82,9 @@ public class KcTingkeServiceImpl extends ServiceImpl i public IPage> indexListPage(Page page, QueryWrapper queryWrapper) { return baseMapper.indexListPage(page,queryWrapper); } + + @Override + public IPage> keTangList(Page page, QueryWrapper queryWrapper) { + return baseMapper.keTangList(page,queryWrapper); + } }