From ae70dd59b9c9b182e8b6d95c7071f16907b8f6cf Mon Sep 17 00:00:00 2001 From: zef <1146339010@QQ.com> Date: Fri, 5 Jul 2024 17:36:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E5=B7=B2?= =?UTF-8?q?=E8=AF=BB=E6=9C=AA=E8=AF=BB=E6=95=B0=E9=87=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbCompanyVerificationController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/anHuiEnterprise/controller/TbCompanyVerificationController.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/anHuiEnterprise/controller/TbCompanyVerificationController.java index 671098a..66cb1d9 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/anHuiEnterprise/controller/TbCompanyVerificationController.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/anHuiEnterprise/controller/TbCompanyVerificationController.java @@ -1,7 +1,6 @@ package com.ruoyi.business.anHuiEnterprise.controller; import java.util.*; -import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -11,8 +10,6 @@ import com.ruoyi.business.anHuiEnterprise.domain.TbCompanyVerification; import com.ruoyi.business.anHuiEnterprise.domain.TbVerificationUserDetails; import com.ruoyi.business.anHuiEnterprise.service.ITbCompanyVerificationService; import com.ruoyi.business.anHuiEnterprise.service.ITbVerificationUserDetailsService; -import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReporting; -import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReportingDetails; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.DateUtils; @@ -21,8 +18,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -36,7 +31,6 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** @@ -254,7 +248,13 @@ public class TbCompanyVerificationController extends BaseController { @ApiOperation("获取已读未读数量") @ApiOperationSupport(author = "张二富", order = 25) @ApiImplicitParam(name = "companyId", value = "企业id", required = true) - public R> readCount(TbCompanyVerification tbCompanyVerification){ + public R readCount(@RequestBody TbCompanyVerification tbCompanyVerification){ + if (tbCompanyVerification!=null&&tbCompanyVerification.getCompanyId()!=null&&StringUtils.isBlank(tbCompanyVerification.getCompanyId()+"")){ + R rspData = new R<>(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + return rspData; + } HashMap map = new HashMap<>(); QueryWrapper total = new QueryWrapper<>(); @@ -278,7 +278,7 @@ public class TbCompanyVerificationController extends BaseController { readFalse.eq(StringUtils.camelToUnderline(TbCompanyVerification.Fields.auditState),"0"); readFalse.eq(StringUtils.camelToUnderline(TbCompanyVerification.Fields.readState),"1"); readFalse.eq(StringUtils.camelToUnderline(TbCompanyVerification.Fields.companyId),tbCompanyVerification.getCompanyId()); - List readFalseList =tbCompanyVerificationService.list(readTrue); + List readFalseList =tbCompanyVerificationService.list(readFalse); map.put("totalCount",totalList.size()); map.put("readTrueCount",readTrueList.size()); map.put("readFalseCount",readFalseList.size());