From d7dca690cedd12e271f0ee0b9050679d73796f5c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 06 一月 2025 09:28:10 +0800
Subject: [PATCH] 1
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 32 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 9557e62..d025f21 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
@@ -56,6 +56,8 @@
@Autowired
private YwPatrolTaskMapper ywPatrolTaskMapper;
+ @Autowired
+ private YwPatrolSchemeMapper ywPatrolSchemeMapper;
@Override
@@ -135,7 +137,33 @@
.orderByDesc(YwPatrolScheme::getCreateDate)
;
IPage<YwPatrolTaskRecord> iPage = ywPatrolTaskRecordMapper.selectJoinPage(page,YwPatrolTaskRecord.class,queryWrapper);
+ if(iPage!=null && iPage.getRecords()!=null){
+ for(YwPatrolTaskRecord m : iPage.getRecords()){
+ getFileListByModel(m);
+ }
+ }
return PageData.from(iPage);
+ }
+
+ private void getFileListByModel(YwPatrolTaskRecord ywPatrolTaskRecord) {
+ //闄勪欢鏁版嵁
+ List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
+ .selectAll(Multifile.class)
+ .selectAs(SystemUser::getRealname,Multifile::getUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
+ .eq(Multifile::getObjId,ywPatrolTaskRecord.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_TASK_RECORD_FILE.getKey()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
+ for (Multifile multifile:multifileList) {
+ if(StringUtils.isNotBlank(multifile.getFileurl())){
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ }
+ ywPatrolTaskRecord.setMultifileList(multifileList);
+ }
}
@Override
@@ -149,7 +177,8 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void patrolData(YwPatrolTaskRecord ywPatrolTaskRecord) {
if(Objects.isNull(ywPatrolTaskRecord)
- || Objects.isNull(ywPatrolTaskRecord.getId())
+ || Objects.isNull(ywPatrolTaskRecord.getId())
+ || Objects.isNull(ywPatrolTaskRecord.getDealStatus())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -161,13 +190,17 @@
if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆");
}
+
YwPatrolPoint ywPatrolPoint = ywPatrolPointMapper.selectById(model.getPointId());
if(Objects.isNull(ywPatrolPoint)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- YwDevice ywDevice = ywDeviceMapper.selectById(ywPatrolPoint.getDeviceId());
- if(Objects.isNull(ywDevice)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ YwPatrolScheme ywPatrolScheme = ywPatrolSchemeMapper.selectById(model.getSchemeId());
+ if(Objects.isNull(ywPatrolScheme)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸℃璁″垝淇℃伅");
+ }
+ if(!ywPatrolScheme.getUserIds().equals(loginUserInfo.getId().toString())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"闈炴偍鐨勫贰妫�浠诲姟鏃犳硶杩涜澶勭悊");
}
YwPatrolTask ywPatrolTask = ywPatrolTaskMapper.selectById(model.getTaskId());
if(Objects.isNull(ywPatrolTask)){
@@ -176,8 +209,9 @@
if(ywPatrolTask.getStartDate().getTime()>System.currentTimeMillis()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌宸℃鏃堕棿鏃犳硶杩涜璇ユ搷浣�");
}
+
ywPatrolTaskRecordMapper.update(null,new UpdateWrapper<YwPatrolTaskRecord>().lambda()
- .set(YwPatrolTaskRecord::getDealStatus,ywDevice.getStatus())
+ .set(YwPatrolTaskRecord::getDealStatus,ywPatrolTaskRecord.getDealStatus())
.set(YwPatrolTaskRecord::getEditor,loginUserInfo.getId())
.set(YwPatrolTaskRecord::getEditDate, DateUtil.getCurrDateTime())
.set(YwPatrolTaskRecord::getDealDate, DateUtil.getCurrDateTime())
@@ -188,17 +222,48 @@
if(ywPatrolTaskRecordMapper.selectCount(new QueryWrapper<YwPatrolTaskRecord>().lambda()
.eq(YwPatrolTaskRecord::getTaskId,ywPatrolTask.getId())
- .ne(YwPatrolTaskRecord::getId,ywPatrolTaskRecord.getId()))==Constants.ZERO){
- ywPatrolTask.setStatus(Constants.THREE);
+ .eq(YwPatrolTaskRecord::getStatus,Constants.ZERO)
+ .ne(YwPatrolTaskRecord::getId,ywPatrolTaskRecord.getId())
+ )==Constants.ZERO){
+ ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda()
+ .eq(YwPatrolTask::getId,ywPatrolTask.getId())
+ .set(YwPatrolTask::getStatus,Constants.THREE)
+ .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
+ .set(YwPatrolTask::getDealDate,DateUtil.getCurrDateTime())
+ .set(YwPatrolTask::getDealUserId,loginUserInfo.getId())
+ .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())
+ );
+ }
}else{
- ywPatrolTask.setStatus(Constants.ONE);
+ if(Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.ZERO)){
+ ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda()
+ .eq(YwPatrolTask::getId,ywPatrolTask.getId())
+ .set(YwPatrolTask::getStatus,Constants.ONE)
+ .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
+ .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())
+ );
+ }
}
- //鏌ヨ鏄惁瀛樺湪鍏朵粬鏈�
- ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda().eq(YwPatrolTask::getId,ywPatrolTask.getId())
- .set(YwPatrolTask::getStatus,ywPatrolTask.getStatus())
- .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
- .set(YwPatrolTask::getEditor,loginUserInfo.getId())
- );
//闄勪欢鏁版嵁
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywPatrolTaskRecord.getMultifileList())){
for (Multifile multifile:ywPatrolTaskRecord.getMultifileList()) {
@@ -232,6 +297,7 @@
.selectAll(YwPatrolTaskRecord.class)
.selectAs(YwPatrolPoint::getName,YwPatrolTaskRecord::getPointName)
.selectAs(YwPatrolPoint::getContent,YwPatrolTaskRecord::getContent)
+ .selectAs(YwPatrolPoint::getDeviceId,YwPatrolTaskRecord::getDeviceId)
.selectAs(SystemUser::getRealname,YwPatrolTaskRecord::getRealname)
.selectAs(Company::getName,YwPatrolTaskRecord::getCompanyName)
.leftJoin(YwPatrolPoint.class,YwPatrolPoint::getId,YwPatrolTaskRecord::getPointId)
@@ -246,24 +312,7 @@
if(Objects.isNull(ywPatrolTaskRecord)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈尮閰嶅埌宸℃鐐�!");
}
- //闄勪欢鏁版嵁
- List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
- .selectAll(Multifile.class)
- .selectAs(SystemUser::getRealname,Multifile::getUserName)
- .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
- .eq(Multifile::getObjId,ywPatrolTaskRecord.getId())
- .eq(Multifile::getIsdeleted,Constants.ZERO)
- .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_TASK_RECORD_FILE.getKey()));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
- for (Multifile multifile:multifileList) {
- if(StringUtils.isNotBlank(multifile.getFileurl())){
- multifile.setFileurlFull(path + multifile.getFileurl());
- }
- }
- ywPatrolTaskRecord.setMultifileList(multifileList);
- }
+ getFileListByModel(ywPatrolTaskRecord);
return ywPatrolTaskRecord;
--
Gitblit v1.9.3