From 1308d5475e45b5e1cf2fa027aa195a929eeca1e2 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期日, 07 四月 2024 18:07:58 +0800
Subject: [PATCH] 报备
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java | 6 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java | 13 +++++-
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java | 8 ++++
ycl-server/src/main/resources/application-dev.yml | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 8 ++--
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 65 +++++++++++++++++++++-----------
6 files changed, 72 insertions(+), 30 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
index 86ada19..599437a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+
+import java.util.Date;
/**
* 鎶ュ
@@ -56,6 +55,14 @@
@TableField("error_type")
private String errorType;
+ @ApiModelProperty("鐘舵��")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty("瀹℃牳鎰忚")
+ @TableField("audit_opinion")
+ private String auditOpinion;
+
@ApiModelProperty("鐢熸晥鏃堕棿")
@TableField("begin_create_time")
private Date beginCreateTime;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
index b06fd74..10bf0ff 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
@@ -58,6 +58,12 @@
@ApiModelProperty("鏁呴殰绫诲瀷")
private String errorType;
+ @ApiModelProperty("瀹℃牳鎰忚")
+ private String auditOpinion;
+
+ @ApiModelProperty("鐘舵��")
+ private Integer status;
+
public static Report getEntityByForm(@NonNull ReportForm form, Report entity) {
if(entity == null) {
entity = new Report();
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
index 4068006..4e63f3b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
@@ -28,5 +28,13 @@
private Date endCreateTime;
+ private String pointId;
+
+ private String peopleId;
+
+ private List<Integer> pointIdList;
+
+ private List<Integer> peopleIdList;
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index a18f98b..415104c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -1,34 +1,34 @@
package com.ycl.platform.service.impl;
-import com.ycl.platform.domain.entity.Region;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.entity.YwPeople;
+import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
-import com.ycl.platform.mapper.RegionMapper;
+import com.ycl.platform.domain.form.ReportForm;
+import com.ycl.platform.domain.query.ReportQuery;
+import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.mapper.ReportMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
+import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.ReportService;
import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.ReportForm;
-import com.ycl.platform.domain.vo.ReportVO;
-import com.ycl.platform.domain.query.ReportQuery;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
+import com.ycl.utils.SecurityUtils;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
-import java.util.ArrayList;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
/**
* 鎶ュ 鏈嶅姟瀹炵幇绫�
@@ -40,10 +40,9 @@
@RequiredArgsConstructor
public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
- private final ReportMapper reportMapper;
private final YwUnitMapper unitMapper;
+ private final YwPointMapper ywpointMapper;
private final YwPeopleMapper peopleMapper;
- private final RegionMapper regionMapper;
/**
* 娣诲姞
@@ -52,9 +51,12 @@
*/
@Override
public Result add(ReportForm form) {
- form.setPeopleId(1);
- form.setUnitId(2);
+ Long userId = SecurityUtils.getUserId();
+ YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
+ form.setPeopleId(people.getId());
+ form.setUnitId(people.getBelongUnit());
Report entity = ReportForm.getEntityByForm(form, null);
+ entity.setStatus(0);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -114,10 +116,29 @@
@Override
public Result page(ReportQuery query) {
+ if (StringUtils.isNotBlank(query.getPointId())) {
+ LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(YwPoint::getPointName, query.getPointId());
+ query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(query.getPointIdList())) {
+ return Result.ok();
+ }
+ }
+ if (StringUtils.isNotBlank(query.getPeopleId())) {
+ LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
+ query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
+ return Result.ok();
+ }
+ }
+
IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
.eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
.le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
.ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
+ .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
+ .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
.orderByDesc(Report::getCreateTime)
.page(PageUtil.getPage(query, Report.class));
@@ -129,8 +150,8 @@
vo.setUnitName(unit.getUnitName());
YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
vo.setPeopleName(ywPeople.getYwPersonName());
- Region region = regionMapper.selectById(vo.getPointId());
- vo.setPointName(region.getFullName());
+ YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
+ vo.setPointName(ywPoint.getPointName());
return vo;
}
)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 40f9093..b297192 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -212,14 +212,14 @@
unitId = people.getBelongUnit();
}
- List<Region> list = new LambdaQueryChainWrapper<>(regionMapper)
- .eq(Region::getRegionLevel, RegionLevelEnum.STREET)
- .like(Region::getFullName, keyword)
+ List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(YwPoint::getUnitId, unitId)
+ .like(YwPoint::getPointName, keyword)
.list();
List<BaseSelect> data = list.stream().map(item -> {
BaseSelect baseSelect = new BaseSelect();
baseSelect.setId(item.getId());
- baseSelect.setValue(item.getFullName());
+ baseSelect.setValue(item.getPointName());
return baseSelect;
}).collect(Collectors.toList());
return Result.ok().data(data);
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index bdaf83b..babd523 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -38,7 +38,7 @@
datasource:
url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: root
- password: 123456
+ password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
--
Gitblit v1.8.0