diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java index 631fe8a8d..ebd3e0f88 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java @@ -8,12 +8,10 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.mapper.upload.PmsTemProcessReportMapper; -import com.njcn.harmonic.mapper.upload.PmsTemUserMapper; import com.njcn.harmonic.pojo.param.upload.PmsTemUserParam; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessApproval; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessReport; @@ -24,7 +22,6 @@ import com.njcn.harmonic.service.upload.IPmsTemProcessTrackService; import com.njcn.harmonic.service.upload.IPmsTemUserService; import com.njcn.harmonic.service.upload.PmsTemProcessApprovalService; import com.njcn.user.api.DeptFeignClient; -import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.vo.PvTerminalTreeVO; import com.njcn.web.enums.GWSendEnum; import com.njcn.web.pojo.param.SendParam; @@ -284,7 +281,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl list1 = iPmsTemUserService.lambdaQuery() .eq(PmsTemUserPO::getProvinceOrg, province.getCode()) .eq(PmsTemUserPO::getCityOrg, city.getCode()).list(); - pmsTemProcessReport.setNewUserNum(monthCount); + pmsTemProcessReport.setNewUserNum(monthCount1); pmsTemProcessReport.setNewUserCount(list1.size()); List userIds1 = list1.stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());