update

ruoyi-ui/src/router/index.js

@@ -313,6 +313,22 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: "/benyi_course/weekplan",
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: "themestudy/:id(\\d+)/:wid(\\d+)",
+        component: () => import("@/views/benyi/themestudy_weekplan"),
+        name: "Theme3",
+        meta: {
+          title: "主题整合周计划详情",
+          icon: ""
+        }
+      }
+    ]
+  },
   {
     path: "/benyi_course/mathtermplan",
     component: Layout,
@@ -480,7 +496,8 @@ export const constantRoutes = [
     children: [
       {
         path: "approval/:id",
-        component: () => import("@/views/benyi/thememonthplanapproval/approval"),
+        component: () =>
+          import("@/views/benyi/thememonthplanapproval/approval"),
         name: "ThememonthplanApproval",
         meta: {
           title: "主题整合月计划审批",

ruoyi-ui/src/utils/index.js

@@ -1,3 +1,5 @@
+import { parseTime } from './ruoyi'
+
 /**
  * 表格时间格式化
  */
@@ -124,19 +126,21 @@ export function param(json) {
  * @returns {Object}
  */
 export function param2Obj(url) {
-  const search = url.split('?')[1]
+  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
   if (!search) {
     return {}
   }
-  return JSON.parse(
+  const obj = {}
-    '{"' +
+  const searchArr = search.split('&')
-      decodeURIComponent(search)
+  searchArr.forEach(v => {
-        .replace(/"/g, '\\"')
+    const index = v.indexOf('=')
-        .replace(/&/g, '","')
+    if (index !== -1) {
-        .replace(/=/g, '":"')
+      const name = v.substring(0, index)
-        .replace(/\+/g, ' ') +
+      const val = v.substring(index + 1, v.length)
-      '"}'
+      obj[name] = val
-  )
+    }
+  })
+  return obj
 }
 
 /**
@@ -383,4 +387,4 @@ export function camelCase(str) {
 export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
- 
+ 

ruoyi-ui/src/utils/ruoyi.js

@@ -3,117 +3,140 @@
  * Copyright (c) 2019 ruoyi
  */
 
-const baseURL = process.env.VUE_APP_BASE_API
+const baseURL = process.env.VUE_APP_BASE_API;
 
 // 日期格式化
 export function parseTime(time, pattern) {
-	if (arguments.length === 0 || !time) {
+  if (arguments.length === 0 || !time) {
-		return null
+    return null;
-	}
+  }
-	const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  //console.log(time, pattern);
-	let date
+  const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
-	if (typeof time === 'object') {
+  //console.log(format);
-		date = time
+  let date;
-	} else {
+  //console.log(typeof time);
-		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+  if (typeof time === "object") {
-			time = parseInt(time)
+    date = time;
-		} else if (typeof time === 'string') {
+  } else {
-			time = time.replace(new RegExp(/-/gm), '/');
+    if (typeof time === "string" && /^[0-9]+$/.test(time)) {
-		}
+      time = parseInt(time);
-		if ((typeof time === 'number') && (time.toString().length === 10)) {
+      //console.log("1:" + time);
-			time = time * 1000
+    } else if (typeof time === "string") {
-		}
+      time = time
-		date = new Date(time)
+        .replace(new RegExp(/-/gm), "/")
-	}
+        .replace("T", " ")
-	const formatObj = {
+        .replace(new RegExp(/\.[\d]{3}/gm), "");
-		y: date.getFullYear(),
+
-		m: date.getMonth() + 1,
+      if (time.length == 7) {
-		d: date.getDate(),
+        time = time + "/01";
-		h: date.getHours(),
+      }
-		i: date.getMinutes(),
+      //console.log(time);
-		s: date.getSeconds(),
+    }
-		a: date.getDay()
+    if (typeof time === "number" && time.toString().length === 10) {
-	}
+      time = time * 1000;
-	const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    }
-		let value = formatObj[key]
+    date = new Date(time);
-		// Note: getDay() returns 0 on Sunday
+  }
-		if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+  //console.log(date);
-		if (result.length > 0 && value < 10) {
+  const formatObj = {
-			value = '0' + value
+    y: date.getFullYear(),
-		}
+    m: date.getMonth() + 1,
-		return value || 0
+    d: date.getDate(),
-	})
+    h: date.getHours(),
-	return time_str
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  };
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key];
+    // Note: getDay() returns 0 on Sunday
+    if (key === "a") {
+      return ["日", "一", "二", "三", "四", "五", "六"][value];
+    }
+    if (result.length > 0 && value < 10) {
+      value = "0" + value;
+    }
+    return value || 0;
+  });
+  //console.log(time_str);
+  return time_str;
 }
 
 // 表单重置
 export function resetForm(refName) {
-	if (this.$refs[refName]) {
+  if (this.$refs[refName]) {
-		this.$refs[refName].resetFields();
+    this.$refs[refName].resetFields();
-	}
+  }
 }
 
 // 添加日期范围
 export function addDateRange(params, dateRange) {
-	var search = params;
+  var search = params;
-	search.beginTime = "";
+  search.beginTime = "";
-	search.endTime = "";
+  search.endTime = "";
-	if (null != dateRange && '' != dateRange) {
+  if (null != dateRange && "" != dateRange) {
-		search.beginTime = this.dateRange[0];
+    search.beginTime = this.dateRange[0];
-		search.endTime = this.dateRange[1];
+    search.endTime = this.dateRange[1];
-	}
+  }
-	return search;
+  return search;
 }
 
 // 回显数据字典
 export function selectDictLabel(datas, value) {
-	var actions = [];
+  var actions = [];
-	Object.keys(datas).map((key) => {
+  Object.keys(datas).map(key => {
-		if (datas[key].dictValue == ('' + value)) {
+    if (datas[key].dictValue == "" + value) {
-			actions.push(datas[key].dictLabel);
+      actions.push(datas[key].dictLabel);
-			return false;
+      return false;
-		}
+    }
-	})
+  });
-	return actions.join('');
+  return actions.join("");
 }
 
 // 回显数据字典
 export function selectMoeDictLabel(datas, value) {
-	var actions = [];
+  var actions = [];
-	Object.keys(datas).map((key) => {
+  Object.keys(datas).map(key => {
-		if (datas[key].id == ('' + value)) {
+    if (datas[key].id == "" + value) {
-			actions.push(datas[key].name);
+      actions.push(datas[key].name);
-			return false;
+      return false;
-		}
+    }
-	})
+  });
-	return actions.join('');
+  return actions.join("");
 }
 
 // 通用下载方法
 export function download(fileName) {
-	window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
+  window.location.href =
+    baseURL +
+    "/common/download?fileName=" +
+    encodeURI(fileName) +
+    "&delete=" +
+    true;
 }
 
 // 字符串格式化(%s )
 export function sprintf(str) {
-	var args = arguments, flag = true, i = 1;
+  var args = arguments,
-	str = str.replace(/%s/g, function () {
+    flag = true,
-		var arg = args[i++];
+    i = 1;
-		if (typeof arg === 'undefined') {
+  str = str.replace(/%s/g, function() {
-			flag = false;
+    var arg = args[i++];
-			return '';
+    if (typeof arg === "undefined") {
-		}
+      flag = false;
-		return arg;
+      return "";
-	});
+    }
-	return flag ? str : '';
+    return arg;
+  });
+  return flag ? str : "";
 }
 
 // 转换字符串，undefined,null等转化为""
 export function praseStrEmpty(str) {
-    if (!str || str == "undefined" || str == "null") {
+  if (!str || str == "undefined" || str == "null") {
-        return "";
+    return "";
-    }
+  }
-    return str;
+  return str;
 }
 
 /**
@@ -125,22 +148,21 @@ export function praseStrEmpty(str) {
  * @param {*} rootId 根Id 默认 0
  */
 export function handleTree(data, id, parentId, children, rootId) {
-	id = id || 'id'
+  id = id || "id";
-	parentId = parentId || 'parentId'
+  parentId = parentId || "parentId";
-	children = children || 'children'
+  children = children || "children";
-	rootId = rootId || 0
+  rootId = rootId || 0;
-	//对源数据深度克隆
+  //对源数据深度克隆
-	const cloneData = JSON.parse(JSON.stringify(data))
+  const cloneData = JSON.parse(JSON.stringify(data));
-	//循环所有项
+  //循环所有项
-	const treeData =  cloneData.filter(father => {
+  const treeData = cloneData.filter(father => {
-	  let branchArr = cloneData.filter(child => {
+    let branchArr = cloneData.filter(child => {
-		//返回每一项的子级数组
+      //返回每一项的子级数组
-		return father[id] === child[parentId]
+      return father[id] === child[parentId];
-	  });
+    });
-	  branchArr.length > 0 ? father.children = branchArr : '';
+    branchArr.length > 0 ? (father.children = branchArr) : "";
-	  //返回第一层
+    //返回第一层
-	  return father[parentId] === rootId;
+    return father[parentId] === rootId;
-	});
+  });
-	return treeData != '' ? treeData : data;
+  return treeData != "" ? treeData : data;
-  }
+}
-  

