From 48b64b31972c921038d6120aa96bfb65d87d3e2f Mon Sep 17 00:00:00 2001 From: masiyuan <1042223811@qq.com> Date: Wed, 10 Jun 2026 16:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enforcementnos/domain/NosLawEnforcementCommentMsg.java | 2 +- .../enforcementnos/domain/NosLawEnforcementTaskMsg.java | 2 +- .../domain/vo/NosLawEnforcementCommentMsgPageVO.java | 4 ++-- .../vo/NosLawEnforcementTaskByCommentStatusPageVO.java | 4 ++-- .../domain/vo/NosLawEnforcementTaskMsgPageVO.java | 6 ++++++ .../service/impl/NosLawEnforcementTaskMsgServiceImpl.java | 3 +-- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementCommentMsg.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementCommentMsg.java index 6f2f431..42fea1e 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementCommentMsg.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementCommentMsg.java @@ -30,7 +30,7 @@ public class NosLawEnforcementCommentMsg extends BaseEntity { private String taskId; /** - * 任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件） + * 任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查） */ private Integer taskType; diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementTaskMsg.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementTaskMsg.java index a96eb26..efe90a3 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementTaskMsg.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementTaskMsg.java @@ -30,7 +30,7 @@ public class NosLawEnforcementTaskMsg extends BaseEntity { private String taskId; /** - * 任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件） + * 任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查） */ private Integer taskType; diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementCommentMsgPageVO.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementCommentMsgPageVO.java index 6557126..7e4646b 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementCommentMsgPageVO.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementCommentMsgPageVO.java @@ -27,9 +27,9 @@ public class NosLawEnforcementCommentMsgPageVO { private String taskId; /** - * 任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件） + * 任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查） */ - @Schema(description = "任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件）") + @Schema(description = "任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查）") private Integer taskType; /** diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskByCommentStatusPageVO.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskByCommentStatusPageVO.java index 441c797..42b6e5b 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskByCommentStatusPageVO.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskByCommentStatusPageVO.java @@ -21,9 +21,9 @@ public class NosLawEnforcementTaskByCommentStatusPageVO { private String taskId; /** - * 任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件） + * 任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查） */ - @Schema(description = "任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件）") + @Schema(description = "任务类别（1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查）") private Integer taskType; /** diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskMsgPageVO.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskMsgPageVO.java index 27e077f..2646adc 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskMsgPageVO.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskMsgPageVO.java @@ -24,6 +24,12 @@ public class NosLawEnforcementTaskMsgPageVO { @Schema(description = "任务id") private String taskId; + /** + * 任务类型id（1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查） + */ + @Schema(description = "任务类型id（1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查）") + private Integer taskType; + /** * 消息标题 */ diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskMsgServiceImpl.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskMsgServiceImpl.java index 64f2aa2..7c7d50f 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskMsgServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskMsgServiceImpl.java @@ -71,8 +71,7 @@ public class NosLawEnforcementTaskMsgServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper .eq(NosLawEnforcementTaskMsg::getId, msgId) - .eq(NosLawEnforcementTaskMsg::getEnterpriseId, enterpriseId) - .eq(NosLawEnforcementTaskMsg::getCreateBy, userId); + .eq(NosLawEnforcementTaskMsg::getEnterpriseId, enterpriseId); NosLawEnforcementTaskMsg msg = this.getOne(queryWrapper); if(msg == null) { throw new ServiceException("当前用户没有此消息");