diff --git a/src/main/java/com/zilber/boot/intelligencesite/mapper/IProgressMapper.java b/src/main/java/com/zilber/boot/intelligencesite/mapper/IProgressMapper.java index d306a23..929f6c4 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/mapper/IProgressMapper.java +++ b/src/main/java/com/zilber/boot/intelligencesite/mapper/IProgressMapper.java @@ -2,6 +2,7 @@ package com.zilber.boot.intelligencesite.mapper; import com.zilber.boot.intelligencesite.entity.IProgress; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -21,4 +22,6 @@ public interface IProgressMapper extends BaseMapper { List queryListByContion(IProgress iProgress); List queryYsg(); + + List queryProcessSj(@Param("planId") Long planId, @Param("date") String date); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/service/impl/IProductionPlanServiceImpl.java b/src/main/java/com/zilber/boot/intelligencesite/service/impl/IProductionPlanServiceImpl.java index bd1f502..31d5ea6 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/service/impl/IProductionPlanServiceImpl.java +++ b/src/main/java/com/zilber/boot/intelligencesite/service/impl/IProductionPlanServiceImpl.java @@ -62,7 +62,9 @@ public class IProductionPlanServiceImpl extends ServiceImpl progresseslist = iProgressMapper.queryProcessSj(iProductionPlan.getId(),recentWeekDates.get(i)); + long total = progresseslist.stream().mapToLong(IProgress::getDayProgress).sum(); + map.put("sj", total); res.add(map); }else{ //获取每个计划时间差(结束时间-开始时间) @@ -79,9 +81,11 @@ public class IProductionPlanServiceImpl extends ServiceImpl progresseslist = iProgressMapper.queryList(new IProgress().setPlanId(iProductionPlan.getId())); + List progresseslist = iProgressMapper.queryProcessSj(iProductionPlan.getId(),recentWeekDates.get(i)); long total = progresseslist.stream().mapToLong(IProgress::getDayProgress).sum(); - map.put("total", total); + /* List progresseslist = iProgressMapper.queryList(new IProgress().setPlanId(iProductionPlan.getId())); + long total = progresseslist.stream().mapToLong(IProgress::getDayProgress).sum();*/ + map.put("sj", total); res.add(map); } } diff --git a/src/main/resources/mappers/IProgressMapper.xml b/src/main/resources/mappers/IProgressMapper.xml index e1ad55b..e3fe7f5 100644 --- a/src/main/resources/mappers/IProgressMapper.xml +++ b/src/main/resources/mappers/IProgressMapper.xml @@ -59,10 +59,14 @@ FROM and accumulative_progress like concat('%', #{accumulativeProgress}, '%') and create_time=#{createTime} and creator=#{creator} + and date_format(process_date,'%y%m%d') = date_format(#{processDate},'%y%m%d') +