ly %!s(int64=3) %!d(string=hai) anos
pai
achega
3023b91eb5

+ 10 - 1
master/src/main/java/com/ruoyi/project/training/spec/controller/TStSuccessorController.java

@@ -9,7 +9,9 @@ import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import com.ruoyi.project.training.spec.domain.TStSuccessorScore;
 import com.ruoyi.project.training.spec.domain.vo.TStSuccessorExportVO;
+import com.ruoyi.project.training.spec.mapper.TStYearplanMapper;
 import com.ruoyi.project.training.spec.service.ITStSuccessorScoreService;
+import com.ruoyi.project.training.spec.service.ITStYearplanService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -49,7 +51,8 @@ public class TStSuccessorController extends BaseController
     private ISysUserService sysUserService;
     @Autowired
     private ITStSuccessorScoreService tStSuccessorScoreService;
-
+    @Autowired
+    private TStYearplanMapper tStYearplanMapper;
     /**
      * 查询导师列表
      */
@@ -209,6 +212,12 @@ public class TStSuccessorController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
+        //删除对应年度计划
+        for (Long id: ids
+             ) {
+            TStSuccessor t = tStSuccessorService.selectTStSuccessorById(id);
+            tStYearplanMapper.deleteTStYearplanByStaffId(t.getStaffId());
+        }
         return toAjax(tStSuccessorService.deleteTStSuccessorByIds(ids));
     }
 }

+ 2 - 0
master/src/main/java/com/ruoyi/project/training/spec/mapper/TStYearplanMapper.java

@@ -62,4 +62,6 @@ public interface TStYearplanMapper
     public int deleteTStYearplanByIds(Long[] ids);
 
     List<TStYearplan> selectTStYearPlanExist(TStYearplan tStYearplan);
+
+    void deleteTStYearplanByStaffId(String staffId);
 }

+ 15 - 15
master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /u03/cpmsfile/uploadPath)
-  profile: D:/ruoyi/uploadPath
+  profile: /u03/cpmsfile/uploadPath
   # 邮件中链接跳转路径 示例(本地:http://localhost/#,服务器:http://47.114.101.16:8080/cpms/index.html#)
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关
@@ -93,24 +93,24 @@ spring:
         max-wait: -1ms
   # 邮箱配置
   mail:
-    host: smtpout.basf-it-services.com
-    protocol: smtp
-    default-encoding: UTF-8
-    password:
-    username:
-    port: 25
-    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
-    properties.mail.debug: true
-    from: CPMS.byc@BASF-YPC.com.cn
-#    host: smtp.exmail.qq.com
+#    host: smtpout.basf-it-services.com
 #    protocol: smtp
 #    default-encoding: UTF-8
-#    password: vvTAT8hciG7FLk4C
-#    username: email@seashoreept.com
-#    port: 587
+#    password:
+#    username:
+#    port: 25
 #    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
 #    properties.mail.debug: true
-#    from: email@seashoreept.com
+#    from: CPMS.byc@BASF-YPC.com.cn
+    host: smtp.exmail.qq.com
+    protocol: smtp
+    default-encoding: UTF-8
+    password: vvTAT8hciG7FLk4C
+    username: email@seashoreept.com
+    port: 587
+    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+    properties.mail.debug: true
+    from: email@seashoreept.com
 # token配置
 token:
     # 令牌自定义标识

+ 5 - 0
master/src/main/resources/mybatis/training/spec/TStYearplanMapper.xml

@@ -114,6 +114,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_st_yearplan set del_flag = 2 where id = #{id}
     </update>
 
+    <update id="deleteTStYearplanByStaffId" parameterType="Long">
+        update t_st_yearplan set del_flag = 2 where staff_id = #{staffId}
+    </update>
+
+
     <update id="deleteTStYearplanByIds" parameterType="String">
         update t_st_yearplan set del_flag = 2 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">