From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 26 十一月 2024 09:20:02 +0800
Subject: [PATCH] 解决冲突
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java | 199 ++++++++++++++++++++++++++++++-------------------
1 files changed, 123 insertions(+), 76 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
index 66f431f..6c1d69a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
@@ -28,10 +28,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 杩愮淮宸ュ崟淇℃伅琛⊿ervice瀹炵幇
@@ -57,6 +54,8 @@
private YwRoomMapper ywRoomMapper;
@Autowired
private YwBuildingMapper ywBuildingMapper;
+ @Autowired
+ private YwFloorMapper ywFloorMapper;
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -67,6 +66,7 @@
model.setIsdeleted(Constants.ZERO);
model.setCreateDate(new Date());
model.setStatus(Constants.ZERO);
+ model.setDealStatus(Constants.ZERO);
model.setEditDate(model.getCreateDate());
model.setEditor(model.getCreator());
ywWorkorderMapper.insert(model);
@@ -79,11 +79,12 @@
if(StringUtils.isBlank(multifile.getFileurl())){
continue;
}
- multifile.setCreateDate(new Date());
+ multifile.setCreateDate(model.getCreateDate());
+ multifile.setEditDate(model.getCreateDate());
multifile.setCreator(model.getEditor());
multifile.setIsdeleted(Constants.ZERO);
multifile.setObjId(model.getId());
- multifile.setCreator(model.getCreator());
+ multifile.setEditor(model.getCreator());
multifile.setObjType(Constants.MultiFile.YW_WORKORDER_PROBLEM.getKey());
multifile.setSortnum(i+1);
fileList.add(multifile);
@@ -92,27 +93,21 @@
if(fileList.size()>0){
multifileMapper.insert(fileList);
}
- dealLogBiz(model,Constants.ZERO,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_CREATE,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
return model.getId();
}
- private void dealLogBiz(YwWorkorder model, int type,String param1,String param2) {
+ private void dealLogBiz(YwWorkorder model,Constants.YwLogType type,String param1,String param2) {
YwWorkorderLog log = new YwWorkorderLog();
log.setCreateDate(model.getEditDate());
log.setCreator(model.getCreator());
log.setJobId(model.getId());
log.setIsdeleted(Constants.ZERO);
log.setObjId(model.getId()+"");
- log.setObjType(type);
+ log.setObjType(type.getKey());
log.setParam1(param1);
log.setParam2(param2);
- if(type ==0){
- log.setTitle("鍒涘缓宸ュ崟");
- }else if(type ==1){
- log.setTitle("鍒嗘淳宸ュ崟");
- }else if(type ==2){
- log.setTitle("澶勭悊宸ュ崟");
- }
+ log.setTitle(type.getNoteinfo());
ywWorkorderLogMapper.insert(log);
}
@@ -130,13 +125,14 @@
model.setProjectId(room.getProjectId());
}else{
//濡傛灉鏄叕鍏卞尯鍩熻淇紝蹇呴』閫夋嫨妤煎畤淇℃伅
- if(model.getBuildingId()==null){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬ゼ瀹囦俊鎭紒");
+ if(model.getFloorId()==null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬ゼ灞備俊鎭紒");
}
- YwBuilding room = ywBuildingMapper.selectById(model.getRoomId());
+ YwFloor room = ywFloorMapper.selectById(model.getFloorId());
if(room ==null || Constants.equalsInteger(room.getIsdeleted(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬ゼ瀹囦俊鎭紒");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬ゼ灞備俊鎭紒");
}
+ model.setBuildingId(room.getBuildingId());
model.setProjectId(room.getProjectId());
}
}
@@ -174,7 +170,9 @@
if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝宸ュ崟淇℃伅涓嶅瓨鍦紒");
}
- if(!Constants.equalsInteger(model.getDealStatus(),Constants.ZERO) && !Constants.equalsInteger(model.getDealStatus(),Constants.ONE)){
+ if(!Constants.equalsInteger(model.getDealStatus(),Constants.ZERO)
+// && !Constants.equalsInteger(model.getDealStatus(),Constants.ONE)
+ ){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝宸ュ崟鐘舵�佸凡娴佽浆锛屼笉鏀寔褰撳墠鎿嶄綔锛�");
}
@@ -190,8 +188,9 @@
update.setDispatchUserId(update.getEditor());
update.setDispatchDate(update.getEditDate());
update.setDispatchInfo(ywWorkorder.getDispatchInfo());
+ update.setDealUserId(ywWorkorder.getDealUserId());
ywWorkorderMapper.updateById(update);
- dealLogBiz(model,Constants.ONE,model.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DISPATCH,ywWorkorder.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -204,10 +203,10 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝宸ュ崟鐘舵�佸凡娴佽浆锛屼笉鏀寔褰撳墠鎿嶄綔锛�");
}
- SystemUser user = systemUserMapper.selectById(ywWorkorder.getDealUserId());
- if(user ==null || (user.getDeleted()!=null&& user.getDeleted() )){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅涓嶅瓨鍦紒");
- }
+// SystemUser user = systemUserMapper.selectById(ywWorkorder.getDealUserId());
+// if(user ==null || (user.getDeleted()!=null&& user.getDeleted() )){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅涓嶅瓨鍦紒");
+// }
YwWorkorder update = new YwWorkorder();
update.setId(model.getId());
update.setEditDate(new Date());
@@ -215,9 +214,31 @@
update.setDealStatus(Constants.TWO);
update.setDealUserId(update.getEditor());
update.setDealDate(update.getEditDate());
- update.setDealInfo(ywWorkorder.getDispatchInfo());
+ update.setDealInfo(ywWorkorder.getDealInfo());
ywWorkorderMapper.updateById(update);
- dealLogBiz(model,Constants.TWO,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
+
+ List<Multifile> fileList = new ArrayList<>();
+ if(ywWorkorder.getDealFileList()!=null && ywWorkorder.getDealFileList().size()>0){
+ for (int i = 0; i < ywWorkorder.getDealFileList().size(); i++) {
+ Multifile multifile = ywWorkorder.getDealFileList().get(i);
+ if(StringUtils.isBlank(multifile.getFileurl())){
+ continue;
+ }
+ multifile.setCreateDate(update.getEditDate());
+ multifile.setCreator(update.getEditor());
+ multifile.setEditDate(update.getEditDate());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(model.getId());
+ multifile.setEditor(update.getEditor());
+ multifile.setObjType(Constants.MultiFile.YW_WORKORDER_DEAL.getKey());
+ multifile.setSortnum(i+1);
+ fileList.add(multifile);
+ }
+ }
+ if(fileList.size()>0){
+ multifileMapper.insert(fileList);
+ }
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,ywWorkorder.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -299,24 +320,33 @@
@Override
public YwWorkorder findById(Integer id) {
- MPJLambdaWrapper<YwWorkorder> wrapper = new MPJLambdaWrapper<>();
- wrapper.selectAll(YwWorkorder.class )
- .select("t4.realname",YwWorkorder::getDealUserName)
- .select("t3.realname",YwWorkorder::getDispatchUserName)
- .selectAs(SystemUser::getRealname,YwWorkorder::getCreatorName)
- .selectAs(SystemUser::getMobile,YwWorkorder::getCreatorPhone)
- .selectAs(Company::getCompanyNamePath,YwWorkorder::getCreatorCompany)
- .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
- .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
- .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDispatchUserId)
+ MPJLambdaWrapper<YwWorkorder> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(YwWorkorder.class )
+ .selectAs(SystemUser::getRealname,YwWorkorder::getDealUserName)
+ .select("t3.realname",YwWorkorder::getCreatorName)
+ .selectAs(Category::getName,YwWorkorder::getCategoryName)
+ .selectAs(YwRoom::getName,YwWorkorder::getRoomName)
+ .selectAs(YwRoom::getRoomNum,YwWorkorder::getRoomNum)
+ .selectAs(YwFloor::getName,YwWorkorder::getFloorName)
+ .selectAs(YwBuilding::getName,YwWorkorder::getBuildingName)
.leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDealUserId)
+ .leftJoin(Category.class,Category::getId,YwWorkorder::getCateId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
+ .leftJoin(YwRoom.class,YwRoom::getId,YwWorkorder::getRoomId)
+ .leftJoin(YwFloor.class,YwFloor::getId,YwWorkorder::getFloorId)
+ .leftJoin(YwBuilding.class,YwBuilding::getId,YwWorkorder::getBuildingId)
.eq(YwWorkorder::getId,id);
- YwWorkorder model = ywWorkorderMapper.selectJoinOne(YwWorkorder.class,wrapper);
+ YwWorkorder model = ywWorkorderMapper.selectJoinOne(YwWorkorder.class,queryWrapper);
initFiles(model);//璇诲彇闄勪欢淇℃伅
YwWorkorderLog log = new YwWorkorderLog();
log.setJobId(model.getId());
log.setIsdeleted(Constants.ZERO);
- model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log).lambda().orderByAsc(YwWorkorderLog::getCreateDate)));
+ model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log)
+ .lambda()
+ .in(YwWorkorderLog::getObjType,Constants.YwLogType.WORKORDER_DEAL.getKey()
+ ,Constants.YwLogType.WORKORDER_CREATE.getKey()
+ ,Constants.YwLogType.WORKORDER_DISPATCH.getKey())
+ .orderByAsc(YwWorkorderLog::getCreateDate)));
return model;
}
@@ -336,101 +366,115 @@
@Override
public PageData<YwWorkorder> findPage(PageWrap<YwWorkorder> pageWrap) {
IPage<YwWorkorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<YwWorkorder> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<YwWorkorder> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(YwWorkorder.class )
+ .selectAs(SystemUser::getRealname,YwWorkorder::getDealUserName)
+ .select("t3.realname",YwWorkorder::getCreatorName)
+ .selectAs(Category::getName,YwWorkorder::getCategoryName)
+ .selectAs(YwRoom::getName,YwWorkorder::getRoomName)
+ .selectAs(YwRoom::getRoomNum,YwWorkorder::getRoomNum)
+ .selectAs(YwFloor::getName,YwWorkorder::getFloorName)
+ .selectAs(YwBuilding::getName,YwWorkorder::getBuildingName)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDealUserId)
+ .leftJoin(Category.class,Category::getId,YwWorkorder::getCateId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
+ .leftJoin(YwRoom.class,YwRoom::getId,YwWorkorder::getRoomId)
+ .leftJoin(YwFloor.class,YwFloor::getId,YwWorkorder::getFloorId)
+ .leftJoin(YwBuilding.class,YwBuilding::getId,YwWorkorder::getBuildingId);
pageWrap.getModel().setIsdeleted(Constants.ZERO);
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(YwWorkorder::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(YwWorkorder::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(YwWorkorder::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(YwWorkorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(YwWorkorder::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(YwWorkorder::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(YwWorkorder::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(YwWorkorder::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(YwWorkorder::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(YwWorkorder::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.eq(YwWorkorder::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(YwWorkorder::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(YwWorkorder::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(YwWorkorder::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getContent, pageWrap.getModel().getContent());
+ queryWrapper.eq(YwWorkorder::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getGetDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getGetDate, Utils.Date.getStart(pageWrap.getModel().getGetDate()));
- queryWrapper.lambda().le(YwWorkorder::getGetDate, Utils.Date.getEnd(pageWrap.getModel().getGetDate()));
+ queryWrapper.ge(YwWorkorder::getGetDate, Utils.Date.getStart(pageWrap.getModel().getGetDate()));
+ queryWrapper.le(YwWorkorder::getGetDate, Utils.Date.getEnd(pageWrap.getModel().getGetDate()));
}
if (pageWrap.getModel().getProjectId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getProjectId, pageWrap.getModel().getProjectId());
+ queryWrapper.eq(YwWorkorder::getProjectId, pageWrap.getModel().getProjectId());
}
if (pageWrap.getModel().getBuildingId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getBuildingId, pageWrap.getModel().getBuildingId());
+ queryWrapper.eq(YwWorkorder::getBuildingId, pageWrap.getModel().getBuildingId());
}
if (pageWrap.getModel().getRoomId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getRoomId, pageWrap.getModel().getRoomId());
+ queryWrapper.eq(YwWorkorder::getRoomId, pageWrap.getModel().getRoomId());
}
if (pageWrap.getModel().getUserId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getUserId, pageWrap.getModel().getUserId());
+ queryWrapper.eq(YwWorkorder::getUserId, pageWrap.getModel().getUserId());
}
if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getPhone, pageWrap.getModel().getPhone());
+ queryWrapper.eq(YwWorkorder::getPhone, pageWrap.getModel().getPhone());
}
if (pageWrap.getModel().getSubmitDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getSubmitDate, Utils.Date.getStart(pageWrap.getModel().getSubmitDate()));
- queryWrapper.lambda().le(YwWorkorder::getSubmitDate, Utils.Date.getEnd(pageWrap.getModel().getSubmitDate()));
+ queryWrapper.ge(YwWorkorder::getSubmitDate, Utils.Date.getStart(pageWrap.getModel().getSubmitDate()));
+ queryWrapper.le(YwWorkorder::getSubmitDate, Utils.Date.getEnd(pageWrap.getModel().getSubmitDate()));
}
if (pageWrap.getModel().getCateId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getCateId, pageWrap.getModel().getCateId());
+ queryWrapper.eq(YwWorkorder::getCateId, pageWrap.getModel().getCateId());
}
if (pageWrap.getModel().getAreaType() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getAreaType, pageWrap.getModel().getAreaType());
+ queryWrapper.eq(YwWorkorder::getAreaType, pageWrap.getModel().getAreaType());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(YwWorkorder::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getDealStatus() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDealStatus, pageWrap.getModel().getDealStatus());
+ queryWrapper.eq(YwWorkorder::getDealStatus, pageWrap.getModel().getDealStatus());
}
if (pageWrap.getModel().getDispatchUserId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDispatchUserId, pageWrap.getModel().getDispatchUserId());
+ queryWrapper.eq(YwWorkorder::getDispatchUserId, pageWrap.getModel().getDispatchUserId());
}
if (pageWrap.getModel().getDispatchDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getDispatchDate, Utils.Date.getStart(pageWrap.getModel().getDispatchDate()));
- queryWrapper.lambda().le(YwWorkorder::getDispatchDate, Utils.Date.getEnd(pageWrap.getModel().getDispatchDate()));
+ queryWrapper.ge(YwWorkorder::getDispatchDate, Utils.Date.getStart(pageWrap.getModel().getDispatchDate()));
+ queryWrapper.le(YwWorkorder::getDispatchDate, Utils.Date.getEnd(pageWrap.getModel().getDispatchDate()));
}
if (pageWrap.getModel().getDispatchInfo() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDispatchInfo, pageWrap.getModel().getDispatchInfo());
+ queryWrapper.eq(YwWorkorder::getDispatchInfo, pageWrap.getModel().getDispatchInfo());
}
if (pageWrap.getModel().getDealUserId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDealUserId, pageWrap.getModel().getDealUserId());
+ queryWrapper.eq(YwWorkorder::getDealUserId, pageWrap.getModel().getDealUserId());
}
if (pageWrap.getModel().getDealDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
- queryWrapper.lambda().le(YwWorkorder::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
+ queryWrapper.ge(YwWorkorder::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
+ queryWrapper.le(YwWorkorder::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
}
if (pageWrap.getModel().getDealInfo() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDealInfo, pageWrap.getModel().getDealInfo());
+ queryWrapper.eq(YwWorkorder::getDealInfo, pageWrap.getModel().getDealInfo());
}
if (pageWrap.getModel().getDealType() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDealType, pageWrap.getModel().getDealType());
+ queryWrapper.eq(YwWorkorder::getDealType, pageWrap.getModel().getDealType());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -439,6 +483,9 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryEndTime());
+ queryWrapper.orderByDesc(YwContract::getCreateDate );
return PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3