|
@@ -18,6 +18,7 @@ import com.jeeplus.consultancy.approvalType.mapper.ConsultancyReimbursementTypeM
|
|
|
import com.jeeplus.consultancy.approvalType.service.ConsultancyReimbursementTypeService;
|
|
import com.jeeplus.consultancy.approvalType.service.ConsultancyReimbursementTypeService;
|
|
|
import com.jeeplus.core.query.QueryWrapperGenerator;
|
|
import com.jeeplus.core.query.QueryWrapperGenerator;
|
|
|
import com.jeeplus.flowable.feign.IFlowableApi;
|
|
import com.jeeplus.flowable.feign.IFlowableApi;
|
|
|
|
|
+import com.jeeplus.sys.domain.User;
|
|
|
import com.jeeplus.sys.domain.WorkAttachmentInfo;
|
|
import com.jeeplus.sys.domain.WorkAttachmentInfo;
|
|
|
import com.jeeplus.sys.feign.IDictApi;
|
|
import com.jeeplus.sys.feign.IDictApi;
|
|
|
import com.jeeplus.sys.feign.IOfficeApi;
|
|
import com.jeeplus.sys.feign.IOfficeApi;
|
|
@@ -144,13 +145,31 @@ public class ConsultancyReimbursementInfoService {
|
|
|
}
|
|
}
|
|
|
// 报销人
|
|
// 报销人
|
|
|
if (StringUtils.isNotEmpty(dto.getReimBy())) {
|
|
if (StringUtils.isNotEmpty(dto.getReimBy())) {
|
|
|
- UserDTO userDto = userApi.getByLoginNameNoTen(dto.getReimBy());
|
|
|
|
|
- queryWrapper.apply("( b.user_id like {0} OR us.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
- queryWrapper.or().apply("( b2.user_id like {0} OR us2.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
- queryWrapper.or().apply("( b3.user_id like {0} OR us3.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
- queryWrapper.or().apply("( b4.user_id like {0} OR us4.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
- queryWrapper.or().apply("( b5.user_id like {0} OR us5.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
-
|
|
|
|
|
|
|
+ //UserDTO userDto = userApi.getByLoginNameNoTen(dto.getReimBy());
|
|
|
|
|
+ //queryWrapper.apply("( b.user_id like {0} OR us.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ //queryWrapper.or().apply("( b2.user_id like {0} OR us2.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ //queryWrapper.or().apply("( b3.user_id like {0} OR us3.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ //queryWrapper.or().apply("( b4.user_id like {0} OR us4.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ //queryWrapper.or().apply("( b5.user_id like {0} OR us5.name LIKE {1} )", "%" + userDto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ List<User> users = userApi.findListByLikeName(dto.getReimBy());
|
|
|
|
|
+ if (users != null && !users.isEmpty()) {
|
|
|
|
|
+ queryWrapper.and(wrapper -> {
|
|
|
|
|
+ for (int i = 0; i < users.size(); i++) {
|
|
|
|
|
+ User userdto = users.get(i);
|
|
|
|
|
+ if (i > 0) {
|
|
|
|
|
+ wrapper.or();
|
|
|
|
|
+ }
|
|
|
|
|
+ wrapper.apply("(b.user_id LIKE {0} OR us.name LIKE {1} " +
|
|
|
|
|
+ "OR b2.user_id LIKE {0} OR us2.name LIKE {1} " +
|
|
|
|
|
+ "OR b3.user_id LIKE {0} OR us3.name LIKE {1} " +
|
|
|
|
|
+ "OR b4.user_id LIKE {0} OR us4.name LIKE {1} " +
|
|
|
|
|
+ "OR b5.user_id LIKE {0} OR us5.name LIKE {1})",
|
|
|
|
|
+ "%" + userdto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ }else{
|
|
|
|
|
+ queryWrapper.apply("1 = 0");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
// 报销状态
|
|
// 报销状态
|
|
|
if (StringUtils.isNotEmpty(dto.getType())) {
|
|
if (StringUtils.isNotEmpty(dto.getType())) {
|
|
@@ -1046,14 +1065,33 @@ public class ConsultancyReimbursementInfoService {
|
|
|
}
|
|
}
|
|
|
// 报销人
|
|
// 报销人
|
|
|
if (StringUtils.isNotEmpty(dto.getReimBy())) {
|
|
if (StringUtils.isNotEmpty(dto.getReimBy())) {
|
|
|
- UserDTO userDto = userApi.getByLoginNameNoTen(dto.getReimBy());
|
|
|
|
|
- queryWrapper.apply("( b.user_id LIKE {0} OR us.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
- queryWrapper.or().apply("( b2.user_id LIKE {0} OR us2.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
- queryWrapper.or().apply("( b3.user_id LIKE {0} OR us3.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
- queryWrapper.or().apply("( b4.user_id LIKE {0} OR us4.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
- queryWrapper.or().apply("( b5.user_id LIKE {0} OR" +
|
|
|
|
|
- " us5.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
-
|
|
|
|
|
|
|
+ //UserDTO userDto = userApi.getByLoginNameNoTen(dto.getReimBy());
|
|
|
|
|
+ //queryWrapper.apply("( b.user_id LIKE {0} OR us.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ //queryWrapper.or().apply("( b2.user_id LIKE {0} OR us2.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ //queryWrapper.or().apply("( b3.user_id LIKE {0} OR us3.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ //queryWrapper.or().apply("( b4.user_id LIKE {0} OR us4.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ //queryWrapper.or().apply("( b5.user_id LIKE {0} OR" +
|
|
|
|
|
+ // " us5.name LIKE {1} )", "%" +userDto.getId()+ "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+
|
|
|
|
|
+ List<User> users = userApi.findListByLikeName(dto.getReimBy());
|
|
|
|
|
+ if (users != null && !users.isEmpty()) {
|
|
|
|
|
+ queryWrapper.and(wrapper -> {
|
|
|
|
|
+ for (int i = 0; i < users.size(); i++) {
|
|
|
|
|
+ User userdto = users.get(i);
|
|
|
|
|
+ if (i > 0) {
|
|
|
|
|
+ wrapper.or();
|
|
|
|
|
+ }
|
|
|
|
|
+ wrapper.apply("(b.user_id LIKE {0} OR us.name LIKE {1} " +
|
|
|
|
|
+ "OR b2.user_id LIKE {0} OR us2.name LIKE {1} " +
|
|
|
|
|
+ "OR b3.user_id LIKE {0} OR us3.name LIKE {1} " +
|
|
|
|
|
+ "OR b4.user_id LIKE {0} OR us4.name LIKE {1} " +
|
|
|
|
|
+ "OR b5.user_id LIKE {0} OR us5.name LIKE {1})",
|
|
|
|
|
+ "%" + userdto.getId() + "%", "%" + dto.getReimBy() + "%");
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ }else{
|
|
|
|
|
+ queryWrapper.apply("1 = 0");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
// 报销状态
|
|
// 报销状态
|
|
|
if (StringUtils.isNotEmpty(dto.getType())) {
|
|
if (StringUtils.isNotEmpty(dto.getType())) {
|