From 40c18adb584573547a7df012cdfa6dda3f816945 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Wed, 5 Aug 2026 11:09:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/enforcement/AppEnfCpNoticeController.java | 3 +-- .../domain/bo/SxtXzcfajjbxx026705Bo.java | 5 +++++ .../domain/bo/SxtXzqzjbxx173774Bo.java | 5 +++++ .../enforcementcode/domain/vo/EfcodeCpTaskVo.java | 5 ++++- .../service/IEfcodeCpNoticeMessageService.java | 2 +- .../impl/EfcodeCpNoticeMessageServiceImpl.java | 12 ++++++++++++ .../service/impl/EfcodeCpNoticeServiceImpl.java | 6 +++--- .../mapper/enforcementcode/EfcodeCpTaskMapper.xml | 3 ++- 8 files changed, 33 insertions(+), 8 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java index f7a6634a..7090e79c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java @@ -115,8 +115,7 @@ public class AppEnfCpNoticeController { */ @PostMapping("/message") public R addMessage(@RequestBody EfcodeCpNoticeMessageBo bo) { - bo.setIsDelete(0L); - efcodeCpNoticeMessageService.insertByBo(bo); + efcodeCpNoticeMessageService.insertEnfByBo(bo); return R.ok(); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtXzcfajjbxx026705Bo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtXzcfajjbxx026705Bo.java index d1c33d16..dc0331f3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtXzcfajjbxx026705Bo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtXzcfajjbxx026705Bo.java @@ -242,5 +242,10 @@ public class SxtXzcfajjbxx026705Bo extends BaseEntity { @NotBlank(message = "备用字段2不能为空", groups = { AddGroup.class, EditGroup.class }) private String beiyong2; + /** + * 当事人证件号码（用于关联查询条件） + */ + private String c201016; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtXzqzjbxx173774Bo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtXzqzjbxx173774Bo.java index 94a4bba0..ee28670f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtXzqzjbxx173774Bo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtXzqzjbxx173774Bo.java @@ -155,5 +155,10 @@ public class SxtXzqzjbxx173774Bo extends BaseEntity { @NotBlank(message = "备用字段2不能为空", groups = { AddGroup.class, EditGroup.class }) private String beiyong2; + /** + * 当事人证件号码（用于关联查询条件） + */ + private String c301010; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpTaskVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpTaskVo.java index a59ec82b..ee8420b3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpTaskVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpTaskVo.java @@ -143,7 +143,10 @@ public class EfcodeCpTaskVo implements Serializable { @com.baomidou.mybatisplus.annotation.TableField(exist = false) private List associatedPlans; - + /** + * 创建时间 + */ + private Date createTime; /** * 关联计划简要信息 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java index 0efa824b..7cb35538 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java @@ -48,7 +48,7 @@ public interface IEfcodeCpNoticeMessageService { * @return 是否新增成功 */ Boolean insertByBo(EfcodeCpNoticeMessageBo bo); - + Boolean insertEnfByBo(EfcodeCpNoticeMessageBo bo); /** * 修改行政执法检查计划-预告交流 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java index 974a6358..42201cb2 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java @@ -107,6 +107,18 @@ public class EfcodeCpNoticeMessageServiceImpl implements IEfcodeCpNoticeMessageS } return flag; } + @Override + public Boolean insertEnfByBo(EfcodeCpNoticeMessageBo bo) { + bo.setIsDelete(0L); + bo.setMsgFrom(0L); + EfcodeCpNoticeMessage add = MapstructUtils.convert(bo, EfcodeCpNoticeMessage.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } /** * 修改行政执法检查计划-预告交流 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java index 53278e6b..fdef12fa 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java @@ -260,9 +260,9 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { case 3 -> "其他"; default -> ""; }; - String message = "系统提示:" + notice.getBureauDeptName() + "部门将于" - + notice.getEnforceDate() + "-" + enforceTimeText - + "进行" + notice.getEnforceContent() + ",如有问题，请及时反馈。"; + String message = "尊敬的:" + notice.getContactPerson() + "您好！您收到一则行政检查发布反馈消息。信息内容如下：企业名称：" + + notice.getEnterpriseName() + "执法单位：" + notice.getBureauDeptName() + + "检查时间：" + notice.getEnforceDate(); EfcodeCpNoticeMessage msg = new EfcodeCpNoticeMessage(); msg.setId(IdUtil.getSnowflakeNextIdStr()); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml index eaa3796e..5a63a9f6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml @@ -19,7 +19,8 @@ p.bureau_dept_name, p.enforce_user_names, p.enforce_user_tels, - t.is_read + t.is_read, + p.create_time FROM efcode_cp_task t INNER JOIN efcode_cp_plan p ON p.task_id = t.id