From a149333947d4e5f5c0407e4dd4e3ab514c653998 Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Fri, 21 Aug 2020 11:10:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E5=9C=B0=E6=A0=A1=E5=88=9D=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxjs/TsbzJxjsjbxxController.java          | 53 ++++++++++++-------
 ruoyi-ui/src/api/jxjs/jxjsjbxx.js             | 10 +++-
 ruoyi-ui/src/views/jxjs/jdx/data.vue          |  3 ++
 ruoyi-ui/src/views/jxjs/jdx/index.vue         | 47 +++++++++++-----
 ruoyi-ui/src/views/jxjs/jdxcx/index.vue       |  0
 5 files changed, 82 insertions(+), 31 deletions(-)
 create mode 100644 ruoyi-ui/src/views/jxjs/jdxcx/index.vue

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java
index 153acb8d2..a7742db10 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.jxjs;
 
 import java.util.List;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,14 +23,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 见习教师基本信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2020-08-20
  */
 @RestController
 @RequestMapping("/jxjs/jxjsjbxx")
-public class TsbzJxjsjbxxController extends BaseController
-{
+public class TsbzJxjsjbxxController extends BaseController {
     @Autowired
     private ITsbzJxjsjbxxService tsbzJxjsjbxxService;
 
@@ -38,8 +38,7 @@ public class TsbzJxjsjbxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('jxjs:jdx:list')")
     @GetMapping("/listnotjdx")
-    public TableDataInfo listnotjdx(TsbzJxjsjbxx tsbzJxjsjbxx)
-    {
+    public TableDataInfo listnotjdx(TsbzJxjsjbxx tsbzJxjsjbxx) {
         startPage();
         List<TsbzJxjsjbxx> list = tsbzJxjsjbxxService.selectTsbzJxjsjbxxListnotjdx(tsbzJxjsjbxx);
         return getDataTable(list);
@@ -50,8 +49,7 @@ public class TsbzJxjsjbxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('jxjs:jxjsjbxx:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TsbzJxjsjbxx tsbzJxjsjbxx)
-    {
+    public TableDataInfo list(TsbzJxjsjbxx tsbzJxjsjbxx) {
         startPage();
         List<TsbzJxjsjbxx> list = tsbzJxjsjbxxService.selectTsbzJxjsjbxxList(tsbzJxjsjbxx);
         return getDataTable(list);
@@ -63,8 +61,7 @@ public class TsbzJxjsjbxxController extends BaseController
     @PreAuthorize("@ss.hasPermi('jxjs:jxjsjbxx:export')")
     @Log(title = "见习教师基本信息", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TsbzJxjsjbxx tsbzJxjsjbxx)
-    {
+    public AjaxResult export(TsbzJxjsjbxx tsbzJxjsjbxx) {
         List<TsbzJxjsjbxx> list = tsbzJxjsjbxxService.selectTsbzJxjsjbxxList(tsbzJxjsjbxx);
         ExcelUtil<TsbzJxjsjbxx> util = new ExcelUtil<TsbzJxjsjbxx>(TsbzJxjsjbxx.class);
         return util.exportExcel(list, "jxjsjbxx");
@@ -75,8 +72,7 @@ public class TsbzJxjsjbxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('jxjs:jxjsjbxx:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tsbzJxjsjbxxService.selectTsbzJxjsjbxxById(id));
     }
 
@@ -86,8 +82,7 @@ public class TsbzJxjsjbxxController extends BaseController
     @PreAuthorize("@ss.hasPermi('jxjs:jxjsjbxx:add')")
     @Log(title = "见习教师基本信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TsbzJxjsjbxx tsbzJxjsjbxx)
-    {
+    public AjaxResult add(@RequestBody TsbzJxjsjbxx tsbzJxjsjbxx) {
         return toAjax(tsbzJxjsjbxxService.insertTsbzJxjsjbxx(tsbzJxjsjbxx));
     }
 
@@ -97,19 +92,41 @@ public class TsbzJxjsjbxxController extends BaseController
     @PreAuthorize("@ss.hasPermi('jxjs:jxjsjbxx:edit')")
     @Log(title = "见习教师基本信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TsbzJxjsjbxx tsbzJxjsjbxx)
-    {
+    public AjaxResult edit(@RequestBody TsbzJxjsjbxx tsbzJxjsjbxx) {
         return toAjax(tsbzJxjsjbxxService.updateTsbzJxjsjbxx(tsbzJxjsjbxx));
     }
 
+    /**
+     * 修改见习教师基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('jxjs:jdx:edit')")
+    @Log(title = "见习教师基本信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/updatejsjdx/{ids}/{jdxid}")
+    public AjaxResult updateJsJdx(@PathVariable Long[] ids, @PathVariable String jdxid) {
+        int iCount = 0;
+        System.out.println("jsid=" + ids[0]);
+        System.out.println("jdxid=" + jdxid);
+        if (ids == null || ids.length == 0) {
+            return AjaxResult.error("请选择要分配的见习教师");
+        }
+        TsbzJxjsjbxx tsbzJxjsjbxx = null;
+        for (int i = 0; i < ids.length; i++) {
+
+            tsbzJxjsjbxx = new TsbzJxjsjbxx();
+            tsbzJxjsjbxx.setId(ids[i]);
+            tsbzJxjsjbxx.setJdxid(jdxid);
+            iCount = iCount + (tsbzJxjsjbxxService.updateTsbzJxjsjbxx(tsbzJxjsjbxx));
+        }
+        return toAjax(iCount);
+    }
+
     /**
      * 删除见习教师基本信息
      */
     @PreAuthorize("@ss.hasPermi('jxjs:jxjsjbxx:remove')")
     @Log(title = "见习教师基本信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tsbzJxjsjbxxService.deleteTsbzJxjsjbxxByIds(ids));
     }
 }
diff --git a/ruoyi-ui/src/api/jxjs/jxjsjbxx.js b/ruoyi-ui/src/api/jxjs/jxjsjbxx.js
index 44fa2dd45..9cf721d16 100644
--- a/ruoyi-ui/src/api/jxjs/jxjsjbxx.js
+++ b/ruoyi-ui/src/api/jxjs/jxjsjbxx.js
@@ -35,6 +35,14 @@ export function addJxjsjbxx(data) {
   })
 }
 
+// 新增基地校
+export function updateJxjsJdx(id, jdxid) {
+  return request({
+    url: '/jxjs/jxjsjbxx/updatejsjdx/' + id + "/" + jdxid,
+    method: 'post'
+  })
+}
+
 // 修改见习教师基本信息
 export function updateJxjsjbxx(data) {
   return request({
@@ -59,4 +67,4 @@ export function exportJxjsjbxx(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}
diff --git a/ruoyi-ui/src/views/jxjs/jdx/data.vue b/ruoyi-ui/src/views/jxjs/jdx/data.vue
index 298031144..75a4c77ca 100644
--- a/ruoyi-ui/src/views/jxjs/jdx/data.vue
+++ b/ruoyi-ui/src/views/jxjs/jdx/data.vue
@@ -285,6 +285,9 @@ export default {
     };
   },
   created() {
+    const jdxId = this.$route.params && this.$route.params.id;
+    //console.log(jdxId);
+    this.queryParams.jdxid = jdxId;
     this.getList();
     this.getDicts("sys_user_sex").then((response) => {
       this.xbOptions = response.data;
diff --git a/ruoyi-ui/src/views/jxjs/jdx/index.vue b/ruoyi-ui/src/views/jxjs/jdx/index.vue
index 475a47d40..1982a0c11 100644
--- a/ruoyi-ui/src/views/jxjs/jdx/index.vue
+++ b/ruoyi-ui/src/views/jxjs/jdx/index.vue
@@ -192,22 +192,20 @@
 
     <!-- 添加或修改基地校对话框 -->
     <el-dialog title="基地校分配见习教师" :visible.sync="open_fpjs" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-table :data="jxjsjbxxList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <!-- <el-table-column label="编号" align="center" prop="id" /> -->
-          <el-table-column label="姓名" align="center" prop="name" />
-          <!-- <el-table-column label="性别" align="center" prop="xb" :formatter="xbFormat" />
+      <el-table :data="jxjsjbxxList" @selection-change="handleSelectionChangeFpjs">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="编号" align="center" prop="id" /> -->
+        <el-table-column label="姓名" align="center" prop="name" />
+        <!-- <el-table-column label="性别" align="center" prop="xb" :formatter="xbFormat" />
           <el-table-column label="政治面貌" align="center" prop="zzmm" :formatter="zzmmFormat" />
           <el-table-column label="民族" align="center" prop="mz" :formatter="mzFormat" />
           <el-table-column label="学历" align="center" prop="xl" :formatter="xlFormat" />
           <el-table-column label="学位" align="center" prop="xw" :formatter="xwFormat" />
-          <el-table-column label="是否师范生" align="center" prop="sfsfs" :formatter="sfsfsFormat" />-->
-          <el-table-column label="录取年份" align="center" prop="lqnf" />
-        </el-table>
-      </el-form>
+        <el-table-column label="是否师范生" align="center" prop="sfsfs" :formatter="sfsfsFormat" />-->
+        <el-table-column label="录取年份" align="center" prop="lqnf" />
+      </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm_fpjs">确 定</el-button>
         <el-button @click="cancel_fpjs">取 消</el-button>
       </div>
     </el-dialog>
@@ -217,7 +215,11 @@
 <script>
 import { listJdx, getJdx, delJdx, addJdx, updateJdx } from "@/api/jxjs/jdx";
 
-import { listJxjsjbxxnotjdx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
+import {
+  listJxjsjbxxnotjdx,
+  getJxjsjbxx,
+  updateJxjsJdx,
+} from "@/api/jxjs/jxjsjbxx";
 
 export default {
   name: "Jdx",
@@ -227,6 +229,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      jdxid: "",
+      jsIds: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -360,6 +364,10 @@ export default {
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
+    // 多选框选中数据
+    handleSelectionChangeFpjs(selection) {
+      this.jsIds = selection.map((item) => item.id);
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -400,6 +408,20 @@ export default {
         }
       });
     },
+    /** 分配教师提交按钮 */
+    submitForm_fpjs() {
+      if (this.jsIds == null || this.jsIds.length == 0) {
+        this.msgError("请选择要分配的教师");
+      } else {
+        console.log(this.jsIds[0]);
+        updateJxjsJdx(this.jsIds, this.jdxid).then((response) => {
+          if (response.code === 200) {
+            this.msgSuccess("分配成功");
+            this.open_fpjs = false;
+          }
+        });
+      }
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -421,6 +443,7 @@ export default {
     handleFpjs(row) {
       const ids = row.id || this.ids;
       console.log(ids);
+      this.jdxid = ids;
       this.open_fpjs = true;
       this.getJxjsList();
     },
diff --git a/ruoyi-ui/src/views/jxjs/jdxcx/index.vue b/ruoyi-ui/src/views/jxjs/jdxcx/index.vue
new file mode 100644
index 000000000..e69de29bb