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/YwPatrolTaskRecordServiceImpl.java | 108 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
index f78013f..d556571 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
@@ -234,13 +234,7 @@
.set(YwPatrolTaskRecord::getDealInfo, ywPatrolTaskRecord.getDealInfo())
.eq(YwPatrolTaskRecord::getId,ywPatrolTaskRecord.getId()));
- //鏍囪寰呭姙宸插鐞�
- noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
- .set(Notices::getStatus,Constants.ONE)
- .eq(Notices::getIsdeleted,Constants.ZERO)
- .eq(Notices::getObjType,Constants.ONE)
- .eq(Notices::getObjId,ywPatrolTask.getId())
- );
+
if(ywPatrolTaskRecordMapper.selectCount(new QueryWrapper<YwPatrolTaskRecord>().lambda()
.eq(YwPatrolTaskRecord::getTaskId,ywPatrolTask.getId())
.eq(YwPatrolTaskRecord::getStatus,Constants.ZERO)
@@ -255,18 +249,27 @@
.set(YwPatrolTask::getEditor,loginUserInfo.getId())
);
- if(ywPatrolTaskMapper.selectCount(new QueryWrapper<YwPatrolTask>().lambda()
- .eq(YwPatrolTask::getSchemeId,ywPatrolTask.getSchemeId())
- .in(YwPatrolTask::getStatus,Constants.ZERO,Constants.ONE)
- .ne(YwPatrolTask::getId,ywPatrolTask.getId())
- )==Constants.ZERO){
- ywPatrolSchemeMapper.update(null,new UpdateWrapper<YwPatrolScheme>().lambda()
- .eq(YwPatrolScheme::getId,ywPatrolScheme.getId())
- .set(YwPatrolScheme::getStatus,Constants.TWO)
- .set(YwPatrolScheme::getEditDate,DateUtil.getCurrDateTime())
- .set(YwPatrolScheme::getEditor,loginUserInfo.getId())
- );
- }
+// if(ywPatrolTaskMapper.selectCount(new QueryWrapper<YwPatrolTask>().lambda()
+// .eq(YwPatrolTask::getSchemeId,ywPatrolTask.getSchemeId())
+// .in(YwPatrolTask::getStatus,Constants.ZERO,Constants.ONE)
+// .ne(YwPatrolTask::getId,ywPatrolTask.getId())
+// )==Constants.ZERO){
+// ywPatrolSchemeMapper.update(null,new UpdateWrapper<YwPatrolScheme>().lambda()
+// .eq(YwPatrolScheme::getId,ywPatrolScheme.getId())
+// .set(YwPatrolScheme::getStatus,Constants.TWO)
+// .set(YwPatrolScheme::getEditDate,DateUtil.getCurrDateTime())
+// .set(YwPatrolScheme::getEditor,loginUserInfo.getId())
+// );
+// }
+
+ //鏍囪寰呭姙宸插鐞�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam3,Constants.TWO)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ONE)
+ .eq(Notices::getObjId,ywPatrolTask.getId())
+ );
}else{
if(Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.ZERO)){
ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda()
@@ -276,14 +279,21 @@
.set(YwPatrolTask::getEditor,loginUserInfo.getId())
);
}
- if(Constants.equalsInteger(ywPatrolScheme.getStatus(),Constants.ZERO)){
- ywPatrolSchemeMapper.update(null,new UpdateWrapper<YwPatrolScheme>().lambda()
- .eq(YwPatrolScheme::getId,ywPatrolScheme.getId())
- .set(YwPatrolScheme::getStatus,Constants.ONE)
- .set(YwPatrolScheme::getEditDate,DateUtil.getCurrDateTime())
- .set(YwPatrolScheme::getEditor,loginUserInfo.getId())
- );
- }
+// if(Constants.equalsInteger(ywPatrolScheme.getStatus(),Constants.ZERO)){
+// ywPatrolSchemeMapper.update(null,new UpdateWrapper<YwPatrolScheme>().lambda()
+// .eq(YwPatrolScheme::getId,ywPatrolScheme.getId())
+// .set(YwPatrolScheme::getStatus,Constants.ONE)
+// .set(YwPatrolScheme::getEditDate,DateUtil.getCurrDateTime())
+// .set(YwPatrolScheme::getEditor,loginUserInfo.getId())
+// );
+// }
+ //鏍囪寰呭姙宸插鐞�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getParam3,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ONE)
+ .eq(Notices::getObjId,ywPatrolTask.getId())
+ );
}
//闄勪欢鏁版嵁
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywPatrolTaskRecord.getMultifileList())){
@@ -324,7 +334,7 @@
.leftJoin(YwPatrolPoint.class,YwPatrolPoint::getId,YwPatrolTaskRecord::getPointId)
.leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTaskRecord::getDealUserId)
.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
- .eq(YwPatrolScheme::getIsdeleted, Constants.ZERO)
+ .eq(YwPatrolTaskRecord::getIsdeleted, Constants.ZERO)
.eq(YwPatrolPoint::getCode,bean.getPointCode())
.eq(YwPatrolTaskRecord::getTaskId,bean.getTaskId())
.orderByDesc(YwPatrolScheme::getCreateDate)
@@ -339,6 +349,48 @@
}
+ /**
+ * 鏍规嵁鐧诲綍浜轰笌宸℃鐐规煡璇换鍔′俊鎭�
+ * @param bean
+ * @return
+ */
+ @Override
+ public YwPatrolTaskRecord getRecordByUserPoint(YwPatrolTaskRecord bean,LoginUserInfo loginUserInfo) {
+ if(Objects.isNull(bean)
+ || StringUtils.isBlank(bean.getPointCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(ywPatrolPointMapper.selectCount(new QueryWrapper<YwPatrolPoint>().lambda().eq(YwPatrolPoint::getCode,bean.getPointCode()))==Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈尮閰嶅埌宸℃鐐癸紝璇烽噸鏂版壂鐮�!");
+ }
+ YwPatrolTaskRecord ywPatrolTaskRecord = ywPatrolTaskRecordMapper.selectJoinOne(YwPatrolTaskRecord.class,new MPJLambdaWrapper<YwPatrolTaskRecord>()
+ .selectAll(YwPatrolTaskRecord.class)
+ .selectAs(YwPatrolPoint::getName,YwPatrolTaskRecord::getPointName)
+ .selectAs(YwPatrolPoint::getContent,YwPatrolTaskRecord::getContent)
+ .selectAs(YwPatrolPoint::getDeviceId,YwPatrolTaskRecord::getDeviceId)
+ .selectAs(YwPatrolScheme::getTitle,YwPatrolTaskRecord::getSchemeTitle)
+ .selectAs(SystemUser::getRealname,YwPatrolTaskRecord::getRealname)
+ .selectAs(Company::getName,YwPatrolTaskRecord::getCompanyName)
+ .leftJoin(YwPatrolPoint.class,YwPatrolPoint::getId,YwPatrolTaskRecord::getPointId)
+ .leftJoin(YwPatrolTask.class,YwPatrolTask::getId,YwPatrolTaskRecord::getTaskId)
+ .leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTaskRecord::getDealUserId)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .eq(YwPatrolTaskRecord::getIsdeleted, Constants.ZERO)
+ .eq(YwPatrolTaskRecord::getStatus, Constants.ZERO)
+ .eq(YwPatrolPoint::getCode,bean.getPointCode())
+ .apply(" DATE(t2.START_DATE) = DATE(NOW()) and find_in_set('"+loginUserInfo.getId()+"', t3.USER_IDS ) ")
+ .orderByDesc(YwPatrolScheme::getCreateDate)
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(ywPatrolTaskRecord)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠婃棩鏆傛棤宸℃浠诲姟!");
+ }
+ getFileListByModel(ywPatrolTaskRecord);
+ return ywPatrolTaskRecord;
+
+ }
+
--
Gitblit v1.9.3