From 8ea3b11f54ea9b56f295eeed04eb869e7f67bd16 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 21:33:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java | 1
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java | 65 +++++++++-------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 14 ---
ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/AppealListDTO.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/TTemplateCountService.java | 22 +++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTemplateCountMapper.java | 25 ++++++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 16 +++
ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml | 1
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 5 -
ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateCount.java | 44 +++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTemplateCountServiceImpl.java | 23 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 3
15 files changed, 177 insertions(+), 51 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 5525bf0..c19569c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -645,7 +645,7 @@
.eq(TDictData::getDataType, 2));
List<AnalysisUnqualifiedCleaningDetailVO> analysisUnqualifiedCleaningDetailVOS = new ArrayList<>();
for (TDictData tDictData : dictDataList) {
- List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());
+ List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> org.springframework.util.StringUtils.hasLength(taskDetail.getUnqualified())&& taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());
AnalysisUnqualifiedCleaningDetailVO analysisUnqualifiedCleaningDetailVO = new AnalysisUnqualifiedCleaningDetailVO();
analysisUnqualifiedCleaningDetailVO.setUnqualifiedName(tDictData.getDataContent());
analysisUnqualifiedCleaningDetailVO.setCount(tTaskDetails.size());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
index 463f62a..66d457d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
@@ -178,6 +178,9 @@
@PostMapping(value = "/audit")
public R<Boolean> audit(@RequestBody @Valid TAppealAuditDTO dto) {
TAppeal appeal = appealService.getById(dto.getId());
+ dto.setStatus(dto.getStatus());
+ dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ dto.setAuditTime(LocalDateTime.now());
TTask task = taskCleanService.getById(appeal.getTaskId());
TLocation location = locationService.getById(task.getLocationId());
TNotice tNotice = new TNotice();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
index 16a19e4..5c0dab0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
@@ -276,20 +276,6 @@
public void importTemplate() {
List<TLocationImportExcel> locationImportExcels = new ArrayList<>();
TLocationImportExcel tLocationImportExcel = new TLocationImportExcel();
- tLocationImportExcel.setDeptCode("1");
- tLocationImportExcel.setDeptName("1");
- tLocationImportExcel.setNickName("1");
- tLocationImportExcel.setProjectCodeClear("1");
- tLocationImportExcel.setDeptCodeClear("1");
- tLocationImportExcel.setCleanerCodeClear("1");
- tLocationImportExcel.setLocationCode("1");
- tLocationImportExcel.setLocationType("1");
- tLocationImportExcel.setLocationName("1");
- tLocationImportExcel.setLocationAddress("1");
- tLocationImportExcel.setLocationAddressEnd("1");
- tLocationImportExcel.setLocationAddressLonLat("1");
- tLocationImportExcel.setLocationAddressEndLonLat("1");
-
locationImportExcels.add(tLocationImportExcel);
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TLocationImportExcel.class, locationImportExcels);
HttpServletResponse response = WebUtils.response();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
index 3239352..74d5f09 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
@@ -176,6 +176,9 @@
public R<Boolean> audit(@RequestBody TTaskAuditDTO dto) {
dto.setAuditTime(LocalDateTime.now());
TTask task = taskCleanerService.getById(dto.getTaskId());
+ TTaskDetail one = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId())
+ .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
+ dto.setClearStatus(one.getClearStatus());
TLocation location = locationService.getById(task.getLocationId());
TNotice tNotice = new TNotice();
TNoticeSet noticeSet = noticeSetService.lambdaQuery().eq(TNoticeSet::getType, 2).last("limit 1")
@@ -230,6 +233,11 @@
noticeService.save(tNotice);
dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
taskDetailService.save(dto);
+ one.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ one.setAuditTime(LocalDateTime.now());
+ one.setAuditRemark(dto.getAuditRemark());
+ one.setAuditStatus(dto.getAuditStatus());
+ taskDetailService.updateById(one);
return R.ok();
}
@Log(title = "批量审核任务", businessType = BusinessType.UPDATE)
@@ -340,9 +348,11 @@
byId4.setUnqualifiedName(byId3.getDataContent());
}
}
- SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
- if (sysUser!=null){
- byId4.setAuditPersonName(sysUser.getUserName());
+ if (byId4.getAuditPerson()!=null){
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
+ if (sysUser!=null){
+ byId4.setAuditPersonName(sysUser.getUserName());
+ }
}
taskDetailVO.setTaskDetail(byId4);
return R.ok(taskDetailVO);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
index 875d1e4..4651396 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
@@ -985,6 +985,7 @@
List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)
.in(TTaskDetail::getTaskId, taskIds)
.eq(TTaskDetail::getClearStatus, 2)
+ .eq(TTaskDetail::getHandleType,1)
.orderByDesc(TTaskDetail::getCreateTime));
List<TTaskDetail> taskDetailList = new ArrayList<>();
for (TTask task : list) {
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
index 3506451..a41fc1b 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
@@ -396,7 +396,7 @@
List<TTaskDetail> status3 = taskDetails.stream().filter(e -> e.getClearStatus() == 1).collect(Collectors.toList());
List<TTaskDetail> status4 = taskDetails.stream().filter(e -> e.getClearStatus() == 2).collect(Collectors.toList());
- if (status3.size() + status4.size() != 0) {
+ if (!status3.isEmpty()) {
BigDecimal divide = new BigDecimal(status3.size() + status4.size())
.divide(new BigDecimal(status3.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
res.setRate(divide);
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java
index fc5d934..8bb4677 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TTaskDetailController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.applet.dto.AppealDTO;
import com.ruoyi.system.dto.TTaskAuditBatchDTO;
import com.ruoyi.system.dto.TaskDetailDto;
@@ -30,6 +31,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -67,43 +69,50 @@
if (task==null)return R.fail("任务不存在");
TLocation location = locationService.getById(task.getLocationId());
if (location==null)return R.fail("点位不存在");
- try {
- String routeJson = AmapApiClient.getDrivingRoute(Double.parseDouble(location.getLocationLat()),
- Double.parseDouble(location.getLocationLon()),
- Double.parseDouble(location.getLocationLatEnd()),
- Double.parseDouble(location.getLocationLonEnd()));
- // 转化为json对象
- JSONObject jsonObject = JSONObject.parseObject(routeJson);
- JSONObject route = jsonObject.getJSONObject("route");
- JSONArray paths = route.getJSONArray("paths");
- JSONObject o = (JSONObject)paths.get(0);
- BigDecimal distance = o.getBigDecimal("distance");
- System.err.println( paths);
- List<double[]> fivePoints = PathParser.parseAndInterpolate(routeJson, segments,
- Double.parseDouble(location.getLocationLat()),
- Double.parseDouble(location.getLocationLon()),
- Double.parseDouble(location.getLocationLatEnd()),
- Double.parseDouble(location.getLocationLonEnd()));
-
- if (GeoChecker.isInAnyCircle(Double.parseDouble(dto.getLat()), Double.parseDouble(dto.getLon()),
- fivePoints, radius)) {
- System.out.println("✅ 成功！您位于某个圆形电子围栏范围内。");
- } else {
- System.out.println("❌ 失败！您不在任何圆形电子围栏范围内。");
- return R.fail("位置信息与点位不一致，请点击此处更新定位");
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+// try {
+// String routeJson = AmapApiClient.getDrivingRoute(Double.parseDouble(location.getLocationLat()),
+// Double.parseDouble(location.getLocationLon()),
+// Double.parseDouble(location.getLocationLatEnd()),
+// Double.parseDouble(location.getLocationLonEnd()));
+// // 转化为json对象
+// JSONObject jsonObject = JSONObject.parseObject(routeJson);
+// JSONObject route = jsonObject.getJSONObject("route");
+// JSONArray paths = route.getJSONArray("paths");
+// JSONObject o = (JSONObject)paths.get(0);
+// BigDecimal distance = o.getBigDecimal("distance");
+// System.err.println( paths);
+// List<double[]> fivePoints = PathParser.parseAndInterpolate(routeJson, segments,
+// Double.parseDouble(location.getLocationLat()),
+// Double.parseDouble(location.getLocationLon()),
+// Double.parseDouble(location.getLocationLatEnd()),
+// Double.parseDouble(location.getLocationLonEnd()));
+//
+// if (GeoChecker.isInAnyCircle(Double.parseDouble(dto.getLat()), Double.parseDouble(dto.getLon()),
+// fivePoints, radius)) {
+// System.out.println("✅ 成功！您位于某个圆形电子围栏范围内。");
+// } else {
+// System.out.println("❌ 失败！您不在任何圆形电子围栏范围内。");
+// return R.fail("位置信息与点位不一致，请点击此处更新定位");
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
taskDetailService.save(dto);
// 修改任务状态
taskService.update(Wrappers.<TTask>lambdaUpdate().set(TTask::getStatus, 3).eq(TTask::getId, dto.getTaskId()));
return R.ok();
}
+ @Resource
+ private TokenService tokenService;
@ApiOperation(value = "申诉")
@PostMapping(value = "/appeal")
public R<Boolean> appeal(@RequestBody AppealDTO dto) {
+ List<TAppeal> list = appealService.lambdaQuery().eq(TAppeal::getTaskId, dto.getTaskId()).list();
+ if (!list.isEmpty()){
+ return R.fail("任务只有一次申诉机会");
+ }
+ dto.setAppealPerson(tokenService.getLoginUserApplet().getUserId()+"");
appealService.save(dto);
// 添加任务详情
TTaskDetail taskDetail = new TTaskDetail();
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index a2591e1..0273f65 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -243,7 +243,7 @@
userIndexVO.setFinishCount(size);
List<TTaskDetail> status1 = taskDetails.stream().filter(e -> e.getClearStatus() == 1).collect(Collectors.toList());
List<TTaskDetail> status2 = taskDetails.stream().filter(e -> e.getClearStatus() == 2).collect(Collectors.toList());
- if (status1.size() + status2.size() != 0) {
+ if (!status1.isEmpty()) {
BigDecimal divide = new BigDecimal(status1.size() + status2.size())
.divide(new BigDecimal(status1.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
userIndexVO.setRate(divide);
@@ -457,7 +457,6 @@
Long userRole = sysUserService.getUserRole(userId);
SysRole sysRole = roleService.selectRoleById(userRole);
List<SysUser> sysUsers = sysUserService.selectAllList();
- sysRole.setRoleName("项目负责人");
SysUser auditPerson = sysUserService.selectUserById(999L);
//项目负责人、部门负责人、公司成员提交由最终审批人审批；
if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目负责人") || sysRole.getRoleName().contains("部门负责人")) {
@@ -546,7 +545,6 @@
leaveDTO.setTemplateId(user.getTemplateId());
leaveDTO.setLeavePerson(userId + "");
leaveService.save(leaveDTO);
- sysRole.setRoleName("项目负责人");
//项目负责人、部门负责人、公司成员提交由最终审批人审批；
if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目负责人") || sysRole.getRoleName().contains("部门负责人")) {
TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
@@ -649,7 +647,6 @@
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leave.getLeavePerson()));
Long userRole = sysUserService.getUserRole(sysUser.getUserId());
SysRole sysRole = roleService.selectRoleById(userRole);
- sysRole.setRoleName("项目负责人");
if (sysRole.getRoleName().contains("现场负责人") || sysRole.getRoleName().equals("组长")) {
if (sysUser.getDeptType() == 1) {
TProjectDept tProjectDept = projectDeptService.getById(sysUser.getDeptId());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/AppealListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/AppealListDTO.java
index 1dc59e9..e5ecce5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/AppealListDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/AppealListDTO.java
@@ -13,4 +13,6 @@
private String lon;
@ApiModelProperty(value = "纬度")
private String lat;
+ @ApiModelProperty(value = "当前用户id 前端忽略")
+ private String userId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTemplateCountMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTemplateCountMapper.java
new file mode 100644
index 0000000..abd88e8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTemplateCountMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.applet.query.KnowledgeListUserQuery;
+import com.ruoyi.system.applet.vo.KnowledgeVO;
+import com.ruoyi.system.model.TKnowledge;
+import com.ruoyi.system.model.TTemplateCount;
+import com.ruoyi.system.query.KnowledgeListQuery;
+import com.ruoyi.system.vo.system.KnowledgeListVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 环卫知识 Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-05-28
+ */
+public interface TTemplateCountMapper extends BaseMapper<TTemplateCount> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateCount.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateCount.java
new file mode 100644
index 0000000..d04cb14
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateCount.java
@@ -0,0 +1,44 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 任务模板
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_template_count")
+@ApiModel(value="TTemplateCount对象", description="TTemplateCount")
+public class TTemplateCount extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @ApiModelProperty(value = "备注")
+ @TableField("template_id")
+ private String templateId;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("user_id")
+ private Long userId;
+ @ApiModelProperty(value = "周期内生成任务数量")
+ @TableField("task_count")
+ private Integer taskCount;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTemplateCountService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTemplateCountService.java
new file mode 100644
index 0000000..9c042ff
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTemplateCountService.java
@@ -0,0 +1,22 @@
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.applet.query.LeaveListUserQuery;
+import com.ruoyi.system.applet.vo.LeaveUserListVO;
+import com.ruoyi.system.model.TLeave;
+import com.ruoyi.system.model.TTemplateCount;
+import com.ruoyi.system.query.LeaveListQuery;
+import com.ruoyi.system.vo.system.LeaveListVO;
+
+/**
+ * <p>
+ * 请假记录 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-05-28
+ */
+public interface TTemplateCountService extends IService<TTemplateCount> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTemplateCountServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTemplateCountServiceImpl.java
new file mode 100644
index 0000000..05c304e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTemplateCountServiceImpl.java
@@ -0,0 +1,23 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.mapper.TLeaveAuditMapper;
+import com.ruoyi.system.mapper.TTemplateCountMapper;
+import com.ruoyi.system.model.TLeaveAudit;
+import com.ruoyi.system.model.TTemplateCount;
+import com.ruoyi.system.service.TLeaveAuditService;
+import com.ruoyi.system.service.TTemplateCountService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 请假审批记录 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-05-28
+ */
+@Service
+public class TTemplateCountServiceImpl extends ServiceImpl<TTemplateCountMapper, TTemplateCount> implements TTemplateCountService {
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml
index 77824b6..a40d46c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml
@@ -59,6 +59,7 @@
<if test="query.startTime != null and startTime != ''">
and (t5.implement_time between #{startTime} and #{endTime})
</if>
+ order by t1.create_time desc
</select>
<select id="pageListUser" resultType="com.ruoyi.system.vo.system.AppealListVO">
select t1.*,t2.location_name as locationName,t3.location_name as locationTypeName,
@@ -147,8 +148,10 @@
) AS t2 ON t1.task_id = t2.task_id AND t1.create_time = t2.max_time
) t5 on t1.id = t5.task_id
where 1=1
+ and t1.patrol_inspector = #{query.userId}
and t1.`disabled` = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
and t1.status !=3 and t1.status !=5 and t1.status !=6
+ AND DATE(t1.implement_time) = CURDATE()
order by distance asc
</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml
index 00ae49c..8778255 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml
@@ -59,6 +59,7 @@
<if test="query.startTime != null and query.startTime != ''">
and (t1.implement_time between #{query.startTime} and #{query.endTime})
</if>
+ order by t1.create_time desc
</select>
<select id="pageListUser" resultType="com.ruoyi.system.applet.vo.TaskUserListVO">
select t1.*,t2.location_name as locationName,t3.location_name as locationTypeName,
--
Gitblit v1.7.1