From d3767d594de66cb5f9d1294931acefea1866f783 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:25 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java
index ef8aa92..d30cd58 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java
@@ -2,12 +2,18 @@
import com.alibaba.druid.sql.visitor.functions.Concat;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.LoginUserModel;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.MonthDataResponse;
@@ -18,7 +24,6 @@
import com.doumee.service.business.WorkbenchesService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.jsonwebtoken.lang.Objects;
import io.swagger.models.auth.In;
import org.apache.tomcat.util.bcel.classfile.Constant;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +32,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -53,21 +59,32 @@
@Autowired
private YwStocktakingMapper ywStocktakingMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
@Override
public List<YwQuickModel> getYwQuickList(LoginUserInfo loginUserInfo){
List<YwQuickModel> ywQuickModelList = ywQuickModelMapper.selectList(new QueryWrapper<YwQuickModel>().lambda()
.eq(YwQuickModel::getIsdeleted, Constants.ZERO)
- .eq(YwQuickModel::getUserId,loginUserInfo.getId())
+ .isNull(YwQuickModel::getUserId)
.orderByAsc(YwQuickModel::getSort)
);
- if(CollectionUtils.isEmpty(ywQuickModelList)){
- ywQuickModelList = ywQuickModelMapper.selectList(new QueryWrapper<YwQuickModel>().lambda()
+ if(Objects.nonNull(loginUserInfo)){
+ List<YwQuickModel> userModelList = ywQuickModelMapper.selectList(new QueryWrapper<YwQuickModel>().lambda()
.eq(YwQuickModel::getIsdeleted, Constants.ZERO)
- .isNull(YwQuickModel::getUserId)
+ .eq(YwQuickModel::getUserId,loginUserInfo.getId())
.orderByAsc(YwQuickModel::getSort)
);
+ if(CollectionUtils.isNotEmpty(userModelList)){
+ ywQuickModelList = userModelList;
+ }
+ }
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_QUICK_MODEL).getCode();
+ for (YwQuickModel ywQuickModel:ywQuickModelList) {
+ ywQuickModel.setIcoPath(path + ywQuickModel.getIcoPath());
}
return ywQuickModelList;
}
@@ -80,7 +97,7 @@
.isNull(YwQuickModel::getUserId)
.orderByAsc(YwQuickModel::getSort)
);
- if(CollectionUtils.isEmpty(ywQuickModelList) || Constants.equalsInteger(idList.size(),ywQuickModelList.size())){
+ if(CollectionUtils.isEmpty(ywQuickModelList) ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"蹇嵎妯″潡閰嶇疆寮傚父,璇疯仈绯荤鐞嗗憳");
}
ywQuickModelMapper.delete(new QueryWrapper<YwQuickModel>().lambda().eq(YwQuickModel::getUserId,loginUserInfo.getId()));
@@ -111,6 +128,8 @@
.eq(Notices::getUserId,loginUserInfo.getId())
.eq(Notices::getIsdeleted,Constants.ZERO)
.eq(Notices::getStatus,Constants.ZERO)
+ .like(Notices::getParam1,yearMonth)
+ .ne(Notices::getObjType,Constants.TWO)
);
for (String str:dataList) {
MonthDataResponse monthDataResponse = new MonthDataResponse();
@@ -173,9 +192,22 @@
-
-
-
+ @Override
+ public PageData<Notices> getMyNotices(PageWrap<Notices> pageWrap,LoginUserInfo loginUserInfo) {
+ IPage<Notices> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
+ Notices model = pageWrap.getModel();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.selectAll(Notices.class)
+ .eq(Notices::getUserId,loginUserInfo.getId())
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getStatus()),Notices::getStatus,model.getStatus())
+ .apply(" param1 <= CURDATE() ")
+ .orderByAsc(Notices::getReaded)
+ .orderByDesc(Notices::getId);
+ PageData<Notices> pageData = PageData.from(noticesJoinMapper.selectJoinPage(page,Notices.class, queryWrapper));
+ return pageData;
+ }
--
Gitblit v1.9.3