From 435b10db7b7835d33b5004a9cb3c5ca6b5d71416 Mon Sep 17 00:00:00 2001
From: Lx <935448346@qq.com>
Date: Fri, 18 Oct 2024 18:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=8F=B0=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=83=A8=E5=88=86Bug=EF=BC=9B=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventMarketing/newCertificate/index.vue   |  3 +-
 .../src/views/notificationList/index.vue      | 79 +++++++++++--------
 .../src/views/system/notify/page/record.vue   | 26 +++---
 .../mapper/xml/SysNotificationlogMapper.xml   |  3 +
 4 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index edb957376..4e45418fd 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -466,7 +466,7 @@
         <div class="d-s" style="justify-content: space-between">
         </div>
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="背景图" style="width: 45%;">
+          <el-form-item label="背景图" required style="width: 45%;" prop="backgroundImage">
             <imgUpload :limit="1" v-model="ruleForm.backgroundImage"></imgUpload>
           </el-form-item>
           <el-form-item label="备注" style="width: 50%;">
@@ -772,6 +772,7 @@ export default {
         getNumLimit: [{required: true, message: '请输入每人领券限制'}],
         tfTotal: [{required: true, message: '请输入投放总数'}],
         dayGetLimit: [{required: true, message: '请输入每日领券限制'}],
+        backgroundImage: [{required: true, message: '请上传背景图'}],
         //自定义校验
         useType: [
           {
diff --git a/fuintAdmin/src/views/notificationList/index.vue b/fuintAdmin/src/views/notificationList/index.vue
index 4b9945b56..bdbdce4b3 100644
--- a/fuintAdmin/src/views/notificationList/index.vue
+++ b/fuintAdmin/src/views/notificationList/index.vue
@@ -8,55 +8,53 @@
 
     <div class="top_new">
       <el-form :model="queryParams" ref="queryForm" size="small" style="width: 100%" :inline="true" >
+        <el-form-item label="" prop="deptName">
+          <el-input
+            v-model="queryParams.content"
+            placeholder="请输入选择通知内容的关键词"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="notificationType">
+          <el-select v-model="queryParams.notificationType" placeholder="请选择通知类型" clearable style="width: 240px;">
+            <el-option label="到期提醒" value="到期提醒"></el-option>
+            <el-option label="库存预警" value="库存预警"></el-option>
+            <!-- 添加其他选项 -->
+          </el-select>
+        </el-form-item>
 
-        <el-form-item label="" prop="payUser">
-          <el-input
-            v-model="queryParams.payUser"
-            placeholder="请输入通知内容的关键词"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="" prop="payUser">
-          <el-input
-            v-model="queryParams.payUser"
-            placeholder="请选择通知类型"
-            clearable
-          />
-        </el-form-item>
 
         <el-form-item >
 
         </el-form-item>
       </el-form>
       <div style="height: 32px;width: 20%;display: flex;justify-content: flex-end">
-        <el-button type="primary" icon="el-icon-search" @click="">查询</el-button>
-        <el-button icon="el-icon-refresh" @click="">重置</el-button>
-
+        <el-button type="primary" icon="el-icon-search"  @click="handleQuery">查询</el-button>
+        <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
       </div>
     </div>
     <div class="table-box">
       <el-table
-        :data="list"
+        :data="tableData"
         border
         style="width: 100%">
         <el-table-column type="index" width="50" align="center" label="序号"/>
-        <el-table-column label="通知类型" align="center" prop="orderNo" width="220"/>
-        <el-table-column label="通知内容" align="center" prop="terminal"/>
-
-        <el-table-column label="创建人" align="center" prop="terminal"/>
-        <el-table-column label="创建时间" align="center" prop="terminal"/>
-        <el-table-column label="发送时间" align="center" prop="terminal"/>
+        <el-table-column label="通知类型" align="center" prop="notificationType" width="220"/>
+        <el-table-column label="通知内容" align="center" prop="templateContent"/>
+        <el-table-column label="创建人" align="center" prop="createName"/>
+        <el-table-column label="创建时间" align="center" prop="createTime"/>
+        <el-table-column label="发送时间" align="center" prop="createTime"/>
       </el-table>
       <div class="pagination-box">
-        <el-pagination
-          background
-          layout="prev, pager, next"
+        <pagination
           v-show="total>0"
           :total="total"
           :page.sync="queryParams.page"
           :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
+          @pagination="getList"
+        />
       </div>
 
     </div>
@@ -64,11 +62,13 @@
   </div>
 </template>
 <script>
+import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
+
 export default {
   name: "order_Goods",
   data() {
     return {
-      List:[],
+      tableData: [],
       beginTime:'',
       endTime:'',
       queryParams: {
@@ -79,9 +79,26 @@ export default {
     }
 
   },
+  created() {
+    this.getList()
+  },
   methods:{
+    handleQuery(){
+      this.getList()
+    },
+    resetQuery(){
+      this.queryParams = {
+        page: 1,
+        pageSize: 10,
+        deviceName:'',
+      },
+        this.getList()
+    },
     getList(){
-
+      getNotificationlogList(this.queryParams).then(res=>{
+        this.tableData = res.data.records;
+        this.total = res.data.total
+      })
     },
     goback(){
       this.$router.go(-1)
diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue
index 93e8e5133..efb888ff0 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue
@@ -126,7 +126,7 @@
         </el-form-item>
 
         <!-- 通知模板 -->
-        <el-form-item label="通知模板" prop="templateContent">
+        <el-form-item label="通知内容" prop="templateContent">
           <el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200"
                     show-word-limit style="width: 300px;"></el-input>
         </el-form-item>
@@ -147,9 +147,9 @@
                 align-items: center; /* 垂直居中 */ ">
                 <img src="../../notify/page/img/icon-adduser@3x.png">
               </div>
-              <div v-for="item in form.recipientUser" :key="item.id">
+              <div v-for="item in form.recipientUser" :key="item.staffId">
                 <el-badge value="x" class="item" style="margin-left: 10px">
-                  <el-button @click="clickUser(item.id)" size="mini">{{ item.userName }}</el-button>
+                  <el-button @click="clickUser(item.staffId)" size="mini">{{ item.userName }}</el-button>
                 </el-badge>
               </div>
             </div>
@@ -157,9 +157,9 @@
         </el-form-item>
 
         <!-- 模板状态 -->
-        <el-form-item label="模板状态" prop="templateStatus">
-          <el-switch v-model="form.templateStatus" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
-        </el-form-item>
+<!--        <el-form-item label="模板状态" prop="templateStatus" >-->
+<!--          <el-switch v-model="form.templateStatus" active-color="#13ce66" inactive-color="#ff4949"></el-switch>-->
+<!--        </el-form-item>-->
       </el-form>
       <div style="margin-left: 160px;">
       <el-button style="margin-right: 20px" type="primary" @click="userEnter1('form')">确定</el-button>
@@ -328,10 +328,12 @@ export default {
           this.form.recipientUser.push({
             id: item.acctId,
             userName: item.accountName,
+            realName: item.realName,
           })
           this.getroleStaff.push({
             id: item.acctId,
             userName: item.accountName,
+            realName: item.realName,
           })
 
         })
@@ -462,7 +464,7 @@ export default {
     },
     handleSelectionChange(val) {
       console.log("valval", val)
-      this.linshicunshu = [],
+      this.linshicunshu = []
         // this.form.recipientUser = []
 
 
@@ -507,8 +509,8 @@ export default {
         }
       );
     },
-    clickUser(id) {
-      this.form.recipientUser = this.form.recipientUser.filter(item => item.id !== id);
+    clickUser(staffId) {
+      this.form.recipientUser = this.form.recipientUser.filter(item => item.staffId !== staffId);
     },
 
 
@@ -519,11 +521,13 @@ export default {
     },
     userEnter() {
       this.open1 = false
+      // if(this.form.recipientUser === null){
+      //   this.form.recipientUser = []
+      // }
       console.log("this.linshicunshu", this.linshicunshu)
-      // this.form.recipientUser = [],
       this.form.recipientUser.push(...this.linshicunshu)
+      console.log("this.recipientUser", this.form.recipientUser)
       this.cenDis()
-      // this.form.recipientUser.push(...this.getroleStaff)
     },
 
     toggleSelection(rows) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotificationlogMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotificationlogMapper.xml
index 3bb6ecfe1..5d049c8cc 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotificationlogMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotificationlogMapper.xml
@@ -50,6 +50,9 @@ id,notify_id,sent_to,sent_at,status,error_message
             <if test="entity.notificationType != null and entity.notificationType != ''">
                 and sn.notification_type = #{entity.notificationType}
             </if>
+            <if test="entity.content != null and entity.content != ''">
+                and sn.template_content LIKE CONCAT('%', #{entity.content}, '%')
+            </if>
         </where>
         ORDER BY snl.create_time DESC
     </select>