Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

c435fba3 · Cat · 85807a4a · 801bdf89 · c435fba3 · c435fba3
Commit c435fba3 authored Oct 25, 2023 by Cat
16 changed files
--- a/ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
@@ -144,12 +144,18 @@ export default {
      };
      this.fetchStudioUseData(); // 重新发一次请求
    },
+    // changeStudio(value) {
+    //   console.log('value', value);
+    //   console.log('this.queryParams.startTime', this.queryParams.startTime);
+    //   this.queryParams.studioId = value;
+    //   this.fetchStudioUseData();
+    // },
    changeStudio(value) {
-      console.log('value', value);
+      this.selectedTimeSlots = []; // 在切换录播室时清空已选时间段
-      console.log('this.queryParams.startTime', this.queryParams.startTime);
      this.queryParams.studioId = value;
      this.fetchStudioUseData();
    },
    changeDate() {
      this.endTime = moment(this.queryParams.startTime).add(9, 'days')
      // this.fetchData();
@@ -224,7 +230,7 @@ export default {
        if (selectObj != undefined) {
          this.remark = true
          this.selectedTimeSlots = this.selectedTimeSlots.filter(item => item.index != index)
-          this.selectedTimeSlots.length == 0 ? this.remark = false : this.selectedTimeSlots
+          this.selectedTimeSlots.length === 0 ? this.remark = false : this.selectedTimeSlots
        } else {
          this.selectedTimeSlots.push({ day, index })
        }

--- a/ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/components/receiveList.vue
+++ b/ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/components/receiveList.vue
@@ -31,10 +31,10 @@
      <!--  >新增-->
      <!--  </el-button>-->
      <!--</el-col>-->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
        <el-button type="danger" plain size="mini" icon="el-icon-delete" :disabled="!isMultiple" @click="handleDelete">删除
        </el-button>
-      </el-col>
+      </el-col> -->
      <el-col :span="1.5">
        <el-button type="info" plain size="mini" icon="el-icon-close" @click="handleClose">关闭
        </el-button>

--- a/ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/school/index copy.vue
+++ b/ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/school/index copy.vue
--- a/ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/school/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/school/index.vue
@@ -363,7 +363,7 @@ export default {
    /** 提交按钮 */
    submitForm() {
      const groupId = this.form.groupId
-      this.form.group = groupId == '' ? '' : this.roleList.find(item => item.id == groupId).name
+      this.form.groupName = groupId == '' ? '' : this.roleList.find(item => item.id == groupId).name
      console.log(this.form.borrowBy);
      this.throttle(() => {
        this.$refs["form"].validate(valid => {

--- a/ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/personnelGrouping/authUser.vue
+++ b/ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/personnelGrouping/authUser.vue
@@ -78,8 +78,6 @@
        </el-table>
        <pagination v-show="totalcy > 0" :total="total" :page.sync="queryParam.pageNum" :limit.sync="queryParam.pageSize"
          @pagination="getListcy" />
      </el-row>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="handleSelectUser">确 定</el-button>
@@ -167,7 +165,7 @@ export default {
      this.notificationId = this.$route.query.id;
      console.log('this..notificationId', this.notificationId);
      getUser(this.notificationId).then(response => {
-        this.userList = response.rows;
+        this.userList = response.data;
        console.log('this.userList', this.userList);
        this.loading = false;
      });

--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairClassManage/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairClassManage/index.vue
@@ -473,7 +473,7 @@ export default {
        classValue: [{required: true, message: '班级不能为空', trigger: 'change'}],
        teacherName: [{required: true, message: '班主任姓名不能为空', trigger: 'change'}],
        teacherTel: [{required: true, message: '班主任手机号不能为空', trigger: 'change'}],
-        houseName: [{required: true, message: '所在教学楼不能为空', trigger: 'change'}],
+        // houseName: [{required: true, message: '所在教学楼不能为空', trigger: 'change'}],
        classNum1: [{required: true, message: '高一班级数量不能为空', trigger: 'blur'}],
        classNum2: [{required: true, message: '高二班级数量不能为空', trigger: 'blur'}],
        classNum3: [{required: true, message: '高三班级数量不能为空', trigger: 'blur'}],

--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/statistics/age/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/statistics/age/index.vue
@@ -3,7 +3,7 @@
    <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="70px">
      <el-form-item label="学年" prop="classYear">
        <el-date-picker v-model="queryForm.classYear" type="year" @change="getList" format="yyyy" value-format="yyyy"
-          placeholder="选择年度"></el-date-picker>
+          placeholder="选择年度" :clearable="false"></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
@@ -155,7 +155,7 @@ export default {
    newYear() {
      getNewYear().then((res) => {
        //数值类型转换成字符串
-        this.queryForm.classYear = res.schoolYear + '' ;
+        this.queryForm.classYear = res.schoolYear + '';
        console.log('this.queryForm.classYear', typeof this.queryForm.classYear);
        this.getList();
      });
@@ -172,7 +172,7 @@ export default {
          this.total = response.total;
        })
        .catch(error => {
        });
    },

--- a/ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/components/Resume.vue
+++ b/ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/components/Resume.vue
@@ -47,10 +47,8 @@
      <el-table-column type="selection" align="center" width="55" />
      <el-table-column label="序号" type="index" align="center" width="55" />
      <el-table-column label="学校/工作单位" width="width" align="center" prop="learnSchool" />
-      <el-table-column label="履历开始时间" :formatter="dateFormat" width="width" align="center"
+      <el-table-column label="履历开始时间" width="width" align="center" prop="learnStart"></el-table-column>
-        prop="learnStart"></el-table-column>
+      <el-table-column label="履历结束时间" width="width" align="center" prop="learnEnd"></el-table-column>
-      <el-table-column label="履历结束时间" :formatter="dateFormat" width="width" align="center"
-        prop="learnEnd"></el-table-column>
      <el-table-column label="备注" width="width" align="center" prop="remark" />
    </el-table>
    <ExPagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -64,12 +62,12 @@
          <el-input v-model="resumeForm.learnSchool" clearable style="width: 100%" />
        </el-form-item>
        <el-form-item label="履历开始时间" prop="learnStart">
-          <el-date-picker v-model="resumeForm.learnStart" type="date" style="width: 100%"
+          <el-date-picker v-model="resumeForm.learnStart" type="date" style="width: 100%" placeholder="履历开始时间"
-            placeholder="履历开始时间"></el-date-picker>
+            value-format="yyyy-MM-dd"></el-date-picker>
        </el-form-item>
        <el-form-item label="履历结束时间" clearable prop="learnEnd">
-          <el-date-picker v-model="resumeForm.learnEnd" type="date" style="width: 100%"
+          <el-date-picker v-model="resumeForm.learnEnd" type="date" style="width: 100%" placeholder="履历结束时间"
-            placeholder="履历结束时间"></el-date-picker>
+            value-format="yyyy-MM-dd"></el-date-picker>
        </el-form-item>
        <el-form-item label="备注" clearable prop="remark">
          <el-input type="textarea" :rows="3" style="width: 100%" v-model="resumeForm.remark" clearable />

--- a/ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesController.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesController.java
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
+import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
 import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
 import javax.servlet.http.HttpServletResponse;
@@ -90,10 +91,10 @@ public class TeacherFilesController extends BaseController
     */
    @PreAuthorize("@ss.hasPermi('teacherFiles:files:remove')")
    @Log(title = "教师档案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable Long id)
    {
-        return toAjax(teacherFilesService.deleteTeacherFilesByIds(ids));
+        return toAjax(teacherFilesService.deleteTeacherFilesById(id));
    }
@@ -108,4 +109,38 @@ public class TeacherFilesController extends BaseController
        return toAjax(teacherFilesService.synchronous(id));
    }
+    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
+    @Log(title = "教师档案审核通过", businessType = BusinessType.UPDATE)
+    @PutMapping("/passThrough/{id}")
+    public AjaxResult passThrough(@PathVariable("id")  Long id)
+    {
+        TeacherFiles teacherFiles = new TeacherFiles();
+        teacherFiles.setId(id);
+        teacherFiles.setState("5");
+        return toAjax(teacherFilesService.updateTeacherFiles(teacherFiles));
+    }
+    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
+    @Log(title = "教师档案审核驳回", businessType = BusinessType.UPDATE)
+    @PutMapping("/reject/{id}")
+    public AjaxResult reject(@PathVariable("id")  Long id)
+    {
+        TeacherFiles teacherFiles = new TeacherFiles();
+        teacherFiles.setId(id);
+        teacherFiles.setState("9");
+        return toAjax(teacherFilesService.updateTeacherFiles(teacherFiles));
+    }
+    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
+    @Log(title = "教师档案提交", businessType = BusinessType.UPDATE)
+    @PutMapping("/submitTo/{id}")
+    public AjaxResult submitTo(@PathVariable("id")  Long id)
+    {
+        TeacherFiles teacherFiles = new TeacherFiles();
+        teacherFiles.setId(id);
+        teacherFiles.setState("4");
+        return toAjax(teacherFilesService.updateTeacherFiles(teacherFiles));
+    }
 }
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesNoticeController.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesNoticeController.java
@@ -94,14 +94,31 @@ public class TeacherFilesNoticeController extends BaseController
        return toAjax(teacherFilesNoticeService.release(id));
    }
+    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
+    @Log(title = "教师档案通知撤回", businessType = BusinessType.UPDATE)
+    @PutMapping("/withdraw/{id}")
+    public AjaxResult withdraw(@PathVariable("id") String id)
+    {
+        return toAjax(teacherFilesNoticeService.withdraw(id));
+    }
+    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
+    @Log(title = "教师档案通知完成", businessType = BusinessType.UPDATE)
+    @PutMapping("/complete/{id}")
+    public AjaxResult complete(@PathVariable("id") String id)
+    {
+        return toAjax(teacherFilesNoticeService.complete(id));
+    }
    /**
     * 删除教师档案通知
     */
    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:remove')")
    @Log(title = "教师档案通知", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable String[] ids)
+    public AjaxResult remove(@PathVariable("id")  String id)
    {
-        return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeByIds(ids));
+        return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeById(id));
    }
 }
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesAward.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesAward.java
@@ -39,7 +39,7 @@ public class TeacherFilesAward extends BaseEntity
    private Date awardTime;
    /** 获奖等级（1一等奖，2二等奖，3三等奖） */
-    @Excel(name = "获奖等级", readConverterExp = "1=一等奖，2二等奖，3三等奖")
+    @Excel(name = "获奖等级", readConverterExp = "1=一等奖，2=二等奖，3=三等奖")
    private String gradeOfAward;
    /** 发证机关 */

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/TeacherFilesMapper.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/TeacherFilesMapper.java
@@ -4,6 +4,7 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
 import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
 import java.util.List;
+import java.util.Map;
 /**
 * 教师档案Mapper接口
@@ -47,6 +48,13 @@ public interface TeacherFilesMapper
    public int updateTeacherFilesState(String noticeId);
+    public int updateTeacherFilesState1(String noticeId);
+    public int updateTeacherFilesState7(String noticeId);
+    public int updateTeacherFilesName(Map map);
    /**
     * 删除教师档案
     * 
@@ -62,4 +70,7 @@ public interface TeacherFilesMapper
     * @return 结果
     */
    public int deleteTeacherFilesByIds(Long[] ids);
+    public int deleteTeacherFilesByNoticeId(String noticeId);
 }
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesNoticeServiceImpl.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesNoticeServiceImpl.java
@@ -176,7 +176,6 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
        teacherFiles.setIdCard(schoolTeacher.getIdCard());
        teacherFiles.setSex(schoolTeacher.getSex());
        teacherFiles.setEducation(schoolTeacher.getEducation());
-        System.out.println(schoolTeacher.getTeacherName()+"---------"+schoolTeacher.getBirthday());
        Date birthday = schoolTeacher.getBirthday();
        if(birthday!=null){
            SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy");
@@ -200,7 +199,13 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
    public int updateTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice)
    {
        teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
-        return teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
+        teacherFilesNotice.setNoticeName(teacherFilesNotice.getNoticeYear()+"学年"+teacherFilesNotice.getNoticeSemester()+"教师档案填写");
+        int i = teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
+        Map map = new HashMap();
+        map.put("noticeId",teacherFilesNotice.getId());
+        map.put("filesSemester",teacherFilesNotice.getNoticeYear()+"学年"+teacherFilesNotice.getNoticeSemester());
+        teacherFilesMapper.updateTeacherFilesName(map);
+        return i;
    }
    @Override
@@ -208,11 +213,34 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
        TeacherFilesNotice teacherFilesNotice =new TeacherFilesNotice();
        teacherFilesNotice.setId(id);
        teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
+        teacherFilesNotice.setNoticeState("2");
        int i = teacherFilesMapper.updateTeacherFilesState(id);
        teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
        return i;
    }
+    @Override
+    public int withdraw(String id) {
+        TeacherFilesNotice teacherFilesNotice =new TeacherFilesNotice();
+        teacherFilesNotice.setId(id);
+        teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
+        teacherFilesNotice.setNoticeState("1");
+        int i = teacherFilesMapper.updateTeacherFilesState1(id);
+        teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
+        return i;
+    }
+    @Override
+    public int complete(String id) {
+        TeacherFilesNotice teacherFilesNotice =new TeacherFilesNotice();
+        teacherFilesNotice.setId(id);
+        teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
+        teacherFilesNotice.setNoticeState("7");
+        int i = teacherFilesMapper.updateTeacherFilesState7(id);
+        teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
+        return i;
+    }
    /**
     * 批量删除教师档案通知
     * 
@@ -234,6 +262,8 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
    @Override
    public int deleteTeacherFilesNoticeById(String id)
    {
-        return teacherFilesNoticeMapper.deleteTeacherFilesNoticeById(id);
+        int i = teacherFilesNoticeMapper.deleteTeacherFilesNoticeById(id);
+        teacherFilesMapper.deleteTeacherFilesByNoticeId(id);
+        return i;
    }
 }
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/service/teacherFiles/ITeacherFilesNoticeService.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/service/teacherFiles/ITeacherFilesNoticeService.java
@@ -47,6 +47,10 @@ public interface ITeacherFilesNoticeService
    public int release(String id);
+    public int withdraw(String id);
+    public int complete(String id);
    /**
     * 批量删除教师档案通知
     * 

--- a/smart-campus/src/main/resources/mapper/teacherFiles/TeacherFilesMapper.xml
+++ b/smart-campus/src/main/resources/mapper/teacherFiles/TeacherFilesMapper.xml
@@ -143,14 +143,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        where id = #{id}
    </update>
+    <update id="updateTeacherFilesName" parameterType="Map">
+        update teacher_files set files_semester = #{filesSemester} where notice_id = #{noticeId}
+    </update>
    <update id="updateTeacherFilesState" parameterType="String">
        update teacher_files set state = 2 where notice_id = #{noticeId}
    </update>
+    <update id="updateTeacherFilesState1" parameterType="String">
+        update teacher_files set state = 1 where notice_id = #{noticeId}
+    </update>
+    <update id="updateTeacherFilesState7" parameterType="String">
+        update teacher_files set state = 7 where notice_id = #{noticeId}
+    </update>
    <delete id="deleteTeacherFilesById" parameterType="Long">
        delete from teacher_files where id = #{id}
    </delete>
+    <delete id="deleteTeacherFilesByNoticeId" parameterType="String">
+        delete from teacher_files where notice_id = #{noticeId}
+    </delete>
    <delete id="deleteTeacherFilesByIds" parameterType="String">
        delete from teacher_files where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">