yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年6月20日 修改查询方式

This commit is contained in:
bai 2023-06-20 15:30:46 +08:00
parent 91a6f03f5d
commit 8d3b664cb1
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.kc.statistics;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -17,6 +18,7 @@ import org.jeecg.common.api.vo.Result;
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.grab.imports.entity.Xxhbuser;
import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
@ -68,6 +70,9 @@ public class TingKeStatisticsController {
@Autowired
private IKcXqxnHistoryService kcXqxnHistoryService;
@Autowired
private ChangeTingKeTongJi changeTingKeTongJi;
public IPage<KcEvaluationVo> loadPageData(KcEvaluationVo evaluation,QueryWrapper<KcEvaluationVo> queryWrapper,Page<KcEvaluationVo> page){
queryWrapper.isNotNull("a.upuserid");
@ -96,12 +101,18 @@ public class TingKeStatisticsController {
//补充搜索
if(StringUtils.isNotBlank(evaluation.getXqxn())){
List<KcXqxnHistory> xqxnHistoryList = kcXqxnHistoryList.stream().filter(x -> StringUtils.equals(x.getTitle(),evaluation.getXqxn())).collect(Collectors.toList());
if(xqxnHistoryList != null && !xqxnHistoryList.isEmpty()){
KcXqxnHistory xqxnHistory = xqxnHistoryList.get(0);
queryWrapper.ge("a.up_date",xqxnHistory.getStartTime());
queryWrapper.le("a.up_date",xqxnHistory.getEndTime());
}
KcXqxnHistory common = changeTingKeTongJi.getXqConfig(evaluation.getXqxn());
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();
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.ge("a.up_date",xqxnHistory.getStartTime());
// queryWrapper.le("a.up_date",xqxnHistory.getEndTime());
}
IPage<KcEvaluationVo> pageList = service.selectPageAndKcmc(page, queryWrapper);
//---------------------补数据1------------------------------------------