From 13f5bcfe89eac1fb3d49f7ab471a76f7e941a139 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 2 Aug 2021 11:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=9B=AD=E5=8E=86=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=EF=BC=8C=E5=9B=AD=E5=8E=86=E5=B1=95=E7=A4=BA=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E5=A4=A9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/benyi/calendarshow/index.vue    |  3 ++
 .../src/views/benyi/schoolcalendar/index.vue  | 12 ++++-
 .../views/benyi/schoolcalendarclass/index.vue | 50 +++++++++++++++++--
 .../controller/ByCalendarController.java      |  2 +-
 .../benyi/domain/BySchoolcalendar.java        |  1 +
 .../benyi/domain/BySchoolcalendarClass.java   |  1 +
 .../benyi/BySchoolcalendarClassMapper.xml     | 13 ++++-
 .../mybatis/benyi/BySchoolcalendarMapper.xml  | 14 ++++--
 8 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/calendarshow/index.vue b/ruoyi-ui/src/views/benyi/calendarshow/index.vue
index b8a9043f5..8244ff589 100644
--- a/ruoyi-ui/src/views/benyi/calendarshow/index.vue
+++ b/ruoyi-ui/src/views/benyi/calendarshow/index.vue
@@ -157,6 +157,9 @@ export default {
     //background: rgba(109, 113, 121, 0.6);
   }
 }
