1.营业费用列表检索条件修改

blade-service/blade-los/src/main/java/org/springblade/los/finance/operatingExpenses/controller/OperatingExpensesController.java

@@ -31,13 +31,13 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.finance.operatingExpenses.entity.OperatingExpenses;
 import org.springblade.los.finance.operatingExpenses.service.IOperatingExpensesService;
 import org.springblade.los.finance.operatingExpenses.vo.OperatingExpensesVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 
 /**
  * 营业费用 控制器
@@ -75,6 +75,7 @@ public class OperatingExpensesController extends BladeController {
 		lambdaQueryWrapper.eq(OperatingExpenses::getTenantId, AuthUtil.getTenantId())
 			.eq(OperatingExpenses::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(operatingExpenses.getApplicantId()), OperatingExpenses::getApplicantId, operatingExpenses.getApplicantId())
+			.like(ObjectUtils.isNotNull(operatingExpenses.getApplicantName()), OperatingExpenses::getApplicantName, operatingExpenses.getApplicantName())
 			.eq(ObjectUtils.isNotNull(operatingExpenses.getCreateUser()), OperatingExpenses::getCreateUser, operatingExpenses.getCreateUser())
 			.eq(ObjectUtils.isNotNull(operatingExpenses.getStatus()), OperatingExpenses::getStatus, operatingExpenses.getStatus())
 			.eq(ObjectUtils.isNotNull(operatingExpenses.getSettlementPersonId()), OperatingExpenses::getSettlementPersonId, operatingExpenses.getSettlementPersonId())
@@ -84,19 +85,24 @@ public class OperatingExpensesController extends BladeController {
 			.like(ObjectUtils.isNotNull(operatingExpenses.getBankAccount()), OperatingExpenses::getBankAccount, operatingExpenses.getBankAccount())
 			.like(ObjectUtils.isNotNull(operatingExpenses.getAccount()), OperatingExpenses::getAccount, operatingExpenses.getAccount())
 			.like(ObjectUtils.isNotNull(operatingExpenses.getBankOfDeposit()), OperatingExpenses::getBankOfDeposit, operatingExpenses.getBankOfDeposit())
+			.like(ObjectUtils.isNotNull(operatingExpenses.getRemarks()), OperatingExpenses::getRemarks, operatingExpenses.getRemarks())
 		;
 		if (ObjectUtils.isNotNull(operatingExpenses.getApplicantDateList()) && !operatingExpenses.getApplicantDateList().isEmpty()) {
 			lambdaQueryWrapper.ge(OperatingExpenses::getApplicantDate, operatingExpenses.getApplicantDateList().get(0));
 			lambdaQueryWrapper.le(OperatingExpenses::getApplicantDate, operatingExpenses.getApplicantDateList().get(1));
 		}
+		/*SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+		lambdaQueryWrapper.apply(ObjectUtils.isNotNull(operatingExpenses.getApplicantDate()),
+			"DATE_FORMAT(applicant_date,'%Y-%m-%d') == '" + formatter.format(operatingExpenses.getApplicantDate()) + "'");*/
 		if (ObjectUtils.isNotNull(operatingExpenses.getSettlementDateList()) && !operatingExpenses.getSettlementDateList().isEmpty()) {
 			lambdaQueryWrapper.ge(OperatingExpenses::getSettlementDate, operatingExpenses.getSettlementDateList().get(0));
 			lambdaQueryWrapper.le(OperatingExpenses::getSettlementDate, operatingExpenses.getSettlementDateList().get(1));
 		}
-		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")  ) {
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(OperatingExpenses::getBranchId, AuthUtil.getDeptId());
 		} else {
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(operatingExpenses.getBranchId()), OperatingExpenses::getBranchId, operatingExpenses.getBranchId());
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(operatingExpenses.getBranchName()), OperatingExpenses::getBranchName, operatingExpenses.getBranchName());
 		}
 		IPage<OperatingExpenses> pages = operatingExpensesService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);