Merge branch 'master' of https://gitee.com/paidaxing444/benyi

ruoyi-ui/src/api/system/teacher.js

@@ -18,6 +18,15 @@ export function listTeacher2(query) {
   })
 }
 
+// 查询教师基本信息列表
+export function listTeacherGroupXw() {
+  return request({
+    url: '/system/teacher/listgroupxw',
+    method: 'get',
+    params: ''
+  })
+}
+
 // 查询教师基本信息详细
 export function getTeacher(id) {
   return request({

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

@@ -95,7 +95,7 @@
       :data="schoolcalendarList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" />
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column
@@ -120,6 +120,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['benyi:schoolcalendar:edit']"
+            :disabled="!checkSelectable(scope.row)"
           >修改</el-button>
           <el-button
             size="mini"
@@ -127,6 +128,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['benyi:schoolcalendar:remove']"
+            :disabled="!checkSelectable(scope.row)"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -224,6 +226,8 @@ export default {
       scopeOptions: [],
       //学年学期
       xnxqOptions: [],
+      //声明方法
+      selectable: Function,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -271,6 +275,16 @@ export default {
     schoolcalendartypeFormat(row, column) {
       return this.selectDictLabel(this.schoolcalendartypeOptions, row.type);
     },
+    //控制按钮可用
+    checkSelectable(row) {
+      var date = new Date();
+      //console.log(date.toLocaleDateString());
+      return this.CompareDate(row.activitytime, date.toLocaleDateString());
+    },
+    //比较日期大小
+    CompareDate(d1, d2) {
+      return new Date(d1.replace(/-/g, "/")) > new Date(d2.replace(/-/g, "/"));
+    },
     // 适用范围类型--字典状态字典翻译
     scopeFormat(row, column) {
       //alert(row.scope.split(';').length);

ruoyi-ui/src/views/dashboard/BarChart.vue

@@ -62,7 +62,7 @@ export default {
         },
         xAxis: [{
           type: 'category',
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          data: ['班级A', '班级B', '班级C', '班级D', '班级E', '班级F', '班级G'],
           axisTick: {
             alignWithLabel: true
           }
@@ -74,25 +74,18 @@ export default {
           }
         }],
         series: [{
-          name: 'pageA',
+          name: '幼儿出勤率',
           type: 'bar',
           stack: 'vistors',
           barWidth: '60%',
-          data: [79, 52, 200, 334, 390, 330, 220],
+          data: [30, 29, 28, 31, 33, 18, 20],
           animationDuration
         }, {
-          name: 'pageB',
+          name: '教师出勤率',
           type: 'bar',
           stack: 'vistors',
           barWidth: '60%',
-          data: [80, 52, 200, 334, 390, 330, 220],
+          data: [3, 3, 3, 3, 2, 3, 3],
-          animationDuration
-        }, {
-          name: 'pageC',
-          type: 'bar',
-          stack: 'vistors',
-          barWidth: '60%',
-          data: [30, 52, 200, 334, 390, 330, 220],
           animationDuration
         }]
       })

ruoyi-ui/src/views/dashboard/PieChart.vue

@@ -3,77 +3,91 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import echarts from "echarts";
-require('echarts/theme/macarons') // echarts theme
+require("echarts/theme/macarons"); // echarts theme
-import resize from './mixins/resize'
+import resize from "./mixins/resize";
+import { listTeacherGroupXw } from "@/api/system/teacher";
 
 export default {
+  names: [],
+  values: [],
   mixins: [resize],
   props: {
     className: {
       type: String,
-      default: 'chart'
+      default: "chart"
     },
     width: {
       type: String,
-      default: '100%'
+      default: "100%"
     },
     height: {
       type: String,
-      default: '300px'
+      default: "300px"
     }
   },
   data() {
     return {
       chart: null
-    }
+    };
   },
   mounted() {
     this.$nextTick(() => {
-      this.initChart()
+      this.initChart();
-    })
+    });
   },
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
+    this.chart.dispose();
-    this.chart = null
+    this.chart = null;
   },
   methods: {
-    initChart() {
+    async getData() {
-      this.chart = echarts.init(this.$el, 'macarons')
+      await listTeacherGroupXw().then(response => {
+        console.log(response);
+        let name = [];
+        let value = [];
+        let len = response.rows;
+        for (var j = 0; j < len.length; j++) {
+          name.push(len[j].xl);
+          value.push({'name':len[j].xl,'value':len[j].byyx});
+        }
+        this.names = name;
+        this.values = value;
+        //console.log(this.names);
+        //console.log(this.values);
+      });
+    },
+    async initChart() {
+      await this.getData();
+      this.chart = echarts.init(this.$el, "macarons");
 
       this.chart.setOption({
         tooltip: {
-          trigger: 'item',
+          trigger: "item",
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
+          formatter: "{a} <br/>{b} : {c} ({d}%)"
         },
         legend: {
-          left: 'center',
+          left: "center",
-          bottom: '10',
+          bottom: "10",
-          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+          data: this.names
         },
         series: [
           {
-            name: 'WEEKLY WRITE ARTICLES',
+            name: "幼儿园教职工学历统计",
-            type: 'pie',
+            type: "pie",
-            roseType: 'radius',
+            roseType: "radius",
             radius: [15, 95],
-            center: ['50%', '38%'],
+            center: ["50%", "38%"],
-            data: [
+            data: this.values,
-              { value: 320, name: 'Industries' },
+            animationEasing: "cubicInOut",
-              { value: 240, name: 'Technology' },
-              { value: 149, name: 'Forex' },
-              { value: 100, name: 'Gold' },
-              { value: 59, name: 'Forecasts' }
-            ],
-            animationEasing: 'cubicInOut',
             animationDuration: 2600
           }
         ]
-      })
+      });
     }
   }
