From 38d08149937d5688934eec69884b337cec5d7402 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 08 二月 2025 18:13:39 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index c44988f..43c6cf1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -1,19 +1,17 @@
package com.doumee.service.business.impl;
import cn.hutool.core.util.IdcardUtil;
-import cn.hutool.core.util.PhoneUtil;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.TrainTimeImport;
import com.doumee.dao.business.EmpowerMapper;
import com.doumee.dao.business.MemberRoleMapper;
@@ -147,6 +145,9 @@
queryWrapper.selectAs(Company::getCompanyNamePath,TrainTime::getCompanyName);
queryWrapper.selectAs(SystemUser::getRealname,TrainTime::getCreateName);
queryWrapper.eq(TrainTime::getIsdeleted, Constants.ZERO);
+ queryWrapper.ge(pageWrap.getModel().getStartTimeStart() != null, TrainTime::getStartTime, pageWrap.getModel().getStartTimeStart());
+ queryWrapper.le(pageWrap.getModel().getStartTimeEnd() != null, TrainTime::getStartTime, pageWrap.getModel().getStartTimeEnd());
+
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getName())
.or().like(Member::getName,pageWrap.getModel().getName()));
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
@@ -193,7 +194,7 @@
//鏌ヨ鍏ㄩ儴鐩稿叧鏂逛汉鍛樹俊鎭�
List<Member> list = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class)
- .leftJoin(Company.class,Company::getId,Member::getId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Company::getType,Constants.ZERO)
// .in(Company::getId,loginUserInfo.getCompanyIdList() )
.eq(Member::getIsdeleted, com.doumee.core.utils.Constants.ZERO));
@@ -231,7 +232,7 @@
if(newList == null || newList.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏈夋晥鏁版嵁涓虹┖锛�");
}
- trainTimeMapper.insertBatchSomeColumn(newList);
+ trainTimeMapper.insert(newList);
return "瀵煎叆鎴愬姛";
}catch (BusinessException e){
throw e;
--
Gitblit v1.9.3