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

cc2fb513 · jsy672 · 4bacc8a1 · de57b1f9 · cc2fb513 · cc2fb513
Commit cc2fb513 authored Apr 08, 2024 by jsy672
12 changed files
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
 # 页面标题
-VUE_APP_TITLE = 网络数字信息化校园管理系统
+VUE_APP_TITLE = 智慧校园管理系统
 # 开发环境配置
 ENV = 'development'

--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
 # 页面标题
-VUE_APP_TITLE = 网络数字信息化校园管理系统
+VUE_APP_TITLE = 智慧校园管理系统
 # 生产环境配置
 ENV = 'production'

--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
 # 页面标题
-VUE_APP_TITLE = 网络数字信息化校园管理系统
+VUE_APP_TITLE = 智慧校园管理系统
 NODE_ENV = production

--- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@@ -42,7 +42,7 @@ export default {
  data() {
    return {
      // title: process.env.VUE_APP_TITLE,
-      title:'信息化校园管理系统',
+      title:'智慧校园管理系统',
      logo: logoImg
    }
  }

--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -188,7 +188,7 @@
 <!--                {{ user.userName }}, 欢迎登录智慧校园管理系统!-->
 <!--              </div>-->
                            <div style="font-family: PingFang SC; color: #ffffff; font-size: 16px; margin-top: 20px; margin-left: 20px">
-                              {{ user.userName }}, 欢迎登录网络数字信息化校园管理系统!
+                              {{ user.userName }}, 欢迎登录智慧校园管理系统!
                            </div>
              <div style="font-size: small; margin-top: 8px; color: #96c4f5; margin-left: 20px">
                上次登录时间：{{ user.loginDate }}

--- a/ruoyi-ui/src/views/login copy.vue
+++ b/ruoyi-ui/src/views/login copy.vue
@@ -30,7 +30,7 @@
      <div class="login-card-right">
        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
 <!--          <h3 class="title">智慧校园管理系统</h3>-->
-          <h3 class="title">网络数字信息化校园管理系统</h3>
+          <h3 class="title">智慧校园管理系统</h3>
          <el-form-item prop="phonenumber">
            <el-input

--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -26,7 +26,7 @@
      <div class="login-card-right">
        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
 <!--          <h3 class="title">智慧校园管理系统</h3>-->
-          <h3 class="title">网络数字信息化校园管理系统</h3>
+          <h3 class="title">智慧校园管理系统</h3>
          <el-form-item prop="phonenumber">
            <el-input v-model="loginForm.phonenumber" type="text" auto-complete="off" placeholder="手机号码">
              <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

--- a/ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/InfoReview.vue
+++ b/ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/InfoReview.vue
--- a/ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/examRoomAllocate.vue
+++ b/ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/examRoomAllocate.vue
@@ -58,7 +58,7 @@
      <el-table-column label="姓名" align="center" min-width="88" prop="studentName"/>
      <el-table-column label="学籍号" align="center" min-width="180" prop="studentNumber"/>
      <el-table-column label="初中学校" key="juniorSchool" min-width="130" align="center" prop="schoolName"/>
-      <el-table-column label="测试项目" align="type" prop="project" min-width="100">
+      <el-table-column label="测试项目"  prop="project" min-width="100">
      </el-table-column>
      <el-table-column label="性别" align="center" prop="sex" min-width="80">
        <template slot-scope="scope">

--- a/ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/scoreManage.vue
+++ b/ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/scoreManage.vue
@@ -63,7 +63,7 @@
      <el-table-column label="姓名" align="center" prop="studentName" min-width="80" max-width="120"/>
      <el-table-column label="学籍号" align="center" prop="studentNumber" width="100"/>
      <el-table-column key="juniorSchool" width="130" align="center" prop="schoolName" label="初中学校"/>
-      <el-table-column label="测试项目" align="type" prop="project" width="80">
+      <el-table-column label="测试项目"  prop="project" width="80">
        <!-- <template slot-scope="scope">
          <dict-tag :options="dict.type.professional_category" :value="scope.row.sex" />
        </template> -->

--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -48,7 +48,7 @@ module.exports = {
        //学校内网
        // target: `http://10.20.100.201:57321`,
        // target: `http://47.105.176.202:5115`,
-        target: `http://192.168.1.110:8848`,
+        target: `http://172.16.100.96:5131`,
        // target: `http://172.18.6.157:8848`,
        changeOrigin: true,
        pathRewrite: {

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/recruit/SchoolRecruitStudentServiceImpl.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/recruit/SchoolRecruitStudentServiceImpl.java
@@ -211,6 +211,12 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
        List<SchoolRecruitStudentFamily> familyList = recruitStudentFamilyMapper.selectList(lqw2);
        s.setRemeberData(familyList);
+        LambdaQueryWrapper<SchoolRecruitStudentFjb> lqw3 = new LambdaQueryWrapper<>();
+        lqw3.eq(SchoolRecruitStudentFjb::getStudentId, s.getId());
+        lqw3.eq(SchoolRecruitStudentFjb::getDelFlag, "0");
+        List<SchoolRecruitStudentFjb> fList = recruitStudentFjbMapper.selectList(lqw3);
+        s.setFileList(fList);
        return s;
    }
@@ -379,7 +385,16 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
            recruitStudentFamilyMapper.insert(j);
        }
        //附件
+        LambdaQueryWrapper<SchoolRecruitStudentFjb> lqw3 = new LambdaQueryWrapper<>();
+        lqw3.eq(SchoolRecruitStudentFjb::getStudentId, s.getId());
+        recruitStudentFjbMapper.delete(lqw3);
        List<SchoolRecruitStudentFjb> fileList = student.getFileList();
+        for(SchoolRecruitStudentFjb j:fileList){
+            j.setId(null);
+            j.setStudentId(student.getId());
+            recruitStudentFjbMapper.insert(j);
+        }
@@ -431,6 +446,22 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
        s.setTelephone2(student.getTelephone2());
        s.setPhoto(student.getPhoto());
        s.setUpdateTime(DateUtils.getNowDate());
+        s.setMz(student.getMz());
+        s.setZzmm(student.getZzmm());
+        s.setCsrq(student.getCsrq());
+        s.setHyzk(student.getHyzk());
+        s.setHjszd(student.getHjszd());
+        s.setSyd(student.getSyd());
+        s.setKssf(student.getKssf());
+        s.setCjgzsj(student.getCjgzsj());
+        s.setXgzdwzw(student.getXgzdwzw());
+        s.setBkxlsfqrz(student.getBkxlsfqrz());
+        s.setXl(student.getXl());
+        s.setXw(student.getXw());
+        s.setByxx(student.getByxx());
+        s.setSxzz(student.getSxzz());
+        s.setZhbysj(student.getZhbysj());
        recruitStudentMapper.updateById(s);
@@ -457,7 +488,16 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
            recruitStudentFamilyMapper.insert(j);
        }
        //附件
+        LambdaQueryWrapper<SchoolRecruitStudentFjb> lqw3 = new LambdaQueryWrapper<>();
+        lqw3.eq(SchoolRecruitStudentFjb::getStudentId, s.getId());
+        recruitStudentFjbMapper.delete(lqw3);
        List<SchoolRecruitStudentFjb> fileList = student.getFileList();
+        for(SchoolRecruitStudentFjb j:fileList){
+            j.setId(null);
+            j.setStudentId(student.getId());
+            recruitStudentFjbMapper.insert(j);
+        }