From 027ee354f145886cb4280cc980af41e9304c7888 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 15:28:14 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java | 371 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 321 insertions(+), 50 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 0223ac9..4027840 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
@@ -1,20 +1,34 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.YwWorkorderMapper;
-import com.doumee.dao.business.model.YwWorkorder;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.MultifileMapper;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.YwWorkorderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.util.List;
+import java.util.*;
/**
* 杩愮淮宸ュ崟淇℃伅琛⊿ervice瀹炵幇
@@ -26,16 +40,110 @@
@Autowired
private YwWorkorderMapper ywWorkorderMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
+ @Autowired
+ private YwWorkorderLogMapper ywWorkorderLogMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private MultifileMapper multifileMapper;
+ @Autowired
+ private YwProjectMapper ywProjectMapper;
+ @Autowired
+ private YwRoomMapper ywRoomMapper;
+ @Autowired
+ private YwBuildingMapper ywBuildingMapper;
+ @Autowired
+ private YwFloorMapper ywFloorMapper;
@Override
- public Integer create(YwWorkorder ywWorkorder) {
- ywWorkorderMapper.insert(ywWorkorder);
- return ywWorkorder.getId();
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public Integer create(YwWorkorder model) {
+
+ dealParamValid(model);
+ model.setCreator(model.getLoginUserInfo().getId());
+ 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);
+
+ List<Multifile> fileList = new ArrayList<>();
+ if(model.getFileList()!=null && model.getFileList().size()>0){
+ boolean isTrue = false;
+ for (int i = 0; i < model.getFileList().size(); i++) {
+ Multifile multifile = model.getFileList().get(i);
+ if(StringUtils.isBlank(multifile.getFileurl())){
+ continue;
+ }
+ multifile.setCreateDate(new Date());
+ multifile.setCreator(model.getEditor());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(model.getId());
+ multifile.setCreator(model.getCreator());
+ multifile.setObjType(Constants.MultiFile.YW_WORKORDER_PROBLEM.getKey());
+ multifile.setSortnum(i+1);
+ fileList.add(multifile);
+ }
+ }
+ if(fileList.size()>0){
+ multifileMapper.insert(fileList);
+ }
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_CREATE,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
+ return model.getId();
+ }
+
+ 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.getKey());
+ log.setParam1(param1);
+ log.setParam2(param2);
+ log.setTitle(type.getNoteinfo());
+ ywWorkorderLogMapper.insert(log);
+ }
+
+ private void dealParamValid(YwWorkorder model) {
+ if(Constants.equalsInteger(model.getAreaType(),Constants.ZERO)) {
+ //濡傛灉鏄競鍐呰淇紝蹇呴』閫夋嫨鎴挎簮淇℃伅
+ if(model.getRoomId()==null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬埧婧愪俊鎭紒");
+ }
+ YwRoom room = ywRoomMapper.selectById(model.getRoomId());
+ if(room ==null || Constants.equalsInteger(room.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬埧婧愪俊鎭紒");
+ }
+ model.setBuildingId(room.getBuildingId());
+ model.setProjectId(room.getProjectId());
+ }else{
+ //濡傛灉鏄叕鍏卞尯鍩熻淇紝蹇呴』閫夋嫨妤煎畤淇℃伅
+ if(model.getFloorId()==null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬ゼ灞備俊鎭紒");
+ }
+ YwFloor room = ywFloorMapper.selectById(model.getFloorId());
+ if(room ==null || Constants.equalsInteger(room.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬ゼ灞備俊鎭紒");
+ }
+ model.setBuildingId(room.getBuildingId());
+ model.setProjectId(room.getProjectId());
+ }
}
@Override
- public void deleteById(Integer id) {
- ywWorkorderMapper.deleteById(id);
+ public void deleteById(Integer id, LoginUserInfo user) {
+ YwWorkorder model = new YwWorkorder();
+ model.setId(id);
+ model.setEditDate(new Date());
+ model.setEditor(user.getId());
+ model.setIsdeleted(Constants.ONE);
+ ywWorkorderMapper.updateById(model);
}
@Override
@@ -45,18 +153,135 @@
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
+ public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- ywWorkorderMapper.deleteBatchIds(ids);
+ for(Integer id : ids){
+ this.deleteById(id,user);
+ }
}
@Override
- public void updateById(YwWorkorder ywWorkorder) {
- ywWorkorderMapper.updateById(ywWorkorder);
- }
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void dispatchOrder(YwWorkorder ywWorkorder){
+ YwWorkorder model = this.findById(ywWorkorder.getId());
+ 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)){
+ 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());
+ update.setEditor(ywWorkorder.getLoginUserInfo().getId());
+ update.setDealStatus(Constants.ONE);
+ update.setDispatchUserId(update.getEditor());
+ update.setDispatchDate(update.getEditDate());
+ update.setDispatchInfo(ywWorkorder.getDispatchInfo());
+ ywWorkorderMapper.updateById(update);
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DISPATCH,model.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
+ }
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void dealOrder(YwWorkorder ywWorkorder){
+ YwWorkorder model = this.findById(ywWorkorder.getId());
+ 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)){
+ 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());
+ update.setEditor(ywWorkorder.getLoginUserInfo().getId());
+ update.setDealStatus(Constants.TWO);
+ update.setDealUserId(update.getEditor());
+ update.setDealDate(update.getEditDate());
+ update.setDealInfo(ywWorkorder.getDispatchInfo());
+ ywWorkorderMapper.updateById(update);
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
+ }
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updateById(YwWorkorder model) {
+ dealParamValid(model);
+ model.setEditDate(new Date());
+ model.setEditor(model.getLoginUserInfo().getId());
+ ywWorkorderMapper.updateById(model);
+
+ List<Multifile> fileList = new ArrayList<>();
+ if(model.getFileList()!=null && model.getFileList().size()>0){
+ for (int i = 0; i < model.getFileList().size(); i++) {
+ Multifile multifile = model.getFileList().get(i);
+ if(StringUtils.isBlank(multifile.getFileurl())){
+ continue;
+ }
+ multifile.setCreateDate(new Date());
+ multifile.setCreator(model.getEditor());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(model.getId());
+ multifile.setCreator(model.getCreator());
+ multifile.setObjType(Constants.MultiFile.YW_WORKORDER_PROBLEM.getKey());
+ multifile.setSortnum(i+1);
+ fileList.add(multifile);
+ }
+ }
+ multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .set(Multifile::getIsdeleted,Constants.ONE)
+ .set(Multifile::getEditDate,model.getEditDate())
+ .set(Multifile::getEditor,model.getEditor())
+ .eq(Multifile::getIsdeleted, Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.YW_WORKORDER_PROBLEM.getKey())
+ );
+ if(fileList.size()>0){
+ multifileMapper.insert(fileList);
+ }
+ }
+ private void initFiles(YwWorkorder model) {
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId, model.getId() )
+ .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.YW_WORKORDER_PROBLEM.getKey()
+ ,Constants.MultiFile.YW_WORKORDER_DEAL.getKey() }))
+ .eq(Multifile::getIsdeleted,Constants.ZERO));
+ if(multifiles!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_WORKORDER_FILE).getCode();
+ for(Multifile f : multifiles){
+ if(StringUtils.isBlank(f.getFileurl())){
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.YW_WORKORDER_PROBLEM.getKey())){
+ //鐜板満鎯呭喌
+ if(model.getFileList() == null){
+ model.setFileList(new ArrayList<>());
+ }
+ model.getFileList().add(f);
+ }
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.YW_WORKORDER_DEAL.getKey())){
+ //澶勭悊闄勪欢
+ if(model.getDealFileList() == null){
+ model.setDealFileList(new ArrayList<>());
+ }
+ model.getDealFileList().add(f);
+ }
+
+ }
+ }
+ }
@Override
public void updateByIdInBatch(List<YwWorkorder> ywWorkorders) {
if (CollectionUtils.isEmpty(ywWorkorders)) {
@@ -69,7 +294,34 @@
@Override
public YwWorkorder findById(Integer id) {
- return ywWorkorderMapper.selectById(id);
+ 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,queryWrapper);
+ initFiles(model);//璇诲彇闄勪欢淇℃伅
+ YwWorkorderLog log = new YwWorkorderLog();
+ log.setJobId(model.getId());
+ log.setIsdeleted(Constants.ZERO);
+ 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;
}
@Override
@@ -80,6 +332,7 @@
@Override
public List<YwWorkorder> findList(YwWorkorder ywWorkorder) {
+ ywWorkorder.setIsdeleted(Constants.ZERO);
QueryWrapper<YwWorkorder> wrapper = new QueryWrapper<>(ywWorkorder);
return ywWorkorderMapper.selectList(wrapper);
}
@@ -87,100 +340,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)) {
@@ -189,6 +457,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