ruoyi-ui/src/views/benyi/dayflowassessment/index.vue

@@ -77,14 +77,12 @@
       <el-table-column
         label="班级名称"
         align="center"
-        prop="classid"
+        prop="byClass.bjmc"
-        :formatter="classFormat"
       />
       <el-table-column
         label="评估对象"
         align="center"
-        prop="pgdx"
+        prop="pgdxxm"
-        :formatter="pgdxFormat"
       />
       <el-table-column label="最终扣分" align="center" prop="zzdf" />
       <el-table-column
@@ -226,18 +224,6 @@ export default {
         this.classOptions = response.rows;
       });
     },
-    // 班级字典翻译
-    classFormat(row, column) {
-      var actions = [];
-      var datas = this.classOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].bjbh == "" + row.classid) {
-          actions.push(datas[key].bjmc);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
     // 学年学期类型--字典状态字典翻译
     xnxqFormat(row, column) {
       return this.selectDictLabel(this.xnxqOptions, row.xnxq);
@@ -249,18 +235,6 @@ export default {
       });
     },
     // 教师字典翻译
-    pgdxFormat(row, column) {
-      var actions = [];
-      var datas = this.userOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].userId == "" + row.pgdx) {
-          actions.push(datas[key].nickName);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
-    // 教师字典翻译
     createUserFormat(row, column) {
       var actions = [];
       var datas = this.userOptions;

ruoyi-ui/src/views/benyi/experience/index.vue

@@ -359,7 +359,7 @@ import { getUserProfile } from "@/api/system/user";
 import Clipboard from "clipboard";
 
 export default {
-  name: "Experience",
+  name: "Experience1",
   data() {
     return {
       inviteCode: "",

ruoyi-ui/src/views/benyi/filelibrary/index.vue

@@ -59,13 +59,20 @@
         label="操作"
         align="center"
         fixed="right"
-        class-name="small-padding fixed-width edit-btns"
+        class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-down"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            >预览</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-download"
             @click="handleDown(scope.row)"
             >下载</el-button
           >
@@ -177,10 +184,21 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    //下载
     handleDown(row) {
       var url = row.fileurl;
       window.open(this.apiurl + url);
     },
+    //预览
+    handleView(row) {
+      var url = row.fileurl;
+      window.open(
+        "https://view.officeapps.live.com/op/view.aspx?src=http://system.benyiedu.com" +
+          this.apiurl +
+          url,
+        "_blank"
+      );
+    },
   },
 };
 </script>
@@ -188,12 +206,6 @@ export default {
 .el-select {
   width: 100%;
 }
-.edit-btns {
-  .el-button {
-    display: block;
-    margin: 0 auto;
-  }
-}
 .no-margin ::v-deep.el-form-item__content {
   margin: 0 !important;
 }

ruoyi-ui/src/views/benyi/microcoursestudy/index.vue

@@ -36,11 +36,19 @@
               size="mini"
               icon="el-icon-printer"
               @click="prints"
+              v-show="enable"
               >打印</el-button
             >
-            <div class="pad-left" ref="printMe">
+            <el-button
-              <div v-html="note"></div>
+              type="primary"
-            </div>
+              plain
+              size="mini"
+              icon="el-icon-document-copy"
+              @click="copy(note)"
+              v-show="enable"
+              >复制</el-button
+            >
+            <div class="pad-left" v-html="note" ref="printMe"></div>
           </div>
         </el-card>
       </el-col>
@@ -55,6 +63,7 @@ export default {
   name: "Microcoursestudy",
   data() {
     return {
+      enable: false,
       // 主题整合名称
       name: undefined,
       // 主题整合id
@@ -109,6 +118,7 @@ export default {
     },
     getMicrocourseDetails() {
       getMicrocourse(this.id).then((response) => {
+        this.enable = true;
         this.title1 = response.data.title;
         this.note = response.data.contents;
       });
@@ -118,6 +128,32 @@ export default {
       //console.log(this.$refs.printMe);
       this.$print(this.$refs.printMe);
     },
+    copy(data) {
+      let url = this.filter(data);
+      let oInput = document.createElement("input");
+      oInput.value = url;
+      document.body.appendChild(oInput);
+      oInput.select(); // 选择对象;
+      //console.log(oInput.value);
+      document.execCommand("Copy"); // 执行浏览器复制命令
+      this.$message({
+        message: "复制成功",
+        type: "success",
+      });
+      oInput.remove();
+    },
+    //过滤html标签
+    filter: function (html) {
+      return html
+        .replace(/<(?:.|\n)*?>/gm, "")
+        .replace(/(&rdquo;)/g, '"')
+        .replace(/&ldquo;/g, '"')
+        .replace(/&mdash;/g, "-")
+        .replace(/&nbsp;/g, "")
+        .replace(/&gt;/g, ">")
+        .replace(/&lt;/g, "<")
+        .replace(/<[\w\s"':=\/]*/, "");
+    },
   },
 };
 </script>
@@ -165,20 +201,25 @@ export default {
   line-height: 40px;
 }
 // 禁止复制
-div {
+// div {
-  -webkit-touch-callout: none;
+//   -webkit-touch-callout: none;
-  -webkit-user-select: none;
+//   -webkit-user-select: none;
-  -khtml-user-select: none;
+//   -khtml-user-select: none;
-  -moz-user-select: none;
+//   -moz-user-select: none;
-  -ms-user-select: none;
+//   -ms-user-select: none;
-  user-select: none;
+//   user-select: none;
-}
+// }
 .el-tree {
   min-width: 100%;
   display: inline-block;
 }
 .tree {
+<<<<<<< HEAD
   overflow:auto;
   height: calc(100% - 52px);
+=======
+  overflow: auto;
+  max-height: 600px;
+>>>>>>> master
 }
 </style>

ruoyi-ui/src/views/benyi/planweek/table.vue

@@ -43,20 +43,20 @@
           <td>健康</td>
           <td class="align-left" v-html="jk" colspan="5"></td>
         </tr>
-        <tr class="align-center">
+        <tr>
-          <td>语言</td>
+          <td class="align-center">语言</td>
           <td lass="align-left" v-html="yy" colspan="5"></td>
         </tr>
-        <tr class="align-center">
+        <tr>
-          <td>社会</td>
+          <td class="align-center">社会</td>
           <td lass="align-left" v-html="sh" colspan="5"></td>
         </tr>
-        <tr class="align-center">
+        <tr>
-          <td>科学</td>
+          <td class="align-center">科学</td>
           <td lass="align-left" v-html="kx" colspan="5"></td>
         </tr>
-        <tr class="align-center">
+        <tr>
-          <td>艺术</td>
+          <td class="align-center">艺术</td>
           <td lass="align-left" v-html="ys" colspan="5"></td>
         </tr>
 

ruoyi-ui/src/views/benyi/schoolcharge/index.vue

@@ -46,6 +46,8 @@
       <el-table-column label="伙食费（小班）/天" align="center" prop="hsfX" />
       <el-table-column label="保育费（托班）/月" align="center" prop="byfT" />
       <el-table-column label="伙食费（托班）/天" align="center" prop="hsfT" />
+      <el-table-column label="开始时间" align="center" prop="startTime" />
+      <el-table-column label="截止时间" align="center" prop="endtime" />
       <el-table-column
         label="操作"
         align="center"
@@ -141,6 +143,18 @@
             placeholder="请输入伙食费"
           />
         </el-form-item>
+        <el-form-item label="起止时间" prop="startTime">
+          <el-date-picker
+            clearable
+            class="my-date-picker"
+            v-model="form.startTime"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -191,7 +205,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        startTime: [
+          { required: true, message: "起止时间不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -227,6 +245,8 @@ export default {
         hsfT: undefined,
         createUserid: undefined,
         createTime: undefined,
+        startTime: undefined,
+        endtime: undefined,
       };
       this.resetForm("form");
     },
@@ -244,8 +264,16 @@ export default {
         this.title = "添加园所收费标准";
       } else {
         const id = row.id || this.ids;
+        var myArray = new Array(2);
         getSchoolcharge(id).then((response) => {
           this.form = response.data;
+          //console.log(response.data);
+          if (response.data.endtime != null) {
+            myArray[0] = response.data.startTime;
+            myArray[1] = response.data.endtime;
+            this.form.startTime = myArray;
+          }
+
           this.open = true;
           this.title = "设置园所收费标准";
         });
@@ -255,6 +283,10 @@ export default {
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          var v1 = this.form.startTime[0];
+          var v2 = this.form.startTime[1];
+          this.form.startTime = v1;
+          this.form.endtime = v2;
           if (this.form.id != undefined) {
             updateSchoolcharge(this.form).then((response) => {
               if (response.code === 200) {
@@ -302,4 +334,8 @@ export default {
     margin: 0 auto;
   }
 }
+.my-date-picker {
+  width: 100%;
+}
 </style>
+

ruoyi-ui/src/views/benyi/teacherassessment/index.vue

@@ -109,13 +109,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="编号" align="center" prop="id" /> -->
-      <el-table-column
+      <el-table-column label="班级" align="center" prop="byClass.bjmc" fixed />
-        label="班级"
-        align="center"
-        prop="classid"
-        :formatter="classFormat"
-        fixed
-      />
       <el-table-column
         label="教师"
         align="center"
@@ -367,7 +361,28 @@ export default {
       //console.log(val);
       this.queryParams_pg.pgdx = val;
       this.dateRange[0] = this.month + "-01";
-      this.dateRange[1] = this.month + "-31";
+      var y = this.month.split("-")[0];
+      var m = this.month.split("-")[1];
+      if (
+        m == "01" ||
+        m == "03" ||
+        m == "05" ||
+        m == "07" ||
+        m == "08" ||
+        m == "10" ||
+        m == "12"
+      ) {
+        this.dateRange[1] = this.month + "-31";
+      } else if (m == "04" || m == "06" || m == "09" || m == "11") {
+        this.dateRange[1] = this.month + "-30";
+      }else{
+        if(y % 4 == 0 && y % 100 !== 0 || y % 400 == 0){
+          this.dateRange[1] = this.month + "-29";
+        }else{
+          this.dateRange[1] = this.month + "-28";
+        }
+      }
+
       //console.log(this.dateRange);
       listDayflowassessmentbyJsid(
         this.addDateRange(this.queryParams_pg, this.dateRange)
@@ -387,6 +402,7 @@ export default {
     getList() {
       this.loading = true;
       listTeacherassessment(this.queryParams).then((response) => {
+        //console.log(response.rows);
         this.teacherassessmentList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -408,19 +424,6 @@ export default {
         this.userOptions = response.rows;
       });
     },
-    // 字典翻译
-    classFormat(row, column) {
-      // return this.selectDictLabel(this.classOptions, row.classid);
-      var actions = [];
-      var datas = this.classOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].bjbh == "" + row.classid) {
-          actions.push(datas[key].bjmc);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
     userFormat(row, column) {
       var actions = [];
       var datas = this.userOptions;

ruoyi-ui/src/views/benyi/thememonthplan/data.vue

@@ -466,19 +466,25 @@ export default {
         this.open = true;
         this.title = "填充主题整合周计划明细";
         let arrTime = [];
-        arrTime.push(response.data.starttime);
+        if (response.data.starttime == null) {
-        arrTime.push(response.data.endtime);
+        } else {
+          arrTime.push(response.data.starttime);
+          arrTime.push(response.data.endtime);
+        }
         this.form.starttime = arrTime;
-        var activityid = response.data.activityid.split(";");
+        if (activityid == null) {
-        var array = [];
+        } else {
-        //console.log(arr);
+          var activityid = response.data.activityid.split(";");
-        activityid.forEach(function (value, key, arr) {
+          var array = [];
-          //console.log(value); // 结果依次为1，2，3
+          //console.log(arr);
-          if (value != "") {
+          activityid.forEach(function (value, key, arr) {
-            array.push(parseInt(value));
+            //console.log(value); // 结果依次为1，2，3
-          }
+            if (value != "") {
-        });
+              array.push(parseInt(value));
-        this.themeactivityList = array;
+            }
+          });
+          this.themeactivityList = array;
+        }
       });
     },
     /** 提交按钮 */

ruoyi-ui/src/views/benyi/thememonthplan/index.vue

@@ -45,7 +45,7 @@
         </el-col>
         <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="主题内容" prop="themes">
-            <el-select v-model="queryParams.themes" size="small">
+            <el-select v-model="queryParams.themes" filterable size="small">
               <el-option
                 v-for="item in themeOptions"
                 :key="item.id"

ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue

@@ -45,7 +45,7 @@
         </el-col>
         <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="主题内容" prop="themes">
-            <el-select v-model="queryParams.themes" size="small">
+            <el-select v-model="queryParams.themes" filterable size="small">
               <el-option
                 v-for="item in themeOptions"
                 :key="item.id"

ruoyi-ui/src/views/benyi/themestudy_tremplan/index.vue

@@ -19,7 +19,7 @@
             :expand-on-click-node="true"
             :filter-node-method="filterNode"
             ref="tree"
-            default-expand-all
+            :default-expand-all="false"
             @node-click="handleNodeClick"
           />
         </div>

ruoyi-ui/src/views/benyi/themestudy_weekplan/index.vue

@@ -0,0 +1,349 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="24">
+      <el-col :span="24" :xs="24">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span class="box-card-title">{{ title }}</span>
+          </div>
+          <div class="text item" v-show="title3">
+            <el-button
+              type="primary"
+              plain
+              size="mini"
+              icon="el-icon-printer"
+              v-show="enable"
+              style="float: right"
+              @click="prints"
+              >打印</el-button
+            >
+            <h3 class="box-card-title">{{ title3 }}</h3>
+
+            <div class="pad-left" ref="printMe">
+              <h2 class="title">{{ title4 }}</h2>
+              <table>
+                <tr class="align-center">
+                  <!-- <td v-for="h in headerData" :key="h.title">
+            <b class="table-title">{{h.title}}</b>
+            {{h.name}}
+          </td>-->
+                  <td style="width: 25%">
+                    <b class="table-title">班级：{{ bjmc }}</b>
+                  </td>
+                  <td style="width: 25%">
+                    <b class="table-title">制表人：{{ zbr }}</b>
+                  </td>
+                  <td style="width: 50%">
+                    <b class="table-title">日期：{{ time }}</b>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="3">
+                    <div
+                      v-for="(item, index) in activityList"
+                      :key="index"
+                      class="text item"
+                    >
+                      <h3 class="box-card-case mr">
+                        {{ item.name }}
+                      </h3>
+                      <h3 class="box-card-info">
+                        活动形式：{{ fieldFormat(item) }}
+                      </h3>
+                      <h3 class="box-card-info">
+                        重点领域：{{ typeFormat(item) }}
+                      </h3>
+                      <h3 class="box-card-info">活动目标</h3>
+                      <div
+                        class="text item pad-left"
+                        v-html="item.target"
+                      ></div>
+                      <h3 class="box-card-info">活动材料</h3>
+                      <div class="text item pad-left" v-html="item.data"></div>
+                      <h3 class="box-card-info">活动过程</h3>
+                      <div
+                        class="text item pad-left"
+                        v-html="item.process"
+                      ></div>
+                      <h3 class="box-card-info">活动建议</h3>
+                      <div
+                        class="text item pad-left"
+                        v-html="item.proposal"
+                      ></div>
+                      <h3 class="box-card-info">活动反思</h3>
+                      <div
+                        class="text item pad-left"
+                        v-html="item.reflect"
+                      ></div>
+                      <h3 class="box-card-info" v-show="item.appendix">附录</h3>
+                      <div
+                        class="text item pad-left"
+                        v-html="item.appendix"
+                      ></div>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="3" class="table-title">家长支持:{{ jzzc }}</td>
+                </tr>
+              </table>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTheme } from "@/api/benyi/theme";
+import { listActivity } from "@/api/benyi/activity";
+import { getWeekplanitem } from "@/api/benyi/themeweekplanitem";
+
+import { listWeekplan, getWeekplan } from "@/api/benyi/themeweekplan";
+
+export default {
+  name: "Theme3",
+  data() {
+    return {
+      //打印是否显示
+      enable: true,
+      // 主题整合名称
+      name: undefined,
+      // 主题整合id
+      id: undefined,
+      wid: "",
+      time: null,
+      bjmc: null,
+      zbr: null,
+      title4: null,
+      jzzc: null,
+      //标题
+      title: "",
+      title1: "",
+      title2: "",
+      //活动方案
+      title3: "",
+      // 主题整合活动表格数据
+      activityList: [],
+      //家园沟通
+      communicate: "",
+      //活动形式
+      typeOptions: [],
+      //活动领域
+      fieldOptions: [],
+      //目的
+      note: "",
+      // 树状显示类型
+      treeOptions: [],
+      // 树结构
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      // 查询参数
+      queryParams: {
+        id: undefined,
+        themeid: undefined,
+      },
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    name(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    const tremThemeId = this.$route.params && this.$route.params.id;
+    this.wid = this.$route.params.wid;
+    if (tremThemeId != null) {
+      this.handleNodeUrl(tremThemeId);
+    }
+    if (this.wid != "") {
+      this.getThemeWeekPlanItem();
+    }
+    this.getDicts("sys_theme_type").then((response) => {
+      this.typeOptions = response.data;
+    });
+    this.getDicts("sys_theme_field").then((response) => {
+      this.fieldOptions = response.data;
+    });
+  },
+  methods: {
+    getThemeWeekPlanItem() {
+      getWeekplanitem(this.wid).then((response) => {
+        this.time = response.data.daytime;
+        this.jzzc = response.data.jzzc;
+
+        getWeekplan(response.data.wpid).then((res) => {
+          this.title4 = res.data.name;
+          this.bjmc = res.classname;
+          this.zbr = res.createusername;
+        });
+      });
+    },
+    // 活动领域类型--字典状态字典翻译
+    fieldFormat(row) {
+      //alert(row.scope.split(';').length);
+      var ilength = row.field.split(";").length;
+      var names = "";
+      for (var i = 0; i < ilength; i++) {
+        names =
+          names +
+          this.selectDictLabel(this.fieldOptions, row.field.split(";")[i]) +
+          ";";
+      }
+      //this.selectDictLabel(this.scopeOptions, row.xnxq);
+      return names;
+    },
+    // 活动形式类型--字典状态字典翻译
+    typeFormat(row) {
+      //alert(row.scope.split(';').length);
+      var ilength = row.type.split(";").length;
+      var names = "";
+      for (var i = 0; i < ilength; i++) {
+        names =
+          names +
+          this.selectDictLabel(this.typeOptions, row.type.split(";")[i]) +
+          ";";
+      }
+      //this.selectDictLabel(this.scopeOptions, row.xnxq);
+      return names;
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.id = data.id;
+      this.enable = false;
+      //console.log(data.id);
+      if (data.id >= 9999 && data.id < 99999) {
+      } else if (data.id >= 99999) {
+      } else {
+        this.title = data.label;
+        this.getThemeDetail();
+        this.enable = true;
+        //console.log("最后节点");
+      }
+    },
+    // 节点单击事件
+    handleNodeUrl(tid) {
+      this.id = tid;
+      //console.log(data.id);
+      if (tid >= 9999 && tid < 99999) {
+      } else if (tid >= 99999) {
+      } else {
+        //this.title = data.label;
+        this.getThemeDetail();
+        //console.log("最后节点");
+      }
+      // console.log(this.dayflowtaskList[date.id])
+      // this.getStandardList();
+    },
+    getThemeDetail() {
+      this.title3 = "活动方案";
+      this.queryParams.id = this.id;
+      this.queryParams.themeid = "";
+      //console.log(this.id);
+      listActivity(this.queryParams).then((req) => {
+        this.title = req.rows[0].name;
+        //console.log(req);
+        if (req.code == "200") {
+          this.activityList = req.rows;
+        }
+      });
+    },
+    //打印
+    prints() {
+      //console.log(this.$refs.printMe);
+      this.$print(this.$refs.printMe);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.text {
+  font-size: 14px;
+}
+
+.item {
+  margin-bottom: 18px;
+  line-height: 22px;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+}
+.clearfix:after {
+  clear: both;
+}
+.box-card-title {
+  display: flex;
+  align-items: center;
+  font-size: 16px;
+  &::before {
+    content: "";
+    margin-right: 8px;
+    width: 4px;
+    height: 16px;
+    background: #1890ff;
+  }
+  &.mr {
+    margin: 10px 0;
+  }
+}
+.box-card-case {
+  margin: 0;
+  font-size: 14px;
+  font-weight: 700;
+  display: flex;
+  align-items: center;
+  &::before {
+    content: "";
+    margin-right: 8px;
+    width: 4px;
+    height: 14px;
+    background: #2c3e50;
+  }
+  &.mr {
+    margin: 10px 0;
+  }
+}
+.box-card-info {
+  font-size: 14px;
+  font-weight: 700;
+}
+.pad-left {
+  padding-left: 15px;
+}
+// 禁止复制
+div {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+table {
+  width: 100%;
+  border-collapse: collapse;
+}
+table td {
+  border: #ccc solid 1px;
+  line-height: 24px;
+  padding: 8px 5px;
+}
+.title {
+  margin: 0;
+  font-size: 18px;
+  text-align: center;
+  padding: 15px 0;
+}
+</style>

ruoyi-ui/src/views/benyi/themetermplan/table.vue

@@ -213,15 +213,53 @@ export default {
       background: #f8f8f8;
     }
   }
-  .warning {
+  // .warning {
-    padding-top: 20px;
+  //   padding-top: 20px;
-    font-size: 12px;
+  //   font-size: 12px;
-    color: #666;
+  //   color: #666;
-  }
+  // }
 }
 @media print {
   .table-container {
     padding: 30px 0;
+    .title {
+      margin: 0;
+      font-size: 18px;
+      text-align: center;
+      padding: 15px 0;
+    }
+    .title2 {
+      padding: 0;
+    }
+    .align-center {
+      text-align: center;
+    }
+    .table {
+      font-size: 14px;
+      .print {
+        display: flex;
+        justify-content: flex-end;
+        padding-bottom: 10px;
+      }
+      p {
+        margin: 0;
+      }
+      table {
+        width: 100%;
+        border-collapse: collapse;
+      }
+      table td {
+        border: #ccc solid 1px;
+        line-height: 24px;
+        padding: 8px 5px;
+      }
+      .table-title {
+        font-size: 16px;
+      }
+      .table-bg {
+        background: #f8f8f8;
+      }
+    }
   }
   .print {
     opacity: 0;

ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue

@@ -264,18 +264,54 @@ export default {
       background: #f8f8f8;
     }
   }
-  .warning {
+  // .warning {
-    padding-top: 20px;
+  //   padding-top: 20px;
-    font-size: 12px;
+  //   font-size: 12px;
-    color: #666;
+  //   color: #666;
-  }
+  // }
 }
+
 @media print {
   .table-container {
     padding: 30px 0;
-  }
+    .title {
-  .print {
+      margin: 0;
-    opacity: 0;
+      font-size: 18px;
+      text-align: center;
+      padding: 15px 0;
+    }
+    .title2 {
+      padding: 0;
+    }
+    .align-center {
+      text-align: center;
+    }
+    .table {
+      font-size: 14px;
+      .print {
+        display: flex;
+        justify-content: flex-end;
+        padding-bottom: 10px;
+      }
+      p {
+        margin: 0;
+      }
+      table {
+        width: 100%;
+        border-collapse: collapse;
+      }
+      table td {
+        border: #ccc solid 1px;
+        line-height: 24px;
+        padding: 8px 5px;
+      }
+      .table-title {
+        font-size: 16px;
+      }
+      .table-bg {
+        background: #f8f8f8;
+      }
+    }
   }
 }
 /*去除页眉页脚*/

ruoyi-ui/src/views/benyi/themeweekplan/data.vue

@@ -102,7 +102,7 @@
         v-show="isShow"
         >填充</el-button
       >
-      <el-button
+      <!-- <el-button
         type="danger"
         icon="el-icon-delete"
         size="mini"
@@ -111,7 +111,7 @@
         v-hasPermi="['benyi:themeweekplan:remove']"
         v-show="isShow"
         >删除</el-button
-      >
+      > -->
     </div>
 
     <el-table
@@ -168,7 +168,7 @@
             v-show="isShow"
             >填充</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -176,7 +176,7 @@
             v-hasPermi="['benyi:themeweekplan:remove']"
             v-show="isShow"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>

ruoyi-ui/src/views/benyi/themeweekplan/table.vue

@@ -58,9 +58,9 @@
             <!-- {{ themeactivityFormat(item.activityid) }} -->
             <router-link
               style="margin: 5px; color: blue; text-decoration: underline"
-              v-for="(index, item) in item.activityid.split(';')"
+              v-for="(index, item1) in item.activityid.split(';')"
-              :key="item"
+              :key="item1"
-              :to="url + index"
+              :to="url + index + '/' + item.id"
               >{{ themeactivityFormat(index) }}</router-link
             >
           </td>
@@ -102,7 +102,7 @@ export default {
   data() {
     return {
       //url
-      url: "/benyi_course/tremplan/themestudy/",
+      url: "/benyi_course/weekplan/themestudy/",
       tableData: [],
       title: "",
       zc: "",
@@ -287,6 +287,7 @@ export default {
     async getList() {
       //console.log(this.queryParams.wpid);
       await listWeekplanitem(this.queryParams).then((response) => {
+        //console.log(response.rows);
         this.bodyData.weekplanitemList = response.rows;
 
         //获取所有的活动id

ruoyi-ui/src/views/system/user/index.vue

@@ -266,7 +266,8 @@
                 placeholder="请选择归属部门"
               />
             </el-form-item>
-          </el-col>
+          </el-col> </el-row
+        ><el-row :gutter="16">
           <el-col :xs="24" :sm="24" :md="12">
             <el-form-item label="登录账号" prop="userName">
               <el-input
@@ -288,7 +289,8 @@
                 type="password"
               />
             </el-form-item>
-          </el-col>
+          </el-col> </el-row
+        ><el-row :gutter="16">
           <el-col :xs="24" :sm="24" :md="12">
             <el-form-item label="用户性别" prop="sex">
               <el-select v-model="form.sex" placeholder="请选择">
@@ -320,7 +322,8 @@
                 >
               </el-radio-group> -->
             </el-form-item>
-          </el-col>
+          </el-col> </el-row
+        ><el-row :gutter="16">
           <el-col :xs="24" :sm="24" :md="12">
             <el-form-item label="岗位" prop="postIds">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
@@ -346,7 +349,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> </el-row
+        ><el-row :gutter="16">
           <el-col :xs="24" :sm="24" :md="12">
             <el-form-item v-if="isSchool" label="多幼儿园">
               <el-select v-model="form.deptIds" multiple placeholder="请选择">
@@ -359,7 +363,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> </el-row
+        ><el-row :gutter="16">
           <el-col :xs="24" :sm="24" :md="24">
             <el-form-item label="备注" prop="remark">
               <el-input
@@ -522,9 +527,7 @@ export default {
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
         ],
-        roleIds: [
+        roleIds: [{ required: true, message: "角色不能为空", trigger: "blur" }],
-          { required: true, message: "角色不能为空", trigger: "blur" },
-        ],
       },
     };
   },

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java

@@ -119,7 +119,7 @@ public class ByMathTermplanController extends BaseController {
             String bjtypeNew = byClassService.selectByClassById(classId).getBjtype();
             if (bjtypeNew.equals("1")) {
                 return AjaxResult.error("当前班级为托班，无法创建计划");
-            }else {
+            } else {
                 int iCount = schoolCommon.getDifMonth(byMathTermplan.getStartmonth(), byMathTermplan.getEndmonth());
                 System.out.println("月份差=" + iCount);
                 String uuid = schoolCommon.getUuid();
@@ -144,7 +144,7 @@ public class ByMathTermplanController extends BaseController {
                 return toAjax(byMathTermplanService.insertByMathTermplan(byMathTermplan));
             }
         } else {
-            return AjaxResult.error("当前用户非幼儿园教师，无法创建计划");
+            return AjaxResult.error("当前用户非幼儿园班级教师，无法创建计划");
         }
     }
 
@@ -171,7 +171,10 @@ public class ByMathTermplanController extends BaseController {
             byMathTermplanitem.setTpid(ids[i]);
             List<ByMathTermplanitem> list = byMathTermplanitemService.selectByMathTermplanitemList(byMathTermplanitem);
             if (list != null && list.size() > 0) {
-                return AjaxResult.error("选中的计划下存在计划明细，无法删除");
+                //return AjaxResult.error("选中的计划下存在计划明细，无法删除");
+                for (int j = 0; j < list.size(); j++) {
+                    byMathTermplanitemService.deleteByMathTermplanitemById(list.get(j).getId());
+                }
             }
         }
         return toAjax(byMathTermplanService.deleteByMathTermplanByIds(ids));

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolchargeController.java

@@ -51,14 +51,24 @@ public class BySchoolchargeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('benyi:schoolcharge:list')")
     @GetMapping("/child/list")
     public TableDataInfo childlist(BySchoolcharge bySchoolcharge) {
-        startPage();
+        System.out.println("month---" + bySchoolcharge.getMonth());
-        List<BySchoolcharge> list = bySchoolchargeService.selectByChildchargeList(bySchoolcharge);
+        bySchoolcharge.setMonthday(bySchoolcharge.getMonth() + "-15");
-        if (list != null && list.size() > 0) {
+        List<BySchoolcharge> listScope = bySchoolchargeService.selectByChildchargeListByMonth(bySchoolcharge);
-            for (int i = 0; i < list.size(); i++) {
+        if (listScope != null && listScope.size() > 0) {
-                list.get(i).setZj(getZongji(list.get(i)));
+            bySchoolcharge.setId(listScope.get(0).getId());
+            startPage();
+            List<BySchoolcharge> list = bySchoolchargeService.selectByChildchargeList(bySchoolcharge);
+            if (list != null && list.size() > 0) {
+                for (int i = 0; i < list.size(); i++) {
+                    list.get(i).setZj(getZongji(list.get(i)));
+                }
             }
+            return getDataTable(list);
+        } else {
+            bySchoolcharge.setId(Long.valueOf(0));
+            List<BySchoolcharge> list = bySchoolchargeService.selectByChildchargeList(bySchoolcharge);
+            return getDataTable(list);
         }
-        return getDataTable(list);
     }
 
     //根据每条幼儿统计数计算总费用
@@ -154,7 +164,23 @@ public class BySchoolchargeController extends BaseController {
     @Log(title = "园所收费标准", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BySchoolcharge bySchoolcharge) {
-        return toAjax(bySchoolchargeService.updateBySchoolcharge(bySchoolcharge));
+        int iCount = 0;
+        BySchoolcharge bySchoolchargeNew = bySchoolchargeService.selectBySchoolchargeById(bySchoolcharge.getId());
+        if (bySchoolcharge.getStartTime().equals(bySchoolchargeNew.getStartTime())) {
+            if (bySchoolcharge.getEndtime().equals(bySchoolchargeNew.getEndtime())) {
+                iCount = iCount + bySchoolchargeService.updateBySchoolcharge(bySchoolcharge);
+            } else {
+                bySchoolchargeNew.setIsdel("1");
+                iCount = iCount + bySchoolchargeService.updateBySchoolcharge(bySchoolchargeNew);
+                iCount = iCount + bySchoolchargeService.insertBySchoolcharge(bySchoolcharge);
+            }
+        } else {
+            bySchoolchargeNew.setIsdel("1");
+            iCount = iCount + bySchoolchargeService.updateBySchoolcharge(bySchoolchargeNew);
+            iCount = iCount + bySchoolchargeService.insertBySchoolcharge(bySchoolcharge);
+        }
+
+        return toAjax(iCount);
     }
 
     /**

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java

@@ -63,11 +63,16 @@ public class ByThemeMonthplanController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(ByThemeMonthplan byThemeMonthplan) {
         byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-        String classId = schoolCommon.getClassId();
+        //参数传进来的班级编号
+        String strClassId = byThemeMonthplan.getClassid();
         List<ByThemeMonthplan> list = null;
-        //首先判断当前账户是否为幼儿园账号
+        //如果传进来的班级编号为空，那么就认为是本身查询
-        if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
+        if (schoolCommon.isStringEmpty(strClassId)) {
-            byThemeMonthplan.setClassid(classId);
+            String classId = schoolCommon.getClassId();
+            //首先判断当前账户是否为幼儿园账号
+            if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
+                byThemeMonthplan.setClassid(classId);
+            }
         }
         startPage();
         list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan);
@@ -105,11 +110,11 @@ public class ByThemeMonthplanController extends BaseController {
     @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        AjaxResult ajax=AjaxResult.success();
+        AjaxResult ajax = AjaxResult.success();
-        ByThemeMonthplan byThemeMonthplan=byThemeMonthplanService.selectByThemeMonthplanById(id);
+        ByThemeMonthplan byThemeMonthplan = byThemeMonthplanService.selectByThemeMonthplanById(id);
         ajax.put(AjaxResult.DATA_TAG, byThemeMonthplan);
-        ajax.put("classname",byClassService.selectByClassById(byThemeMonthplan.getClassid()).getBjmc());
+        ajax.put("classname", byClassService.selectByClassById(byThemeMonthplan.getClassid()).getBjmc());
-        ajax.put("createusername",userService.selectUserById(byThemeMonthplan.getCreateuserid()).getNickName());
+        ajax.put("createusername", userService.selectUserById(byThemeMonthplan.getCreateuserid()).getNickName());
         return ajax;
     }
 
@@ -127,7 +132,7 @@ public class ByThemeMonthplanController extends BaseController {
             String bjtypeNew = byClassService.selectByClassById(classId).getBjtype();
             if (bjtypeNew.equals("1")) {
                 return AjaxResult.error("当前班级为托班，无法创建计划");
-            }else {
+            } else {
                 //根据当前月份 查找学期计划的主题
                 ByThemeTermplan byThemeTermplan = new ByThemeTermplan();
                 byThemeTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
@@ -168,10 +173,21 @@ public class ByThemeMonthplanController extends BaseController {
                 byThemeMonthplan.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
                 byThemeMonthplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-主题整合月计划" + "(" + sdf.format(byThemeMonthplan.getMonth()) + ")");
+
+                // 默认创建4个周内容项，如果当前月份5个周 那么由用户自己删 或 增
+                ByThemeMonthplanitem byThemeMonthplanitem=null;
+                for(int i=1;i<5;i++){
+                    byThemeMonthplanitem=new ByThemeMonthplanitem();
+                    byThemeMonthplanitem.setId(schoolCommon.getUuid());
+                    byThemeMonthplanitem.setMpid(uuid);
+                    byThemeMonthplanitem.setZc(Long.valueOf(i));
+                    byThemeonthplanitemService.insertByThemeMonthplanitem(byThemeMonthplanitem);
+                }
+
                 return toAjax(byThemeMonthplanService.insertByThemeMonthplan(byThemeMonthplan));
             }
         } else {
-            return AjaxResult.error("当前用户非幼儿园教师，无法创建月计划");
+            return AjaxResult.error("当前用户非幼儿园班级教师，无法创建月计划");
         }
     }
 

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanitemController.java

@@ -52,7 +52,7 @@ public class ByThemeMonthplanitemController extends BaseController {
      * 导出主题整合周计划列表
      */
     @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:export')")
-    @Log(title = "主题整合周计划", businessType = BusinessType.EXPORT)
+    @Log(title = "主题整合月计划", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(ByThemeMonthplanitem byThemeMonthplanitem) {
         List<ByThemeMonthplanitem> list = byThemeWeekplanService.selectByThemeMonthplanitemList(byThemeMonthplanitem);
@@ -73,7 +73,7 @@ public class ByThemeMonthplanitemController extends BaseController {
      * 新增主题整合周计划
      */
     @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:add')")
-    @Log(title = "主题整合周计划", businessType = BusinessType.INSERT)
+    @Log(title = "主题整合月计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ByThemeMonthplanitem byThemeMonthplanitem) {
         String uuid = schoolCommon.getUuid();
@@ -86,7 +86,7 @@ public class ByThemeMonthplanitemController extends BaseController {
      * 修改主题整合周计划
      */
     @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:edit')")
-    @Log(title = "主题整合周计划", businessType = BusinessType.UPDATE)
+    @Log(title = "主题整合月计划", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ByThemeMonthplanitem byThemeMonthplanitem) {
         return toAjax(byThemeWeekplanService.updateByThemeMonthplanitem(byThemeMonthplanitem));
@@ -96,7 +96,7 @@ public class ByThemeMonthplanitemController extends BaseController {
      * 删除主题整合周计划
      */
     @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:remove')")
-    @Log(title = "主题整合周计划", businessType = BusinessType.DELETE)
+    @Log(title = "主题整合月计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(byThemeWeekplanService.deleteByThemeMonthplanitemByIds(ids));

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java

@@ -151,7 +151,7 @@ public class ByThemeTermplanController extends BaseController {
                 }
             }
         } else {
-            return AjaxResult.error("当前用户非幼儿园教师，无法创建计划");
+            return AjaxResult.error("当前用户非幼儿园班级教师，无法创建计划");
         }
 
     }

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java

@@ -112,11 +112,11 @@ public class ByThemeWeekplanController extends BaseController {
     @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        AjaxResult ajax=AjaxResult.success();
+        AjaxResult ajax = AjaxResult.success();
-        ByThemeWeekplan byThemeWeekplan=byThemeWeekplanService.selectByThemeWeekplanById(id);
+        ByThemeWeekplan byThemeWeekplan = byThemeWeekplanService.selectByThemeWeekplanById(id);
         ajax.put(AjaxResult.DATA_TAG, byThemeWeekplan);
-        ajax.put("classname",byClassService.selectByClassById(byThemeWeekplan.getClassid()).getBjmc());
+        ajax.put("classname", byClassService.selectByClassById(byThemeWeekplan.getClassid()).getBjmc());
-        ajax.put("createusername",userService.selectUserById(byThemeWeekplan.getCreateuserid()).getNickName());
+        ajax.put("createusername", userService.selectUserById(byThemeWeekplan.getCreateuserid()).getNickName());
         return ajax;
     }
 
@@ -134,7 +134,7 @@ public class ByThemeWeekplanController extends BaseController {
             String bjtypeNew = byClassService.selectByClassById(classId).getBjtype();
             if (bjtypeNew.equals("1")) {
                 return AjaxResult.error("当前班级为托班，无法创建计划");
-            }else {
+            } else {
                 //判断当前班级是否创建月计划
                 ByThemeMonthplan byThemeMonthplan = new ByThemeMonthplan();
                 byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
@@ -203,7 +203,7 @@ public class ByThemeWeekplanController extends BaseController {
                 return toAjax(byThemeWeekplanService.insertByThemeWeekplan(byThemeWeekplan));
             }
         } else {
-            return AjaxResult.error("当前用户非幼儿园教师，无法创建周计划");
+            return AjaxResult.error("当前用户非幼儿园班级教师，无法创建周计划");
         }
     }
 
@@ -224,6 +224,10 @@ public class ByThemeWeekplanController extends BaseController {
     @Log(title = "主题整合周计划（根据月计划明细）", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
+        //先删除子项
+        for (int i = 0; i < ids.length; i++) {
+            byThemeWeekplanitemService.deleteByThemeWeekplanitemByPId(ids[i]);
+        }
         return toAjax(byThemeWeekplanService.deleteByThemeWeekplanByIds(ids));
     }
 

ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcharge.java

@@ -1,11 +1,14 @@
 package com.ruoyi.project.benyi.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.project.system.domain.SysDept;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 园所收费标准对象 by_schoolcharge
  *
@@ -80,10 +83,58 @@ public class BySchoolcharge extends BaseEntity {
     @Excel(name = "伙食费中班")
     private Double hsfZ;
 
+    /**
+     * 起止时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndtime() {
+        return endtime;
+    }
+
+    public void setEndtime(Date endtime) {
+        this.endtime = endtime;
+    }
+
+    /**
+     * 起止时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endtime;
+
+    public String getIsdel() {
+        return isdel;
+    }
+
+    public void setIsdel(String isdel) {
+        this.isdel = isdel;
+    }
+
+    private String isdel;
+
     private SysDept dept;
 
     // 幼儿考勤系统属性
     private String month;
+
+    public String getMonthday() {
+        return monthday;
+    }
+
+    public void setMonthday(String monthday) {
+        this.monthday = monthday;
+    }
+
+    private String monthday;
     private String name;
     private String classid;
     private Long days;
@@ -256,6 +307,10 @@ public class BySchoolcharge extends BaseEntity {
                 .append("bjtype", getBjtype())
                 .append("days", getDays())
                 .append("zj", getZj())
+                .append("startTime",getStartTime())
+                .append("endtime",getEndtime())
+                .append("isdel",getIsdel())
+                .append("monthday",getMonthday())
                 .toString();
     }
 }

ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.benyi.domain;
 
+import com.ruoyi.project.system.domain.ByClass;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -91,6 +92,16 @@ public class ByTeacherassessment extends BaseEntity {
 
     private SysUser sysUser;
 
+    public ByClass getByClass() {
+        return byClass;
+    }
+
+    public void setByClass(ByClass byClass) {
+        this.byClass = byClass;
+    }
+
+    private ByClass byClass;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -194,7 +205,8 @@ public class ByTeacherassessment extends BaseEntity {
                 .append("wsbl", getWsbl())
                 .append("zfbl", getZfbl())
                 .append("createTime", getCreateTime())
-                .append("sysUser",getSysUser())
+                .append("sysUser", getSysUser())
+                .append("byClass", getByClass())
                 .toString();
     }
 }

ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/BySchoolchargeMapper.java

@@ -35,6 +35,14 @@ public interface BySchoolchargeMapper {
      */
     public List<BySchoolcharge> selectByChildchargeList(BySchoolcharge bySchoolcharge);
 
+    /**
+     * 查询幼儿收费列表
+     *
+     * @param bySchoolcharge 收费标准
+     * @return 幼儿收费集合
+     */
+    public List<BySchoolcharge> selectByChildchargeListByMonth(BySchoolcharge bySchoolcharge);
+
     /**
      * 新增园所收费标准
      *

ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanitemMapper.java

@@ -58,4 +58,12 @@ public interface ByThemeWeekplanitemMapper {
      * @return 结果
      */
     public int deleteByThemeWeekplanitemByIds(Long[] ids);
+
+    /**
+     * 删除主题整合周计划明细信息
+     *
+     * @param pid 主题周计划主键
+     * @return 结果
+     */
+    public int deleteByThemeWeekplanitemByPId(String pid);
 }

ruoyi/src/main/java/com/ruoyi/project/benyi/service/IBySchoolchargeService.java

@@ -35,6 +35,15 @@ public interface IBySchoolchargeService {
      */
     public List<BySchoolcharge> selectByChildchargeList(BySchoolcharge bySchoolcharge);
 
+    /**
+     * 查询幼儿收费列表
+     *
+     * @param bySchoolcharge 收费标准
+     * @return 幼儿收费集合
+     */
+    public List<BySchoolcharge> selectByChildchargeListByMonth(BySchoolcharge bySchoolcharge);
+
+
     /**
      * 新增园所收费标准
      *

ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanitemService.java

@@ -58,4 +58,13 @@ public interface IByThemeWeekplanitemService {
      * @return 结果
      */
     public int deleteByThemeWeekplanitemById(Long id);
+
+
+    /**
+     * 删除主题整合周计划明细信息
+     *
+     * @param pid 主题周计划主键
+     * @return 结果
+     */
+    public int deleteByThemeWeekplanitemByPId(String pid);
 }

ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/BySchoolchargeServiceImpl.java

@@ -52,10 +52,22 @@ public class BySchoolchargeServiceImpl implements IBySchoolchargeService {
      */
     @Override
     @DataScope(deptAlias = "b")
-    public List<BySchoolcharge> selectByChildchargeList(BySchoolcharge bySchoolcharge){
+    public List<BySchoolcharge> selectByChildchargeList(BySchoolcharge bySchoolcharge) {
         return bySchoolchargeMapper.selectByChildchargeList(bySchoolcharge);
     }
 
+    /**
+     * 查询幼儿收费列表
+     *
+     * @param bySchoolcharge 收费标准
+     * @return 幼儿收费集合
+     */
+    @Override
+    @DataScope(deptAlias = "b")
+    public List<BySchoolcharge> selectByChildchargeListByMonth(BySchoolcharge bySchoolcharge) {
+        return bySchoolchargeMapper.selectByChildchargeListByMonth(bySchoolcharge);
+    }
+
     /**
      * 新增园所收费标准
      *

ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanitemServiceImpl.java

@@ -87,4 +87,15 @@ public class ByThemeWeekplanitemServiceImpl implements IByThemeWeekplanitemServi
     public int deleteByThemeWeekplanitemById(Long id) {
         return byThemeWeekplanitemMapper.deleteByThemeWeekplanitemById(id);
     }
+
+    /**
+     * 删除主题整合周计划明细信息
+     *
+     * @param pid 主题周计划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteByThemeWeekplanitemByPId(String pid) {
+        return byThemeWeekplanitemMapper.deleteByThemeWeekplanitemByPId(pid);
+    }
 }

ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml

@@ -85,7 +85,9 @@
 (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='规则与纪律约束')) as gzyjlyspjf,
 (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='微型课程')) as wxkcpjf,
 (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='潜课程')) as qkcpjf
-         from by_dayflowassessment d left join by_class e on d.classid=e.bjbh left join sys_user f on d.pgdx=f.user_id
+         from by_dayflowassessment d
+         left join by_class e on d.classid=e.bjbh
+         left join sys_user f on d.pgdx=f.user_id
     </sql>
 
     <select id="selectByDayflowassessmentList" parameterType="ByDayflowassessment"

ruoyi/src/main/resources/mybatis/benyi/ByHalfdayplanMapper.xml

@@ -27,7 +27,7 @@
         <if test="content != null  and content != ''">and content = #{content}</if>
         <if test="type != null  and type != ''">and type = #{type}</if>
 
-        order by type
+        order by create_time desc
     </select>
 
     <select id="selectByHalfdayplanById" parameterType="String" resultMap="ByHalfdayplanResult">

ruoyi/src/main/resources/mybatis/benyi/BySchoolchargeMapper.xml

@@ -17,7 +17,11 @@
         <result property="hsfT" column="hsf_t"/>
         <result property="byfZ" column="byf_z"/>
         <result property="hsfZ" column="hsf_z"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endtime" column="endtime"/>
+        <result property="isdel" column="isdel"/>
         <result property="month" column="month"/>
+        <result property="monthday" column="monthday"/>
         <result property="name" column="name"/>
         <result property="classid" column="classid"/>
         <result property="days" column="days"/>
@@ -35,13 +39,13 @@
     </resultMap>
 
     <sql id="selectBySchoolchargeVo">
-        select a.id, a.dept_id, a.byf, a.hsf, a.create_userid, a.create_time,a.byf_x, a.hsf_x, a.byf_t, a.hsf_t, a.byf_z, a.hsf_z,b.dept_name from by_schoolcharge a
+        select a.id, a.dept_id, a.byf, a.hsf, a.create_userid, a.create_time,a.byf_x, a.hsf_x, a.byf_t, a.hsf_t, a.byf_z, a.hsf_z,a.start_time,a.endtime,a.isdel,b.dept_name from by_schoolcharge a
         right join sys_dept b on a.dept_id=b.dept_id
     </sql>
 
     <select id="selectBySchoolchargeList" parameterType="BySchoolcharge" resultMap="BySchoolchargeResult">
         <include refid="selectBySchoolchargeVo"/>
-        where school_id is not null and del_flag=0
+        where school_id is not null and del_flag=0 and isdel=0
         <if test="byf != null ">and byf = #{byf}</if>
         <if test="hsf != null ">and hsf = #{hsf}</if>
         <if test="createUserid != null ">and create_userid = #{createUserid}</if>
@@ -49,6 +53,19 @@
         ${dataScope}
     </select>
 
+    <select id="selectByChildchargeListByMonth" parameterType="BySchoolcharge" resultMap="BySchoolchargeResult">
+        <include refid="selectBySchoolchargeVo"/>
+        where school_id is not null and del_flag=0
+        <if test="monthday != null and monthday != ''"><!-- 开始时间检索 -->
+            AND date_format(start_time,'%y%m%d') &lt;= date_format(#{monthday},'%y%m%d')
+        </if>
+        <if test="monthday != null and monthday != ''"><!-- 结束时间检索 -->
+            AND date_format(endtime,'%y%m%d') &gt;= date_format(#{monthday},'%y%m%d')
+        </if>
+        <!-- 数据范围过滤 -->
+        ${dataScope}
+    </select>
+
     <select id="selectByChildchargeList" parameterType="BySchoolcharge" resultMap="BySchoolchargeResult">
         select a.name,a.classid,
         c.bjtype,
@@ -59,7 +76,7 @@
         from by_child a
         left join by_class c on a.classid=c.bjbh
         left join by_schoolcharge b on a.schoolid=b.dept_id
-        where c.bjbh = #{classid}
+        where c.bjbh = #{classid} and b.id=#{id}
         <!-- 数据范围过滤 -->
         ${dataScope}
     </select>
@@ -83,6 +100,9 @@
             <if test="hsfT != null ">hsf_t,</if>
             <if test="byfZ != null  and byfZ != ''">byf_z,</if>
             <if test="hsfZ != null ">hsf_z,</if>
+            <if test="startTime != null ">start_time,</if>
+            <if test="endtime != null ">endtime,</if>
+            <if test="isdel != null  and isdel != ''">isdel,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null ">#{deptId},</if>
@@ -96,6 +116,9 @@
             <if test="hsfT != null ">#{hsfT},</if>
             <if test="byfZ != null  and byfZ != ''">#{byfZ},</if>
             <if test="hsfZ != null ">#{hsfZ},</if>
+            <if test="startTime != null ">#{startTime},</if>
+            <if test="endtime != null ">#{endtime},</if>
+            <if test="isdel != null  and isdel != ''">#{isdel},</if>
         </trim>
     </insert>
 
@@ -113,6 +136,9 @@
             <if test="hsfT != null ">hsf_t = #{hsfT},</if>
             <if test="byfZ != null  and byfZ != ''">byf_z = #{byfZ},</if>
             <if test="hsfZ != null ">hsf_z = #{hsfZ},</if>
+            <if test="startTime != null ">start_time = #{startTime},</if>
+            <if test="endtime != null ">endtime = #{endtime},</if>
+            <if test="isdel != null  and isdel != ''">isdel = #{isdel},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml

@@ -18,6 +18,7 @@
         <result property="zfbl" column="zfbl"/>
         <result property="createTime" column="create_time"/>
         <association property="sysUser" column="jsid" javaType="SysUser" resultMap="SysUserResult"/>
+        <association property="byClass" column="classid" javaType="ByClass" resultMap="ByClassResult"/>
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
@@ -26,9 +27,29 @@
         <result property="nickName" column="nick_name"/>
     </resultMap>
 
+    <resultMap type="ByClass" id="ByClassResult">
+        <result property="bjbh" column="bjbh"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="bjtype" column="bjtype"/>
+        <result property="bhxh" column="bhxh"/>
+        <result property="xn" column="xn"/>
+        <result property="bjmc" column="bjmc"/>
+        <result property="bjrych" column="bjrych"/>
+        <result property="jbny" column="jbny"/>
+        <result property="zbjs" column="zbjs"/>
+        <result property="zbjsxm" column="zbjsxm"/>
+        <result property="pbjs" column="pbjs"/>
+        <result property="pbjsxm" column="pbjsxm"/>
+        <result property="zljs" column="zljs"/>
+        <result property="zljsxm" column="zljsxm"/>
+        <result property="isdel" column="isdel"/>
+        <result property="createtime" column="createtime"/>
+    </resultMap>
+
     <sql id="selectByTeacherassessmentVo">
-        select a.id, a.jsid, a.classid, a.dept_id, a.month, a.yrlcbl, a.jskqbl, a.yekqbl, a.sgbl, a.wsbl, a.zfbl, a.create_time,b.nick_name from by_teacherassessment a
+        select a.id, a.jsid, a.classid, c.bjmc, a.dept_id, a.month, a.yrlcbl, a.jskqbl, a.yekqbl, a.sgbl, a.wsbl, a.zfbl, a.create_time,b.nick_name from by_teacherassessment a
         left join sys_user b on a.jsid=b.user_id
+        left join by_class c on a.classid=c.bjbh
     </sql>
 
     <select id="selectByTeacherassessmentList" parameterType="ByTeacherassessment"
@@ -45,9 +66,10 @@
             <if test="sgbl != null ">and a.sgbl = #{sgbl}</if>
             <if test="wsbl != null ">and a.wsbl = #{wsbl}</if>
             <if test="zfbl != null ">and a.zfbl = #{zfbl}</if>
+
+            <!-- 数据范围过滤 -->
+            ${dataScope}
         </where>
-        <!-- 数据范围过滤 -->
-        ${dataScope}
         order by a.create_time desc
     </select>
 

ruoyi/src/main/resources/mybatis/benyi/ByThemeMonthplanMapper.xml

@@ -54,7 +54,7 @@
             <if test="classid != null  and classid != ''">and a.classid = #{classid}</if>
             <if test="xnxq != null  and xnxq != ''">and a.xnxq = #{xnxq}</if>
             <if test="month != null ">and a.month = #{month}</if>
-            <if test="themes != null  and themes != ''">and a.themes = #{themes}</if>
+            <if test="themes != null  and themes != ''">and a.themes like concat('%;', #{themes}, ';%')</if>
             <if test="selfthemes != null  and selfthemes != ''">and a.selfthemes = #{selfthemes}</if>
             <if test="wxkc != null  and wxkc != ''">and a.wxkc = #{wxkc}</if>
             <if test="support != null  and support != ''">and a.support = #{support}</if>

ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml

@@ -92,6 +92,10 @@
         delete from by_theme_weekplanitem where id = #{id}
     </delete>
 
+    <delete id="deleteByThemeWeekplanitemByPId" parameterType="String">
+        delete from by_theme_weekplanitem where wpid = #{wpid}
+    </delete>
+
     <delete id="deleteByThemeWeekplanitemByIds" parameterType="String">
         delete from by_theme_weekplanitem where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">

ruoyi/src/main/resources/mybatis/benyi/ByTrainVideoMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classtype != null  and classtype != ''"> and classtype = #{classtype}</if>
             <if test="createuserid != null "> and createuserid = #{createuserid}</if>
             <if test="createtime != null "> and createtime = #{createtime}</if>
+            <if test="id != null "> and id = #{id}</if>
         </where>
     </select>