|
@@ -1,12 +1,10 @@
|
|
|
package thyyxxk.webserver.service.casefrontsheet;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-import thyyxxk.webserver.config.exception.BizException;
|
|
|
import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
|
import thyyxxk.webserver.dao.his.casefrontsheet.JieShouHuiZhenDao;
|
|
|
import thyyxxk.webserver.entity.ResultVo;
|
|
@@ -14,10 +12,8 @@ import thyyxxk.webserver.entity.casefrontsheet.JieShouHuiZhenPojo;
|
|
|
import thyyxxk.webserver.entity.login.UserInfo;
|
|
|
import thyyxxk.webserver.service.PublicServer;
|
|
|
import thyyxxk.webserver.service.redislike.RedisLikeService;
|
|
|
-import thyyxxk.webserver.service.zhuyuanyisheng.HuiZhenShenQingService;
|
|
|
import thyyxxk.webserver.utils.*;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -59,15 +55,16 @@ public class JieShouHuiZhenService {
|
|
|
QueryWrapper<?> qw = new QueryWrapper<>();
|
|
|
|
|
|
if (history) {
|
|
|
- qw.eq("input_id", userInfo.getCode());
|
|
|
+ qw.eq("status_flag", "2");
|
|
|
} else {
|
|
|
qw.eq("status_flag", "1");
|
|
|
}
|
|
|
+
|
|
|
if (StringUtil.notBlank(startTime)) {
|
|
|
qw.gt("req_date", startTime)
|
|
|
.le("req_date", endTime);
|
|
|
}
|
|
|
- if (ListUtil.notBlank(deptList) && !history) {
|
|
|
+ if (ListUtil.notBlank(deptList)) {
|
|
|
qw.and(q -> q.in("req_dept1", deptList).or().in("req_dept2", deptList));
|
|
|
}
|
|
|
|