2023/12/14

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/fudao/FudaoStudentController.java

@@ -49,7 +49,7 @@ public class FudaoStudentController extends BaseController {
     //删除
     @DeleteMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids){
-        return toAjax(fudaoStudentService.delete(ids));
+        return toAjax(fudaoStudentService.deleteids(ids));
     }
 
     //修改
@@ -58,6 +58,7 @@ public class FudaoStudentController extends BaseController {
         return toAjax(fudaoStudentService.updatefudao(fudaoStudent));
     }
 
+
     //导出
     @PostMapping("/export/{ids}")
     public void export(HttpServletResponse response, @PathVariable("ids") List<Integer> ids) {
@@ -66,6 +67,7 @@ public class FudaoStudentController extends BaseController {
         util.exportExcel(response, list, "辅导学生获奖");
     }
 
+
     //审核
     @PutMapping("/submit")
     public AjaxResult submit(@RequestBody FudaoStudent fudaoStudent)

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/fudao/FudaoTeacherController.java

@@ -47,7 +47,7 @@ public class FudaoTeacherController extends BaseController {
     //删除
     @DeleteMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids){
-        return toAjax(fudaoTeacherService.delete(ids));
+        return toAjax(fudaoTeacherService.deleteids(ids));
     }
 
     //修改

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/fudao/FudaoStudentMapper.java

@@ -13,7 +13,7 @@ public interface FudaoStudentMapper extends BaseMapper<FudaoStudent> {
 
     public int add(FudaoStudent fudaoStudent);
 
-    public int deleteid(Long[] ids);
+    public int deleteids(Long[] ids);
 
     public int updatefudao(FudaoStudent fudaoStudent);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/fudao/FudaoTeacherMapper.java

@@ -13,7 +13,7 @@ public interface FudaoTeacherMapper extends BaseMapper<FudaoTeacher> {
 
     public int add(FudaoTeacher fudaoTeacher);
 
-    public int deleteid(Long[] ids);
+    public int deleteids(Long[] ids);
 
     public int updatefudao(FudaoTeacher fudaoTeacher);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/fudao/FudaoStudentService.java

@@ -16,7 +16,7 @@ public interface FudaoStudentService extends IService<FudaoStudent> {
 
     public int insert(FudaoStudent fudaoStudent);
 
-    public int delete(Long[] ids);
+    public int deleteids(Long[] ids);
 
     public int updatefudao(FudaoStudent fudaoStudent);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/fudao/FudaoTeacherService.java

@@ -14,7 +14,7 @@ public interface FudaoTeacherService extends IService<FudaoTeacher> {
     public int insert(FudaoTeacher fudaoTeacher);
 
     //删除
-    public int delete(Long[] ids);
+    public int deleteids(Long[] ids);
 
     //修改
     public int updatefudao(FudaoTeacher fudaoTeacher);

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/fudao/FudaoStudentImpl.java

@@ -41,11 +41,11 @@ public class FudaoStudentImpl extends ServiceImpl<FudaoStudentMapper,FudaoStuden
     }
 
     @Override
-    public int delete(Long[] ids) {
-        fudaoStudentMapper.deleteid(ids);
-        return delete(ids);
+    public int deleteids(Long[] ids) {
+        return fudaoStudentMapper.deleteids(ids);
     }
 
+
     @Override
     public int updatefudao(FudaoStudent fudaoStudent) {
         fudaoStudent.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/fudao/FudaoTeacherImpl.java

@@ -41,11 +41,11 @@ public class FudaoTeacherImpl extends ServiceImpl<FudaoTeacherMapper, FudaoTeach
     }
 
     @Override
-    public int delete(Long[] ids) {
-        fudaoTeacherMapper.deleteid(ids);
-        return delete(ids);
+    public int deleteids(Long[] ids) {
+        return fudaoTeacherMapper.deleteids(ids);
     }
 
+
     @Override
     public int updatefudao(FudaoTeacher fudaoTeacher) {
         fudaoTeacher.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());

smart-campus/src/main/resources/mapper/fudao/FudaoStudentMapper.xml

@@ -94,16 +94,13 @@
         </trim>
     </insert>
 
-    <delete id="delete" parameterType="Long">
-        delete from school_xtutor_student_award where id = #{id}
-    </delete>
 
-    <delete id="delete" parameterType="String">
-        delete from school_xtutor_student_award where id in
+    <update id="deleteids" parameterType="String">
+        update school_xtutor_student_award set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </update>
 
 
     <update id="updatefudao" parameterType="FudaoTeacher">

smart-campus/src/main/resources/mapper/fudao/FudaoTeacherMapper.xml

@@ -93,16 +93,13 @@
         </trim>
     </insert>
 
-    <delete id="delete" parameterType="Long">
-        delete from school_xtutor_award where id = #{id}
-    </delete>
 
-    <delete id="delete" parameterType="String">
-        delete from school_xtutor_award where id in
+    <update id="deleteids" parameterType="String">
+        update school_xtutor_award set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </update>
 
     <update id="updatefudao" parameterType="FudaoTeacher">
           update school_xtutor_award