This commit is contained in:
cdf
2024-10-28 18:02:44 +08:00
parent 618f1314f6
commit 3132b0a134

View File

@@ -4,7 +4,6 @@ package com.njcn.harmonic.service.upload.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -65,7 +64,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
lambdaQueryWrapper.in(PmsTemProcessReport::getObjId,ids); lambdaQueryWrapper.in(PmsTemProcessReport::getObjId,ids);
List<PmsTemProcessReport> pmsTemProcessReportList = this.list(lambdaQueryWrapper); List<PmsTemProcessReport> pmsTemProcessReportList = this.list(lambdaQueryWrapper);
if(CollUtil.isEmpty(pmsTemProcessReportList)){ if(CollUtil.isEmpty(pmsTemProcessReportList)){
throw new BusinessException("查询月报数据为空"); throw new BusinessException("查询用户临时档案数据为空");
} }
List<List<PmsTemProcessReport>> list = CollUtil.split(pmsTemProcessReportList,100); List<List<PmsTemProcessReport>> list = CollUtil.split(pmsTemProcessReportList,100);
@@ -96,7 +95,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
public List<PmsTemProcessReport> getList(PmsTemUserParam.QueryPmsTemUserParam param) { public List<PmsTemProcessReport> getList(PmsTemUserParam.QueryPmsTemUserParam param) {
LambdaQueryWrapper<PmsTemProcessReport> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PmsTemProcessReport> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate, param.getSearchBeginTime().substring(0,7)); lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate,param.getSearchBeginTime());
return this.list(lambdaQueryWrapper); return this.list(lambdaQueryWrapper);
} }
@@ -221,6 +220,34 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
pmsTemProcessReport.setTestRunOvUserNum(testRunOvUserNum); pmsTemProcessReport.setTestRunOvUserNum(testRunOvUserNum);
pmsTemProcessReport.setTestRunOvUserRate(BigDecimal.valueOf(Double.valueOf(testRunOvUserNum*100)/testRunOvUserNum).setScale(2)); pmsTemProcessReport.setTestRunOvUserRate(BigDecimal.valueOf(Double.valueOf(testRunOvUserNum*100)/testRunOvUserNum).setScale(2));
return null; Integer runUserCount = iPmsTemProcessTrackService.lambdaQuery()
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
.eq(PmsTemProcessTrackPO::getProStage,"04")
.between(PmsTemProcessTrackPO::getOperateDate, beginTime, endTime)
.count();
Integer runOvUserNum = iPmsTemProcessTrackService.lambdaQuery()
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
.eq(PmsTemProcessTrackPO::getProStage,"04")
.isNotNull(PmsTemProcessTrackPO::getOvIndexs)
.between(PmsTemProcessTrackPO::getOperateDate, beginTime, endTime)
.count();
pmsTemProcessReport.setRunUserCount(runUserCount);
pmsTemProcessReport.setRunOvUserNum(runOvUserNum);
pmsTemProcessReport.setRunOvUserRate(BigDecimal.valueOf(Double.valueOf(runOvUserNum*100)/runUserCount).setScale(2));
pmsTemProcessReportList.add(pmsTemProcessReport);
});
});
pmsTemProcessReportList.forEach(temp->{
QueryWrapper<PmsTemProcessReport> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PmsTemProcessReport::getProvinceOrg,temp.getProvinceOrg())
.eq(PmsTemProcessReport::getCityOrg,temp.getCityOrg())
.eq(PmsTemProcessReport::getStatisticalDate,temp.getStatisticalDate());
this.update(temp,queryWrapper);
});
return true;
} }
} }