From 22a4f2b58fa1baa233e621d1406df456b516b4b1 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 07 四月 2026 16:19:07 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java
index f6f97b4..50229c7 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java
@@ -1,22 +1,32 @@
package com.fzzy.igds.app.v1.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.common.constant.RespCodeEnum;
+import com.fzzy.common.utils.DateUtil;
import com.fzzy.igds.app.v1.constant.PhoneConstant;
import com.fzzy.igds.app.v1.data.AuthUser;
import com.fzzy.igds.app.v1.data.ParamPatrol;
import com.fzzy.igds.app.v1.data.PhoneRequest;
import com.fzzy.igds.app.v1.data.PhoneResponse;
+import com.fzzy.igds.app.v1.dto.PPatrolDto;
import com.fzzy.igds.app.v1.service.PhoneService;
import com.fzzy.igds.app.v1.util.PhoneRespUtil;
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.domain.Patrol;
import com.fzzy.igds.domain.PatrolRecord;
+import com.fzzy.igds.mapper.PatrolMapper;
import com.fzzy.igds.service.PatrolService;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @Author: YYC
@@ -49,7 +59,13 @@
if (null == param.getDateTime()) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- List<PatrolRecord> list = patrolService.getRecordByPatrolId(DateFormatUtils.format(param.getDateTime(), "yyyyMMdd"),null,null);
+ String userType = authUser.getUserType();
+ Map<String,String> paramMap = new HashMap<>();
+ if (Constant.USER_TYPE_30.equals(userType)){
+ paramMap.put("name",authUser.getUsername());
+ }
+ paramMap.put("patrolId",DateFormatUtils.format(param.getDateTime(), "yyyyMMdd"));
+ List<PatrolRecord> list = patrolService.getRecordByPatrolId(paramMap);
return PhoneRespUtil.success(list, req);
}
}
--
Gitblit v1.9.3