From 16e89b3363f73806ed39215d6530b087e8dd44ed Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 24 Mar 2025 10:37:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicInformationController.java | 13 ++++++++++++ .../gysl/controller/QyStatsController.java | 11 +++++++++- .../gysl/controller/ZwStatsController.java | 10 +++++++++ .../ruoyi/gysl/entity/BasicInformation.java | 4 ++-- .../java/com/ruoyi/gysl/entity/Notice.java | 2 +- .../com/ruoyi/gysl/mapper/QyStatsMapper.java | 5 +++++ .../com/ruoyi/gysl/mapper/ZwStatsMapper.java | 5 +++++ .../ruoyi/gysl/service/QyStatsService.java | 5 +++++ .../ruoyi/gysl/service/ZwStatsService.java | 5 +++++ .../impl/BasicInformationServiceImpl.java | 21 ++++++++++++++++++- .../gysl/service/impl/QyStatsServiceImpl.java | 8 +++++++ .../gysl/service/impl/ZwStatsServiceImpl.java | 8 +++++++ .../main/resources/mapper/QyStatsMapper.xml | 4 ++++ .../main/resources/mapper/ZwStatsMapper.xml | 6 +++++- .../com/ruoyi/common/annotation/Excel.java | 5 +++++ .../com/ruoyi/common/utils/poi/ExcelUtil.java | 8 +++++++ 16 files changed, 114 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java index 1c86e3a..b10c200 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java @@ -63,6 +63,12 @@ public class BasicInformationController extends BaseController { @Resource private MxService mxService; + /** + * 消息通知 + */ + @Resource + private NoticeService noticeService; + /** * 五要素模型信息 */ @@ -188,6 +194,13 @@ public class BasicInformationController extends BaseController { projectOtherInfo.setZdname(y); saveOther.add(projectOtherInfo); }); + //新增消息 + Notice notice = new Notice(); + notice.setType(2); + notice.setTyshxydm(x.getTyshxydm()); + notice.setXmId(x.getId()); + notice.setContent("关于"+x.getName()+"项目,待填报的通知"); + noticeService.save(notice); }); successMsg.append("导入成功"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java index 9946185..58ac932 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; @Api(tags = "企业统计") @RestController @RequestMapping("/gysl/qyStats") -@PreAuthorize("@ss.hasAnyRoles('company')") +//@PreAuthorize("@ss.hasAnyRoles('company')") public class QyStatsController extends BaseController { @Resource @@ -55,5 +55,14 @@ public class QyStatsController extends BaseController { public AjaxResult qyNotice() { return success(qyStatsService.qyNotice(SecurityUtils.getUsername())); } + + /** + * 企业消息通知数量 + */ + @ApiOperation("企业消息通知数量") + @GetMapping("/qyNoticeCount") + public AjaxResult qyNoticeCount() { + return success(qyStatsService.qyNoticeCount(SecurityUtils.getUsername())); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java index ecd9a3c..2386a36 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java @@ -79,5 +79,15 @@ public class ZwStatsController extends BaseController { public AjaxResult zwNotice() { return success(zwStatsService.zwNotice()); } + + + /** + * 政务消息通知数量 + */ + @ApiOperation("政务消息通知数量") + @GetMapping("/zwNoticeCount") + public AjaxResult zwNoticeCount() { + return success(zwStatsService.zwNoticeCount()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java index b54b628..4b205b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java @@ -32,13 +32,13 @@ public class BasicInformation extends BaseModel { private Long id; - @Excel(name = "统一社会信用代码", sort = 2) + @Excel(name = "统一社会信用代码", sort = 2,required = true) @ApiModelProperty("统一社会信用代码") private String tyshxydm; @NotBlank - @Excel(name = "项目名称", sort = 2) + @Excel(name = "项目名称", sort = 2,required = true) @ApiModelProperty("项目名称") private String name; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java index e389b49..a9a090d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java @@ -47,6 +47,6 @@ public class Notice implements Serializable { private LocalDateTime createTime; @ApiModelProperty(value = "项目id") - private Long zwId; + private Long xmId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java index cb68037..55ec43c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java @@ -29,5 +29,10 @@ public interface QyStatsMapper { * 消息通知 */ List qyNotice(@Param("username") String username); + + /** + * 企业消息通知数量 + */ + int qyNoticeCount(String username); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java index b975d4e..7ea989f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java @@ -32,5 +32,10 @@ public interface ZwStatsMapper { * 消息通知 */ List zwNotice(); + + /** + * 政务消息通知数量 + */ + int zwNoticeCount(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java index cdf289c..ac98c46 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java @@ -30,5 +30,10 @@ public interface QyStatsService { * 消息通知 */ List qyNotice(String username); + + /** + * 企业消息通知数量 + */ + int qyNoticeCount(String username); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java index 89413ea..b04f8dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java @@ -34,5 +34,10 @@ public interface ZwStatsService { * 消息通知 */ List zwNotice(); + + /** + * 政务消息通知数量 + */ + int zwNoticeCount(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index 25bf88d..9642610 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java @@ -74,7 +74,11 @@ public class BasicInformationServiceImpl extends ServiceImpl zwNotice() { return zwStatsMapper.zwNotice(); } + + /** + * 政务消息通知数量 + */ + @Override + public int zwNoticeCount() { + return zwStatsMapper.zwNoticeCount(); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml index 70354d1..64472f2 100644 --- a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml @@ -33,5 +33,9 @@ select * from notice where tyshxydm = #{username} and type = 2 + diff --git a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml index 4058cd5..77e277c 100644 --- a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml @@ -41,7 +41,11 @@ + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java index f13271c..7c9a893 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -18,6 +18,11 @@ import com.ruoyi.common.utils.poi.ExcelHandlerAdapter; @Target(ElementType.FIELD) public @interface Excel { + /** + * 判断是否必填项 + */ + public boolean required() default false; + /** * 导出时在excel中排序 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 1ac9ed9..ea2ea60 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -24,6 +24,8 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.exception.ServiceException; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -421,6 +423,12 @@ public class ExcelUtil // 从map中得到对应列的field. Field field = (Field) entry.getValue()[0]; Excel attr = (Excel) entry.getValue()[1]; + boolean rq = attr.required(); + if(rq){ + if(StringUtils.isNull(val) || StringUtils.isEmpty(val.toString())) { + throw new ServiceException("第"+i+"行"+attr.name()+"单元格必填项未填写,请正确填写!"); + } + } // 取得类型,并根据对象类型设置值. Class fieldType = field.getType(); if (String.class == fieldType)