From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java
index 1972279..dee3a6b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java
@@ -4,24 +4,19 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.equipment.UnionOutdoorSiteDto;
import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
-import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoAddDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_equipment.dao.UnionReportMapper;
import com.panzhihua.service_equipment.dao.UnionUserMapper;
-import com.panzhihua.service_equipment.model.dos.UnionOutdoorSite;
import com.panzhihua.service_equipment.model.dos.UnionReport;
import com.panzhihua.service_equipment.model.dos.UnionUser;
import com.panzhihua.service_equipment.service.UnionReportService;
-import com.panzhihua.service_equipment.service.UnionUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.util.Date;
@Service
@Slf4j
@@ -41,8 +36,15 @@
public R add(UnionReportDto unionReportDto) {
UnionReport unionReport = new UnionReport();
BeanUtils.copyProperties(unionReportDto, unionReport);
- UnionUser unionUser = unionUserMapper
- .selectOne(new QueryWrapper<UnionUser>().eq("user_id", unionReport.getCreateUserId()));
+ UnionUser unionUser=null;
+ if (unionReportDto.getIsApplets().equals(1))
+ {
+ unionUser = unionUserMapper
+ .selectOne(new QueryWrapper<UnionUser>().eq("user_id", unionReportDto.getCreateUserId()));
+ }else if (unionReportDto.getIsApplets().equals(3)) {
+ unionUser = unionUserMapper
+ .selectOne(new QueryWrapper<UnionUser>().eq("id", unionReportDto.getCreateUnionUserId()));
+ }
if (unionUser!=null)
unionReport.setCreateUnionUserId(unionUser.getId());
unionReport.setStatus(1);
@@ -67,6 +69,14 @@
unionOutdoorLaborDynamicQueryWrapper.eq("create_user_id",unionReportDto.getCreateUserId());
if (unionReportDto.getType()!=null)
unionOutdoorLaborDynamicQueryWrapper.eq("type",unionReportDto.getType());
+ if (unionReportDto.getStatus()!=null)
+ unionOutdoorLaborDynamicQueryWrapper.eq("status",unionReportDto.getStatus());
+ }else if(unionReportDto.getIsApplets().equals(3)){
+ unionOutdoorLaborDynamicQueryWrapper.eq("create_union_user_id",unionReportDto.getCreateUnionUserId()).eq("type",unionReportDto.getType());
+ if (unionReportDto.getStatus()!=null)
+ unionOutdoorLaborDynamicQueryWrapper.eq("status",unionReportDto.getStatus());
+ if (unionReportDto.getType()!=null)
+ unionOutdoorLaborDynamicQueryWrapper.eq("type",unionReportDto.getType());
}
Page pageResult = baseMapper.selectPage(page, unionOutdoorLaborDynamicQueryWrapper);
pageResult.setTotal(pageResult.getRecords().size());
--
Gitblit v1.7.1