Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

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<Void> addMessage(@RequestBody EfcodeCpNoticeMessageBo bo) {
-        bo.setIsDelete(0L);
-        efcodeCpNoticeMessageService.insertByBo(bo);
+        efcodeCpNoticeMessageService.insertEnfByBo(bo);
         return R.ok();
     }
 

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;
+
 
 }

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;
+
 
 }

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<AssociatedPlan> associatedPlans;
 
-
+    /**
+     * 创建时间
+     */
+    private Date createTime;
 
     /**
      * 关联计划简要信息

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);
     /**
      * 修改行政执法检查计划-预告交流
      *

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;
+    }
 
     /**
      * 修改行政执法检查计划-预告交流

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());

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
         <where>