王子文 专项培训

master/src/main/java/com/ruoyi/project/training/spec/controller/TStPlanController.java

@@ -208,14 +208,25 @@ public class TStPlanController extends BaseController
     {
         tStPlan.setUpdaterCode(getUserId().toString());
         tStPlan.setUpdatedate(new Date());
-        tStPlan.setApproveStatus(0l);
+        tStPlan.setApproveStatus(0L);
 
         TStYearplan tStYearplan = tStYearplanService.selectTStYearplanById(tStPlan.getYearPlanId());
-        tStYearplan.setApproveStatus(0l);
+        tStYearplan.setApproveStatus(0L);
         tStYearplanService.updateTStYearplan(tStYearplan);
         return toAjax(tStPlanService.updateTStPlan(tStPlan));
     }
 
+    /**
+     * 修改培训计划
+     */
+    @PreAuthorize("@ss.hasPermi('spec:plan:edit')")
+    @Log(title = "培训计划", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit2")
+    public AjaxResult edit2(@RequestBody TStPlan tStPlan)
+    {
+        return toAjax(tStPlanService.updateTStPlan(tStPlan));
+    }
+
     /**
      * 删除培训计划
      */

ui/src/api/training/spec/plan.js

@@ -61,6 +61,15 @@ export function addPlan(data) {
   })
 }
 
+// 修改培训计划
+export function updatePlan2(data) {
+  return request({
+    url: '/spec/plan/edit2',
+    method: 'put',
+    data: data
+  })
+}
+
 // 修改培训计划
 export function updatePlan(data) {
   return request({

ui/src/views/training/spec/myplan/index.vue

@@ -378,7 +378,7 @@
 
 <script>
 import { getFeedback, addFeedback } from "@/api/training/spec/planfeedback";
-import { getPlan, delPlan, addPlan, updatePlan, exportPlan, importTemplate, listPlanByStaffId } from "@/api/training/spec/plan";
+import { getPlan, delPlan, addPlan, updatePlan, updatePlan2,exportPlan, importTemplate, listPlanByStaffId } from "@/api/training/spec/plan";
 import { allFileList, delCommonfile } from "@/api/common/commonfile";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
@@ -518,7 +518,8 @@ export default {
       // 开始参数
       startParams: {
         id: 0,
-        studyState: 1
+        studyState: 1,
+        planId: null
       },
       // 结束参数
       endParams: {
@@ -573,7 +574,7 @@ export default {
       addFeedback(this.feedbackParams).then(response => {
         this.feedback.open = false;
         // 修改培训计划学习状态
-        updatePlan(this.endParams).then(response => {
+        updatePlan2(this.endParams).then(response => {
           this.msgSuccess("已结束学习");
           this.getList();
         });
@@ -582,7 +583,7 @@ export default {
     /** 开始学习 */
     handleStart(row) {
       this.startParams.id = row.id;
-      updatePlan(this.startParams).then(response => {
+      updatePlan2(this.startParams).then(response => {
         this.msgSuccess("已开始学习");
         this.getList();
       });