|
@@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DatePattern;
|
|
|
import cn.hutool.core.text.CharSequenceUtil;
|
|
|
+import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.itextpdf.text.PageSize;
|
|
@@ -999,9 +1001,12 @@ public class WmSupervisionManager {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// 查询所有的服务商
|
|
|
- Page<SysDept> deptPage = deptService.page(new Page<>(query.getCurrent(), query.getSize()), Wrappers.<SysDept>lambdaQuery().eq(SysDept::getLevel, 4).eq(StrUtil.isNotBlank(query.getEntName()), SysDept::getName, query.getEntName()).in(CollUtil.isNotEmpty(entIds), SysDept::getDeptId, entIds));
|
|
|
+ Page<SysDept> deptPage = deptService.page(new Page<>(query.getCurrent(), query.getSize()),
|
|
|
+ Wrappers.<SysDept>lambdaQuery()
|
|
|
+ .eq(SysDept::getLevel, 4)
|
|
|
+ .eq(StrUtil.isNotBlank(query.getEntName()), SysDept::getName, query.getEntName())
|
|
|
+ .in(CollUtil.isNotEmpty(entIds), SysDept::getDeptId, entIds));
|
|
|
|
|
|
List<SysDept> depts = deptPage.getRecords();
|
|
|
|
|
@@ -1015,8 +1020,19 @@ public class WmSupervisionManager {
|
|
|
map.put("deptName", dept.getName());
|
|
|
map.put("deptId", dept.getDeptId());
|
|
|
|
|
|
+ LambdaQueryWrapper<WmScorePackage> queryWrapper = Wrappers.<WmScorePackage>lambdaQuery()
|
|
|
+ .in(CollUtil.isNotEmpty(drugIds), WmScorePackage::getDrugtable, drugIds)
|
|
|
+ .eq(StrUtil.isNotBlank(query.getPkgName()), WmScorePackage::getScorePackageName, query.getPkgName())
|
|
|
+ .eq(WmScorePackage::getSendPackageDeptId, dept.getDeptId().toString());
|
|
|
+
|
|
|
+ LocalDate[] period = query.getPeriod();
|
|
|
+ if (ArrayUtil.isNotEmpty(period) && period.length == 2) {
|
|
|
+ queryWrapper.ge(WmScorePackage::getStartTime, period[0]);
|
|
|
+ queryWrapper.le(WmScorePackage::getEndTime, period[1]);
|
|
|
+ }
|
|
|
+
|
|
|
// 获取当前企业当季度的包
|
|
|
- List<WmScorePackage> pkgs = packageService.list(Wrappers.<WmScorePackage>lambdaQuery().in(CollUtil.isNotEmpty(drugIds), WmScorePackage::getDrugtable, drugIds).eq(StrUtil.isNotBlank(query.getPkgName()), WmScorePackage::getScorePackageName, query.getPkgName()).eq(WmScorePackage::getSendPackageDeptId, dept.getDeptId().toString()));
|
|
|
+ List<WmScorePackage> pkgs = packageService.list(queryWrapper);
|
|
|
|
|
|
int total = 0;
|
|
|
int supTotal = 0;
|