From be290203369f9cbd618948901f79db5964bf01a6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 20 十二月 2024 10:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 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 6fb3725..f463fe7 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
@@ -188,17 +188,24 @@
if(ywPatrolTaskRecordMapper.selectCount(new QueryWrapper<YwPatrolTaskRecord>().lambda()
.eq(YwPatrolTaskRecord::getTaskId,ywPatrolTask.getId())
+ .eq(YwPatrolTaskRecord::getStatus,Constants.ZERO)
.ne(YwPatrolTaskRecord::getId,ywPatrolTaskRecord.getId()))==Constants.ZERO){
- ywPatrolTask.setStatus(Constants.THREE);
+ 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())
+ );
}else{
- ywPatrolTask.setStatus(Constants.ONE);
+ 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())
+ );
}
- //鏌ヨ鏄惁瀛樺湪鍏朵粬鏈�
- 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()) {
@@ -221,6 +228,58 @@
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public YwPatrolTaskRecord getPointRecordByCode(YwPatrolTaskRecord bean) {
+ if(Objects.isNull(bean)
+ || Objects.isNull(bean.getTaskId())
+ || StringUtils.isBlank(bean.getPointCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ YwPatrolTaskRecord ywPatrolTaskRecord = ywPatrolTaskRecordMapper.selectJoinOne(YwPatrolTaskRecord.class,new MPJLambdaWrapper<YwPatrolTaskRecord>()
+ .selectAll(YwPatrolTaskRecord.class)
+ .selectAs(YwPatrolPoint::getName,YwPatrolTaskRecord::getPointName)
+ .selectAs(YwPatrolPoint::getContent,YwPatrolTaskRecord::getContent)
+ .selectAs(SystemUser::getRealname,YwPatrolTaskRecord::getRealname)
+ .selectAs(Company::getName,YwPatrolTaskRecord::getCompanyName)
+ .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(YwPatrolPoint::getCode,bean.getPointCode())
+ .eq(YwPatrolTaskRecord::getTaskId,bean.getTaskId())
+ .orderByDesc(YwPatrolScheme::getCreateDate)
+ .last(" limit 1 ")
+ );
+ 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);
+ }
+
+ return ywPatrolTaskRecord;
+
+ }
+
+
+
+
+ @Override
public YwPatrolTaskRecord getDetail(Integer id) {
YwPatrolTaskRecord ywPatrolTaskRecord = ywPatrolTaskRecordMapper.selectJoinOne(YwPatrolTaskRecord.class,new MPJLambdaWrapper<YwPatrolTaskRecord>()
--
Gitblit v1.9.3