bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
mashuai 2024-04-25 13:08:53 +08:00
parent 9df0dae379
commit 62aeaf6cfd
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
View File

@ -131,4 +131,11 @@ public interface TmTaskMapper {
* @return * @return
*/ */
String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType); String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType);
/**
* 根据任务id删除任务协议关联表
* @param taskId
* @return
*/
int deleteTaskAgreementByTaskId(@Param("taskId") String taskId);
} }

7
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -954,10 +954,11 @@ public class TmTaskServiceImpl implements TmTaskService {
public AjaxResult deleteByPrimaryKey(String taskId) { public AjaxResult deleteByPrimaryKey(String taskId) {
int i = tmTaskMapper.deleteTaskByPrimaryKey(taskId); int i = tmTaskMapper.deleteTaskByPrimaryKey(taskId);
int j = tmTaskMapper.deleteTaskInfoByTaskId(taskId); int j = tmTaskMapper.deleteTaskInfoByTaskId(taskId);
if (i == 1 && j == 1) { int m = tmTaskMapper.deleteTaskAgreementByTaskId(taskId);
if (i == 1 && j == 1 && m == 1) {
return AjaxResult.success("删除成功"); return AjaxResult.success("删除成功");
} else if (i < 1 || j < 1) { } else if (i < 1 || j < 1 || m < 1) {
return AjaxResult.error("删除失败,任务表或信息表未删除!"); return AjaxResult.error("删除失败,任务表或信息表或任务协议关联表未删除!");
} else { } else {
return AjaxResult.error("删除失败，请检查任务ID是否正确!!"); return AjaxResult.error("删除失败，请检查任务ID是否正确!!");
} }

3
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -71,6 +71,9 @@
<delete id="deleteDetailsByParentId" parameterType="java.lang.String"> <delete id="deleteDetailsByParentId" parameterType="java.lang.String">
delete from lease_apply_details where parennt_id = #{parentId} delete from lease_apply_details where parennt_id = #{parentId}
</delete> </delete>
<delete id="deleteTaskAgreementByTaskId">
delete from tm_task_agreement where task_id = #{taskId}
</delete>
<insert id="insert" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.app.domain.TmTask" useGeneratedKeys="true"> <insert id="insert" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.app.domain.TmTask" useGeneratedKeys="true">
insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id) insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id)