+.fc-time {
+  display: none;
+}
 .xs-btns-style {
   @media screen and (max-width: 768px) {
     display: flex;
diff --git a/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue b/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
index 21bea0c22..33255df48 100644
--- a/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
+++ b/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
@@ -163,6 +163,7 @@
         align="center"
         prop="activityendtime"
       />
+      <el-table-column label="备注" align="center" show-overflow-tooltip prop="remark" />
       <!-- <el-table-column
         label="创建时间"
         align="center"
@@ -214,7 +215,7 @@
     <el-dialog :title="title" :visible.sync="open" class="v-dialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="事件名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入内容" />
+          <el-input v-model="form.name" size="small" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="活动类型" prop="type">
           <el-select
@@ -262,6 +263,14 @@
           ></el-date-picker>
           <el-input v-model="form.activityendtime" v-if="false" />
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            v-model="form.remark"
+            size="small"
+            placeholder=""
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -416,6 +425,7 @@ export default {
         type: undefined,
         scope: undefined,
         activitytime: undefined,
+        remark: undefined,
       };
       this.resetForm("form");
     },
diff --git a/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue b/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
index b9624e5f7..9055594da 100644
--- a/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
+++ b/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="12" :md="5">
-          <el-form-item label="活动时间" prop="activitytime">
+          <!-- <el-form-item label="活动时间" prop="activitytime">
             <el-date-picker
               class="my-date-picker"
               clearable
@@ -57,6 +57,18 @@
               value-format="yyyy-MM-dd"
               placeholder="选择活动时间"
             ></el-date-picker>
+          </el-form-item> -->
+          <el-form-item label="活动时间" prop="activitytime">
+            <el-date-picker
+              class="my-date-picker"
+              v-model="dateRange"
+              size="small"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="12" :md="4">
@@ -140,7 +152,17 @@
         prop="xnxq"
         :formatter="xnxqFormat"
       />
-      <el-table-column label="活动时间" align="center" prop="activitytime" />
+      <el-table-column
+        label="活动开始时间"
+        align="center"
+        prop="activitytime"
+      />
+      <el-table-column
+        label="活动截止时间"
+        align="center"
+        prop="activityendtime"
+      />
+      <el-table-column label="备注" align="center" show-overflow-tooltip prop="remark" />
       <!-- <el-table-column
         label="创建时间"
         align="center"
@@ -193,10 +215,14 @@
     <el-dialog :title="title" :visible.sync="open" class="v-dialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="事件名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入内容" />
+          <el-input v-model="form.name" size="small" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="活动类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择活动类型">
+          <el-select
+            v-model="form.type"
+            size="small"
+            placeholder="请选择活动类型"
+          >
             <el-option
               v-for="dict in typeOptions"
               :key="dict.dictValue"
@@ -220,6 +246,14 @@
           ></el-date-picker>
           <el-input v-model="form.activityendtime" v-if="false" />
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            v-model="form.remark"
+            size="small"
+            placeholder=""
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -258,6 +292,8 @@ export default {
       schoolcalendarclassList: [],
       // 园历班级名称列表
       classListAll: [],
+      // 日期范围
+      dateRange: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -316,7 +352,9 @@ export default {
     /** 查询园历管理(班级)列表 */
     getList() {
       this.loading = true;
-      listSchoolcalendarclass(this.queryParams).then((response) => {
+      listSchoolcalendarclass(
+        this.addDateRange(this.queryParams, this.dateRange)
+      ).then((response) => {
         this.schoolcalendarclassList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -365,6 +403,7 @@ export default {
         activitytime: undefined,
         createuserid: undefined,
         createtime: undefined,
+        remark: undefined,
       };
       this.resetForm("form");
     },
@@ -375,6 +414,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java
index ce3e34dc9..88b283c36 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java
@@ -154,7 +154,7 @@ public class ByCalendarController extends BaseController {
         }
         //定义返回列表
         List<ByCalendarShow> listvi = new ArrayList<>();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         //加载本一园历
         List<ByCalendar> list = byCalendarService.selectByCalendarList(byCalendar);
         if (list.size() > 0) {
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java
index aef24ef87..43a8a1262 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java
@@ -184,6 +184,7 @@ public class BySchoolcalendar extends BaseEntity {
                 .append("stylecolor", getStylecolor())
                 .append("createuserid", getCreateuserid())
                 .append("createtime", getCreatetime())
+                .append("remark", getRemark())
                 .toString();
     }
 }
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java
index f066fca74..30fbc898f 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java
@@ -174,6 +174,7 @@ public class BySchoolcalendarClass extends BaseEntity
                 .append("stylecolor", getStylecolor())
                 .append("createuserid", getCreateuserid())
                 .append("createtime", getCreatetime())
+                .append("remark", getRemark())
                 .append("byClass", getByClass())
                 .toString();
     }
diff --git a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
index ba4fc8e12..e9bc2ff28 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
@@ -16,6 +16,7 @@
         <result property="stylecolor" column="stylecolor"/>
         <result property="createuserid" column="createuserid"/>
         <result property="createtime" column="createtime"/>
+        <result property="remark"    column="remark"    />
         <association property="byClass" column="bjbh" javaType="ByClass" resultMap="ByClassResult"/>
     </resultMap>
 
@@ -39,7 +40,7 @@
     </resultMap>
 
     <sql id="selectBySchoolcalendarClassVo">
-        select s.id, s.name, s.type, s.classid, s.xnxq, s.deptId, s.activitytime, s.activityendtime, s.stylecolor, s.createuserid, s.createtime,
+        select s.id, s.name, s.type, s.classid, s.xnxq, s.deptId, s.activitytime, s.activityendtime, s.stylecolor, s.createuserid, s.createtime, s.remark,
                c.bjmc
         from by_schoolcalendar_class s, by_class c
     </sql>
@@ -59,7 +60,14 @@
         <if test="stylecolor != null  and stylecolor != ''">and stylecolor = #{stylecolor}</if>
         <if test="createuserid != null ">and createuserid = #{createuserid}</if>
         <if test="createtime != null ">and createtime = #{createtime}</if>
+        <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(activitytime,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+        </if>
+        <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(activitytime,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+        </if>
 
+        order by activitytime desc
     </select>
 
     <select id="selectBySchoolcalendarClassById" parameterType="Long" resultMap="BySchoolcalendarClassResult">
@@ -81,6 +89,7 @@
             <if test="stylecolor != null  and stylecolor != ''">stylecolor,</if>
             <if test="createuserid != null ">createuserid,</if>
             <if test="createtime != null ">createtime,</if>
+            <if test="remark != null  and remark != ''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null ">#{id},</if>
@@ -94,6 +103,7 @@
             <if test="stylecolor != null  and stylecolor != ''">#{stylecolor},</if>
             <if test="createuserid != null ">#{createuserid},</if>
             <if test="createtime != null ">#{createtime},</if>
+            <if test="remark != null  and remark != ''">#{remark},</if>
         </trim>
     </insert>
 
@@ -110,6 +120,7 @@
             <if test="stylecolor != null  and stylecolor != ''">stylecolor = #{stylecolor},</if>
             <if test="createuserid != null ">createuserid = #{createuserid},</if>
             <if test="createtime != null ">createtime = #{createtime},</if>
+            <if test="remark != null  and remark != ''">remark = #{remark},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml
index 9810ea430..f920e3518 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml
@@ -12,14 +12,15 @@
         <result property="xnxq" column="xnxq"/>
         <result property="deptid" column="dept_id"/>
         <result property="activitytime" column="activitytime"/>
-        <result property="activityendtime"    column="activityendtime"    />
-        <result property="stylecolor"    column="stylecolor"    />
+        <result property="activityendtime" column="activityendtime"/>
+        <result property="stylecolor" column="stylecolor"/>
         <result property="createuserid" column="createuserid"/>
         <result property="createtime" column="createtime"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectBySchoolcalendarVo">
-        select id, name, type, scope, xnxq, dept_id, activitytime, activityendtime, stylecolor, createuserid, createtime from by_schoolcalendar d
+        select id, name, type, scope, xnxq, dept_id, activitytime, activityendtime, stylecolor, createuserid, createtime, remark from by_schoolcalendar d
     </sql>
 
     <select id="selectBySchoolcalendarList" parameterType="BySchoolcalendar" resultMap="BySchoolcalendarResult">
@@ -31,8 +32,8 @@
         <if test="xnxq != null  and xnxq != ''">and xnxq like concat('%', #{xnxq}, '%')</if>
         <if test="deptid != null ">and dept_id = #{deptid}</if>
         <if test="activitytime != null ">and activitytime = #{activitytime}</if>
-        <if test="activityendtime != null "> and activityendtime = #{activityendtime}</if>
-        <if test="stylecolor != null  and stylecolor != ''"> and stylecolor = #{stylecolor}</if>
+        <if test="activityendtime != null ">and activityendtime = #{activityendtime}</if>
+        <if test="stylecolor != null  and stylecolor != ''">and stylecolor = #{stylecolor}</if>
         <if test="createuserid != null ">and createuserid = #{createuserid}</if>
         <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
             AND date_format(activitytime,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
@@ -64,6 +65,7 @@
             <if test="stylecolor != null  and stylecolor != ''">stylecolor,</if>
             <if test="createuserid != null ">createuserid,</if>
             <if test="createtime != null ">createtime,</if>
+            <if test="remark != null  and remark != ''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null  and name != ''">#{name},</if>
@@ -76,6 +78,7 @@
             <if test="stylecolor != null  and stylecolor != ''">#{stylecolor},</if>
             <if test="createuserid != null ">#{createuserid},</if>
             <if test="createtime != null ">#{createtime},</if>
+            <if test="remark != null  and remark != ''">#{remark},</if>
         </trim>
     </insert>
 
@@ -92,6 +95,7 @@
             <if test="stylecolor != null  and stylecolor != ''">stylecolor = #{stylecolor},</if>
             <if test="createuserid != null ">createuserid = #{createuserid},</if>
             <if test="createtime != null ">createtime = #{createtime},</if>
+            <if test="remark != null  and remark != ''">remark = #{remark},</if>
         </trim>
         where id = #{id}
     </update>