-}
+};
 </script>

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

@@ -0,0 +1,108 @@
+package com.ruoyi.project.benyi.controller;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.benyi.domain.ByDayFlowDetail;
+import com.ruoyi.project.benyi.service.IByDayFlowDetailService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 一日流程Controller
+ * 
+ * @author tsbz
+ * @date 2020-05-07
+ */
+@RestController
+@RequestMapping("/benyi/dayflowmanger")
+public class ByDayFlowDetailController extends BaseController
+{
+    @Autowired
+    private IByDayFlowDetailService byDayFlowDetailService;
+
+    /**
+     * 查询一日流程列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:dayflowmanger:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ByDayFlowDetail byDayFlowDetail)
+    {
+        startPage();
+        List<ByDayFlowDetail> list = byDayFlowDetailService.selectByDayFlowDetailList(byDayFlowDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出一日流程列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:dayflowmanger:export')")
+    @Log(title = "一日流程", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(ByDayFlowDetail byDayFlowDetail)
+    {
+        List<ByDayFlowDetail> list = byDayFlowDetailService.selectByDayFlowDetailList(byDayFlowDetail);
+        ExcelUtil<ByDayFlowDetail> util = new ExcelUtil<ByDayFlowDetail>(ByDayFlowDetail.class);
+        return util.exportExcel(list, "detail");
+    }
+
+    /**
+     * 获取一日流程详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:dayflowmanger:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(byDayFlowDetailService.selectByDayFlowDetailById(id));
+    }
+
+    /**
+     * 新增一日流程
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:dayflowmanger:add')")
+    @Log(title = "一日流程", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ByDayFlowDetail byDayFlowDetail)
+    {
+        byDayFlowDetail.setCreateUser(SecurityUtils.getLoginUser().getUser().getUserId());
+        return toAjax(byDayFlowDetailService.insertByDayFlowDetail(byDayFlowDetail));
+    }
+
+    /**
+     * 修改一日流程
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:dayflowmanger:edit')")
+    @Log(title = "一日流程", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ByDayFlowDetail byDayFlowDetail)
+    {
+        byDayFlowDetail.setUpdateUser(SecurityUtils.getLoginUser().getUser().getUserId());
+        return toAjax(byDayFlowDetailService.updateByDayFlowDetail(byDayFlowDetail));
+    }
+
+    /**
+     * 删除一日流程
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:dayflowmanger:remove')")
+    @Log(title = "一日流程", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(byDayFlowDetailService.deleteByDayFlowDetailByIds(ids));
+    }
+}

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

@@ -188,6 +188,7 @@ public class BySchoolcalendarController extends BaseController {
     public AjaxResult edit(@RequestBody BySchoolcalendar bySchoolcalendar) {
         //首先判断 当前用户是否为学校
         if (schoolCommon.isSchool()) {
+            //应该判断记录是否在修改的时间范围内
             return toAjax(bySchoolcalendarService.updateBySchoolcalendar(bySchoolcalendar));
         } else {
             return AjaxResult.error("当前用户非幼儿园，无法编辑园历");
@@ -203,6 +204,7 @@ public class BySchoolcalendarController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         //首先判断 当前用户是否为学校
         if (schoolCommon.isSchool()) {
+            //应该判断记录是否在删除的时间范围内
             return toAjax(bySchoolcalendarService.deleteBySchoolcalendarByIds(ids));
         } else {
             return AjaxResult.error("当前用户非幼儿园，无法删除园历");

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

@@ -0,0 +1,151 @@
+package com.ruoyi.project.benyi.domain;
+
+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;
+
+/**
+ * 一日流程对象 by_day_flow_detail
+ * 
+ * @author tsbz
+ * @date 2020-05-07
+ */
+public class ByDayFlowDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 流程ID */
+    private Long id;
+
+    /** 流程序号 */
+    @Excel(name = "流程序号")
+    private Long sortNumber;
+
+    /** 标准数量 */
+    @Excel(name = "标准数量")
+    private Long targetCount;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 导言 */
+    @Excel(name = "导言")
+    private String content;
+
+    /** 目的 */
+    @Excel(name = "目的")
+    private String note;
+
+    /** 类型（1标准,2相关） */
+    @Excel(name = "类型", readConverterExp = "1=标准,2相关")
+    private String flowType;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createUser;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updateUser;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSortNumber(Long sortNumber) 
+    {
+        this.sortNumber = sortNumber;
+    }
+
+    public Long getSortNumber() 
+    {
+        return sortNumber;
+    }
+    public void setTargetCount(Long targetCount) 
+    {
+        this.targetCount = targetCount;
+    }
+
+    public Long getTargetCount() 
+    {
+        return targetCount;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setNote(String note) 
+    {
+        this.note = note;
+    }
+
+    public String getNote() 
+    {
+        return note;
+    }
+    public void setFlowType(String flowType)
+    {
+        this.flowType = flowType;
+    }
+
+    public String getFlowType()
+    {
+        return flowType;
+    }
+    public void setCreateUser(Long createUser) 
+    {
+        this.createUser = createUser;
+    }
+
+    public Long getCreateUser() 
+    {
+        return createUser;
+    }
+    public void setUpdateUser(Long updateUser) 
+    {
+        this.updateUser = updateUser;
+    }
+
+    public Long getUpdateUser() 
+    {
+        return updateUser;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("sortNumber", getSortNumber())
+            .append("targetCount", getTargetCount())
+            .append("name", getName())
+            .append("content", getContent())
+            .append("note", getNote())
+            .append("flowType", getFlowType())
+            .append("createUser", getCreateUser())
+            .append("updateUser", getUpdateUser())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.project.benyi.mapper;
+
+import java.util.List;
+import com.ruoyi.project.benyi.domain.ByDayFlowDetail;
+
+/**
+ * 一日流程Mapper接口
+ * 
+ * @author tsbz
+ * @date 2020-05-07
+ */
+public interface ByDayFlowDetailMapper 
+{
+    /**
+     * 查询一日流程
+     * 
+     * @param id 一日流程ID
+     * @return 一日流程
+     */
+    public ByDayFlowDetail selectByDayFlowDetailById(Long id);
+
+    /**
+     * 查询一日流程列表
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 一日流程集合
+     */
+    public List<ByDayFlowDetail> selectByDayFlowDetailList(ByDayFlowDetail byDayFlowDetail);
+
+    /**
+     * 新增一日流程
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 结果
+     */
+    public int insertByDayFlowDetail(ByDayFlowDetail byDayFlowDetail);
+
+    /**
+     * 修改一日流程
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 结果
+     */
+    public int updateByDayFlowDetail(ByDayFlowDetail byDayFlowDetail);
+
+    /**
+     * 删除一日流程
+     * 
+     * @param id 一日流程ID
+     * @return 结果
+     */
+    public int deleteByDayFlowDetailById(Long id);
+
+    /**
+     * 批量删除一日流程
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteByDayFlowDetailByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.project.benyi.service;
+
+import java.util.List;
+import com.ruoyi.project.benyi.domain.ByDayFlowDetail;
+
+/**
+ * 一日流程Service接口
+ * 
+ * @author tsbz
+ * @date 2020-05-07
+ */
+public interface IByDayFlowDetailService 
+{
+    /**
+     * 查询一日流程
+     * 
+     * @param id 一日流程ID
+     * @return 一日流程
+     */
+    public ByDayFlowDetail selectByDayFlowDetailById(Long id);
+
+    /**
+     * 查询一日流程列表
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 一日流程集合
+     */
+    public List<ByDayFlowDetail> selectByDayFlowDetailList(ByDayFlowDetail byDayFlowDetail);
+
+    /**
+     * 新增一日流程
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 结果
+     */
+    public int insertByDayFlowDetail(ByDayFlowDetail byDayFlowDetail);
+
+    /**
+     * 修改一日流程
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 结果
+     */
+    public int updateByDayFlowDetail(ByDayFlowDetail byDayFlowDetail);
+
+    /**
+     * 批量删除一日流程
+     * 
+     * @param ids 需要删除的一日流程ID
+     * @return 结果
+     */
+    public int deleteByDayFlowDetailByIds(Long[] ids);
+
+    /**
+     * 删除一日流程信息
+     * 
+     * @param id 一日流程ID
+     * @return 结果
+     */
+    public int deleteByDayFlowDetailById(Long id);
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.project.benyi.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.benyi.mapper.ByDayFlowDetailMapper;
+import com.ruoyi.project.benyi.domain.ByDayFlowDetail;
+import com.ruoyi.project.benyi.service.IByDayFlowDetailService;
+
+/**
+ * 一日流程Service业务层处理
+ * 
+ * @author tsbz
+ * @date 2020-05-07
+ */
+@Service
+public class ByDayFlowDetailServiceImpl implements IByDayFlowDetailService 
+{
+    @Autowired
+    private ByDayFlowDetailMapper byDayFlowDetailMapper;
+
+    /**
+     * 查询一日流程
+     * 
+     * @param id 一日流程ID
+     * @return 一日流程
+     */
+    @Override
+    public ByDayFlowDetail selectByDayFlowDetailById(Long id)
+    {
+        return byDayFlowDetailMapper.selectByDayFlowDetailById(id);
+    }
+
+    /**
+     * 查询一日流程列表
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 一日流程
+     */
+    @Override
+    public List<ByDayFlowDetail> selectByDayFlowDetailList(ByDayFlowDetail byDayFlowDetail)
+    {
+        return byDayFlowDetailMapper.selectByDayFlowDetailList(byDayFlowDetail);
+    }
+
+    /**
+     * 新增一日流程
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 结果
+     */
+    @Override
+    public int insertByDayFlowDetail(ByDayFlowDetail byDayFlowDetail)
+    {
+        byDayFlowDetail.setCreateTime(DateUtils.getNowDate());
+        return byDayFlowDetailMapper.insertByDayFlowDetail(byDayFlowDetail);
+    }
+
+    /**
+     * 修改一日流程
+     * 
+     * @param byDayFlowDetail 一日流程
+     * @return 结果
+     */
+    @Override
+    public int updateByDayFlowDetail(ByDayFlowDetail byDayFlowDetail)
+    {
+        byDayFlowDetail.setUpdateTime(DateUtils.getNowDate());
+        return byDayFlowDetailMapper.updateByDayFlowDetail(byDayFlowDetail);
+    }
+
+    /**
+     * 批量删除一日流程
+     * 
+     * @param ids 需要删除的一日流程ID
+     * @return 结果
+     */
+    @Override
+    public int deleteByDayFlowDetailByIds(Long[] ids)
+    {
+        return byDayFlowDetailMapper.deleteByDayFlowDetailByIds(ids);
+    }
+
+    /**
+     * 删除一日流程信息
+     * 
+     * @param id 一日流程ID
+     * @return 结果
+     */
+    @Override
+    public int deleteByDayFlowDetailById(Long id)
+    {
+        return byDayFlowDetailMapper.deleteByDayFlowDetailById(id);
+    }
+}

ruoyi/src/main/java/com/ruoyi/project/system/controller/ByTeacherJbxxController.java

@@ -61,6 +61,17 @@ public class ByTeacherJbxxController extends BaseController
         return getDataTable(list2);
     }
 
+    /**
+     * 查询教师基本信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:teacher:list')")
+    @GetMapping("/listgroupxw")
+    public TableDataInfo listGroupXw(ByTeacherJbxx byTeacherJbxx)
+    {
+        List<ByTeacherJbxx> list = byTeacherJbxxService.selectByTeacherJbGroupXw(byTeacherJbxx);
+        return getDataTable(list);
+    }
+
     /**
      * 导出教师基本信息列表
      */

ruoyi/src/main/java/com/ruoyi/project/system/mapper/ByTeacherJbxxMapper.java

@@ -27,6 +27,14 @@ public interface ByTeacherJbxxMapper
      */
     public List<ByTeacherJbxx> selectByTeacherJbxxList(ByTeacherJbxx byTeacherJbxx);
 
+    /**
+     * 查询教师基本信息列表
+     *
+     *
+     * @return 教师基本信息集合
+     */
+    public List<ByTeacherJbxx> selectByTeacherJbGroupXw(ByTeacherJbxx byTeacherJbxx);
+
     /**
      * 新增教师基本信息
      * 

ruoyi/src/main/java/com/ruoyi/project/system/service/IByTeacherJbxxService.java

@@ -27,6 +27,14 @@ public interface IByTeacherJbxxService
      */
     public List<ByTeacherJbxx> selectByTeacherJbxxList(ByTeacherJbxx byTeacherJbxx);
 
+    /**
+     * 查询教师基本信息列表
+     *
+     *
+     * @return 教师基本信息集合
+     */
+    public List<ByTeacherJbxx> selectByTeacherJbGroupXw(ByTeacherJbxx byTeacherJbxx);
+
     /**
      * 新增教师基本信息
      * 

ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByTeacherJbxxServiceImpl.java

@@ -16,8 +16,7 @@ import com.ruoyi.project.system.service.IByTeacherJbxxService;
  * @date 2020-04-21
  */
 @Service
-public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService 
+public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService {
-{
     @Autowired
     private ByTeacherJbxxMapper byTeacherJbxxMapper;
 
@@ -28,8 +27,7 @@ public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService
      * @return 教师基本信息
      */
     @Override
-    public ByTeacherJbxx selectByTeacherJbxxById(Long id)
+    public ByTeacherJbxx selectByTeacherJbxxById(Long id) {
-    {
         return byTeacherJbxxMapper.selectByTeacherJbxxById(id);
     }
 
@@ -41,11 +39,21 @@ public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService
      */
     @Override
     @DataScope(deptAlias = "u")
-    public List<ByTeacherJbxx> selectByTeacherJbxxList(ByTeacherJbxx byTeacherJbxx)
+    public List<ByTeacherJbxx> selectByTeacherJbxxList(ByTeacherJbxx byTeacherJbxx) {
-    {
         return byTeacherJbxxMapper.selectByTeacherJbxxList(byTeacherJbxx);
     }
 
+    /**
+     * 查询教师基本信息列表
+     *
+     * @return 教师基本信息集合
+     */
+    @Override
+    @DataScope(deptAlias = "u")
+    public List<ByTeacherJbxx> selectByTeacherJbGroupXw(ByTeacherJbxx byTeacherJbxx) {
+        return byTeacherJbxxMapper.selectByTeacherJbGroupXw(byTeacherJbxx);
+    }
+
     /**
      * 新增教师基本信息
      *
@@ -53,8 +61,7 @@ public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService
      * @return 结果
      */
     @Override
-    public int insertByTeacherJbxx(ByTeacherJbxx byTeacherJbxx)
+    public int insertByTeacherJbxx(ByTeacherJbxx byTeacherJbxx) {
-    {
         return byTeacherJbxxMapper.insertByTeacherJbxx(byTeacherJbxx);
     }
 
@@ -65,8 +72,7 @@ public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService
      * @return 结果
      */
     @Override
-    public int updateByTeacherJbxx(ByTeacherJbxx byTeacherJbxx)
+    public int updateByTeacherJbxx(ByTeacherJbxx byTeacherJbxx) {
-    {
         return byTeacherJbxxMapper.updateByTeacherJbxx(byTeacherJbxx);
     }
 
@@ -77,8 +83,7 @@ public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService
      * @return 结果
      */
     @Override
-    public int deleteByTeacherJbxxByIds(Long[] ids)
+    public int deleteByTeacherJbxxByIds(Long[] ids) {
-    {
         return byTeacherJbxxMapper.deleteByTeacherJbxxByIds(ids);
     }
 
@@ -89,8 +94,7 @@ public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService
      * @return 结果
      */
     @Override
-    public int deleteByTeacherJbxxById(Long id)
+    public int deleteByTeacherJbxxById(Long id) {
-    {
         return byTeacherJbxxMapper.deleteByTeacherJbxxById(id);
     }
 }

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

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.benyi.mapper.ByDayFlowDetailMapper">
+    
+    <resultMap type="ByDayFlowDetail" id="ByDayFlowDetailResult">
+        <result property="id"    column="id"    />
+        <result property="sortNumber"    column="sort_number"    />
+        <result property="targetCount"    column="target_count"    />
+        <result property="name"    column="name"    />
+        <result property="content"    column="content"    />
+        <result property="note"    column="note"    />
+        <result property="flowType"    column="flow_type"    />
+        <result property="createUser"    column="create_user"    />
+        <result property="updateUser"    column="update_user"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectByDayFlowDetailVo">
+        select id, sort_number, target_count, name, content, note, flow_type, create_user, update_user, create_time, update_time from by_day_flow_detail
+    </sql>
+
+    <select id="selectByDayFlowDetailList" parameterType="ByDayFlowDetail" resultMap="ByDayFlowDetailResult">
+        <include refid="selectByDayFlowDetailVo"/>
+        <where>  
+            <if test="sortNumber != null "> and sort_number = #{sortNumber}</if>
+            <if test="targetCount != null "> and target_count = #{targetCount}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="note != null  and note != ''"> and note = #{note}</if>
+            <if test="flowType != null "> and flow_type = #{flowType}</if>
+            <if test="createUser != null "> and create_user = #{createUser}</if>
+            <if test="updateUser != null "> and update_user = #{updateUser}</if>
+        </where>
+    </select>
+    
+    <select id="selectByDayFlowDetailById" parameterType="Long" resultMap="ByDayFlowDetailResult">
+        <include refid="selectByDayFlowDetailVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertByDayFlowDetail" parameterType="ByDayFlowDetail" useGeneratedKeys="true" keyProperty="id">
+        insert into by_day_flow_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sortNumber != null ">sort_number,</if>
+            <if test="targetCount != null ">target_count,</if>
+            <if test="name != null  and name != ''">name,</if>
+            <if test="content != null  and content != ''">content,</if>
+            <if test="note != null  and note != ''">note,</if>
+            <if test="flowType != null ">flow_type,</if>
+            <if test="createUser != null ">create_user,</if>
+            <if test="updateUser != null ">update_user,</if>
+            <if test="createTime != null ">create_time,</if>
+            <if test="updateTime != null ">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sortNumber != null ">#{sortNumber},</if>
+            <if test="targetCount != null ">#{targetCount},</if>
+            <if test="name != null  and name != ''">#{name},</if>
+            <if test="content != null  and content != ''">#{content},</if>
+            <if test="note != null  and note != ''">#{note},</if>
+            <if test="flowType != null ">#{flowType},</if>
+            <if test="createUser != null ">#{createUser},</if>
+            <if test="updateUser != null ">#{updateUser},</if>
+            <if test="createTime != null ">#{createTime},</if>
+            <if test="updateTime != null ">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateByDayFlowDetail" parameterType="ByDayFlowDetail">
+        update by_day_flow_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sortNumber != null ">sort_number = #{sortNumber},</if>
+            <if test="targetCount != null ">target_count = #{targetCount},</if>
+            <if test="name != null  and name != ''">name = #{name},</if>
+            <if test="content != null  and content != ''">content = #{content},</if>
+            <if test="note != null  and note != ''">note = #{note},</if>
+            <if test="flowType != null ">flow_type = #{flowType},</if>
+            <if test="createUser != null ">create_user = #{createUser},</if>
+            <if test="updateUser != null ">update_user = #{updateUser},</if>
+            <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="updateTime != null ">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteByDayFlowDetailById" parameterType="Long">
+        delete from by_day_flow_detail where id = #{id}
+    </delete>
+
+    <delete id="deleteByDayFlowDetailByIds" parameterType="String">
+        delete from by_day_flow_detail where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml

@@ -70,6 +70,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${dataScope}
     </select>
 
+    <select id="selectByTeacherJbGroupXw" parameterType="ByTeacherJbxx" resultMap="ByTeacherJbxxResult">
+        select (CASE WHEN (select dict_label from sys_dict_data where dict_type='sys_jsxl' and dict_value=t.xl ) is null THEN '未设置' ELSE (select dict_label from sys_dict_data where dict_type='sys_jsxl' and dict_value=t.xl ) END )xl,count(*) byyx
+        from by_teacher_jbxx t
+        left join sys_user u on t.userid = u.user_id
+        where u.del_flag='0'
+
+        <!-- 数据范围过滤 -->
+        ${dataScope}
+
+        group by t.xl
+    </select>
+    
     <select id="selectByTeacherJbxxById" parameterType="Long" resultMap="ByTeacherJbxxResult">
         <include refid="selectByTeacherJbxxVo"/>
         where id = #{id}