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

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-08-09 10:16:02 +08:00
parent 147fa95a7e 17c3a3cae5
commit 55fe9d8e30
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java
View File

@ -96,7 +96,7 @@ public interface RepairMapper {
* @param userid * @param userid
* @return * @return
*/ */
int updateTaskStatus(@Param("taskList")List<RepairTask> taskList,@Param("userId") Long userid); int updateTaskStatus(@Param("repairTask") RepairTask repairTask,@Param("userId") Long userid);
/** /**
* 新增任务 * 新增任务

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -222,7 +222,7 @@ public class RepairServiceImpl implements RepairService {
boolean b = repairMaTypeId.stream().allMatch(t -> "1".equals(t.getStatus())); boolean b = repairMaTypeId.stream().allMatch(t -> "1".equals(t.getStatus()));
if (b) { if (b) {
// 修改状态为 维修完成 // 修改状态为 维修完成
mapper.updateTaskStatus(taskList, loginUser.getUserid()); mapper.updateTaskStatus(task, loginUser.getUserid());
} }
for (RepairTaskDetails repairTaskDetails : repairMaTypeId) { for (RepairTaskDetails repairTaskDetails : repairMaTypeId) {
task.setTypeId(repairTaskDetails.getTypeId()); task.setTypeId(repairTaskDetails.getTypeId());

5
sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -56,10 +56,7 @@
update_by = #{userId}, update_by = #{userId},
is_commit = 1, is_commit = 1,
update_time = now() update_time = now()
where task_id in where task_id = #{repairTask.taskId}
<foreach item="task" collection="taskList" open="(" separator="," close=")">
#{task.taskId}
</foreach>
</update> </update>
<update id="updateRepairedNumTwo"> <update id="updateRepairedNumTwo">
update repair_apply_details update repair_apply_details