diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java index d484e32ff5..f502c83f90 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java @@ -17,4 +17,8 @@ public class MoldTicketManagementBatchUpdateReqVO { @Schema(description = "作业状态", example = "2") @NotNull(message = "作业状态不能为空") private Integer jobStatus ; // 默认值为2 + + @Schema(description = "取消原因") + @NotNull(message = "取消原因不能为空") + private String cancelReason; } \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java index ecc2b2f88a..ac2fd8a479 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java @@ -60,4 +60,7 @@ public class MoldTicketManagementPageReqVO extends PageParam { */ private String taskEndTime; + @Schema(description = "取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java index d6c3d1eab5..08f586d632 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java @@ -87,5 +87,8 @@ public class MoldTicketManagementRespVO extends BaseDO { @ExcelProperty("作业人名称") private String operatorName; + @Schema(description = "取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java index 05f6e96c1a..bee7014ec7 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java @@ -39,4 +39,7 @@ public class MoldTicketManagementSaveReqVO { @Schema(description = "作业结果") private Integer jobResult; + @Schema(description = "取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java index c78b614b2f..6fa6cfa37a 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java @@ -85,6 +85,11 @@ public class MoldTicketManagementDO extends BaseDO { @JsonDeserialize(using = LocalDateTimeDeserializer.class) private LocalDateTime taskEndTime; + /** + * 取消原因 + */ + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java index 8ea59bc21a..0c3abd3423 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java @@ -33,6 +33,7 @@ public interface MoldTicketManagementMapper extends BaseMapperX idList, - @Param("jobStatus") Integer jobStatus); + @Param("jobStatus") Integer jobStatus, + @Param("cancelReason") String cancelReason); } \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/moldticketmanagement/MoldTicketManagementMapper.xml b/yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/moldticketmanagement/MoldTicketManagementMapper.xml index 594197df1f..9f5e9f311e 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/moldticketmanagement/MoldTicketManagementMapper.xml +++ b/yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/moldticketmanagement/MoldTicketManagementMapper.xml @@ -13,6 +13,7 @@ UPDATE mes_mold_ticket_management SET job_status = #{jobStatus}, + cancel_reason = #{cancelReason}, update_time = NOW() WHERE id IN diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementBatchUpdateReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementBatchUpdateReqVO.java index 55f3f7e897..eb3cedb81e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementBatchUpdateReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementBatchUpdateReqVO.java @@ -17,4 +17,8 @@ public class TicketManagementBatchUpdateReqVO { @Schema(description = "作业状态", example = "2") @NotNull(message = "作业状态不能为空") private Integer jobStatus ; + + @Schema(description = "取消原因") + @NotNull(message = "取消原因不能为空") + private String cancelReason; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java index 099b8aef31..9928fc35dc 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java @@ -10,6 +10,8 @@ import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -57,4 +59,7 @@ public class TicketManagementPageReqVO extends PageParam { @Schema(description = "作业结束时间") private String taskEndTime; + @Schema(description = "取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementRespVO.java index 6345cd70f9..8799e17183 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementRespVO.java @@ -110,6 +110,9 @@ public class TicketManagementRespVO extends BaseDO { // @ExcelProperty("创建人名字") private String creatorName; + @Schema(description = "取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementSaveReqVO.java index 78371ae107..d9b5e5a5be 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementSaveReqVO.java @@ -39,4 +39,7 @@ public class TicketManagementSaveReqVO { @Schema(description = "作业结果") private Integer jobResult; + @Schema(description = "取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java index 046baf42da..2741038c0c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.mes.controller.admin.zjtask; import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.TicketManagementBatchUpdateReqVO; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -111,4 +112,14 @@ public class ZjTaskController { ExcelUtils.write(response, "质量管理-检验任务.xls", "数据", ZjTaskRespVO.class, zjTaskRespVOList); } + @PutMapping("/batchUpdateStatus") + @Operation(summary = "批量取消工单") + @PreAuthorize("@ss.hasPermission('mes:zj-task:update')") + public CommonResult batchUpdateZjTaskStatus(@Valid @RequestBody ZjTaskBatchUpdateReqVO reqVO) { + zjTaskService.batchUpdateJobStatus(reqVO); + return success(true); + } + + + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskBatchUpdateReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskBatchUpdateReqVO.java new file mode 100644 index 0000000000..e791849339 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskBatchUpdateReqVO.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +// 1. 新增请求VO +@Data +public class ZjTaskBatchUpdateReqVO { + + @Schema(description = "检验任务ID列表,用逗号分隔", example = "1,2,3") + @NotBlank(message = "检验任务ID不能为空") + private String ids; + + @Schema(description = "作业状态", example = "2") + @NotNull(message = "作业状态不能为空") + private Integer Status ; + + @Schema(description = "取消原因") + @NotNull(message = "取消原因不能为空") + private String cancelReason; +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java index 4f72be5d75..4d8fa736ae 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java @@ -68,4 +68,7 @@ public class ZjTaskPageReqVO extends PageParam { @Schema(description = "ids集合导出用") private String ids; + @Schema(description = "取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java index 83bb8eda51..91265f8022 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java @@ -95,4 +95,8 @@ public class ZjTaskRespVO { @ColumnWidth(20) private LocalDateTime executeTime; + @Schema(description = "取消原因") + @ExcelProperty("取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskSaveReqVO.java index c30d49b9b9..cb4b55516b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskSaveReqVO.java @@ -65,4 +65,7 @@ public class ZjTaskSaveReqVO { @Schema(description = "执行时间") private LocalDateTime executeTime; + @Schema(description = "取消原因") + private String cancelReason; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/ticketmanagement/TicketManagementDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/ticketmanagement/TicketManagementDO.java index f2ebe9d76c..08cb6046c5 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/ticketmanagement/TicketManagementDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/ticketmanagement/TicketManagementDO.java @@ -85,6 +85,10 @@ public class TicketManagementDO extends BaseDO { @JsonSerialize(using = LocalDateTimeSerializer.class) @JsonDeserialize(using = LocalDateTimeDeserializer.class) private LocalDateTime taskEndTime; + /** + * 取消原因 + */ + private String cancelReason; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjtask/ZjTaskDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjtask/ZjTaskDO.java index a4ce3d06a2..3ef2681fcb 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjtask/ZjTaskDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/zjtask/ZjTaskDO.java @@ -92,5 +92,9 @@ public class ZjTaskDO extends BaseDO { * 执行时间 */ private LocalDateTime executeTime; + /** + * 取消原因 + */ + private String cancelReason; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java index 03003327d3..59e3f2013d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java @@ -33,6 +33,7 @@ public interface TicketManagementMapper extends BaseMapperX .likeIfPresent(TicketManagementDO::getConfigName, reqVO.getConfigName()) .eqIfPresent(TicketManagementDO::getJobStatus, reqVO.getJobStatus()) .eqIfPresent(TicketManagementDO::getJobResult, reqVO.getJobResult()) + .likeIfPresent(TicketManagementDO::getCancelReason, reqVO.getCancelReason()) .orderByDesc(TicketManagementDO::getId); @@ -58,6 +59,7 @@ public interface TicketManagementMapper extends BaseMapperX * @return 更新记录数 */ int batchUpdateJobStatus(@Param("idList") List idList, - @Param("jobStatus") Integer jobStatus); + @Param("jobStatus") Integer jobStatus, + @Param("cancelReason") String cancelReason); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java index b2eef68355..d81368509a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.zjtask.ZjTaskDO; import com.alibaba.excel.util.StringUtils; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.*; +import org.apache.ibatis.annotations.Param; /** * 质量管理-检验任务 Mapper @@ -51,4 +52,15 @@ public interface ZjTaskMapper extends BaseMapperX { return selectPage(reqVO,zjTaskDOLambdaQueryWrapperX ); } + /** + * 批量更新作业状态 + * + * @param idList 工单ID列表 + * @param jobStatus 作业状态 + * @return 更新记录数 + */ + int batchUpdateJobStatus(@Param("idList") List idList, + @Param("status") Integer status, + @Param("cancelReason") String cancelReason); + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java index 56d61c8e6b..7411bbdae4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java @@ -101,7 +101,7 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ } // 2. 批量更新 - moldTicketManagementMapper.batchUpdateJobStatus(idList, reqVO.getJobStatus()); + moldTicketManagementMapper.batchUpdateJobStatus(idList, reqVO.getJobStatus(),reqVO.getCancelReason()); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java index 5912997e2b..3c8291ecaf 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java @@ -103,7 +103,7 @@ public class TicketManagementServiceImpl implements TicketManagementService { } // 2. 批量更新 - ticketManagementMapper.batchUpdateJobStatus(idList, reqVO.getJobStatus()); + ticketManagementMapper.batchUpdateJobStatus(idList, reqVO.getJobStatus(),reqVO.getCancelReason()); } @Override diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskService.java index 67ff3c116a..d66194b641 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.mes.service.zjtask; import java.util.*; import javax.validation.*; + +import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.TicketManagementBatchUpdateReqVO; import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.*; import cn.iocoder.yudao.module.mes.dal.dataobject.zjtask.ZjTaskDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -59,4 +61,6 @@ public interface ZjTaskService { */ void updateZjTaskResultOnly(Long id, String result); + void batchUpdateJobStatus(@Valid ZjTaskBatchUpdateReqVO reqVO); + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskServiceImpl.java index e4aeec034d..722588cae6 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskServiceImpl.java @@ -5,8 +5,10 @@ import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.mes.controller.admin.feedingrecord.vo.FeedingRecordRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.TicketManagementBatchUpdateReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjitem.ZjItemDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjschema.ZjSchemaDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjtaskresults.ZjTaskResultsDO; @@ -23,6 +25,8 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; +import java.util.stream.Collectors; + import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.*; import cn.iocoder.yudao.module.mes.dal.dataobject.zjtask.ZjTaskDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -175,4 +179,33 @@ public class ZjTaskServiceImpl implements ZjTaskService { zjTaskMapper.updateById(updateDO); } + @Override + @Transactional(rollbackFor = Exception.class) + public void batchUpdateJobStatus(ZjTaskBatchUpdateReqVO reqVO) { + // 1. 解析ID列表 + List idList = parseIds(reqVO.getIds()); + if (idList.isEmpty()) { + throw exception(ZJ_TASK_NOT_EXISTS); + } + // 2. 批量更新 + zjTaskMapper.batchUpdateJobStatus(idList, reqVO.getStatus(),reqVO.getCancelReason()); + } + + + /** + * 解析逗号分隔的ID字符串 + */ + private List parseIds(String ids) { + if (com.alibaba.excel.util.StringUtils.isBlank(ids)) { + return Collections.emptyList(); + } + + return Arrays.stream(ids.split(",")) + .map(String::trim) + .filter(com.alibaba.excel.util.StringUtils::isNotBlank) + .map(Long::valueOf) + .distinct() + .collect(Collectors.toList()); + } + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/ticketmanagement/TicketManagementMapper.xml b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/ticketmanagement/TicketManagementMapper.xml index d78e084bd3..ab3b843823 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/ticketmanagement/TicketManagementMapper.xml +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/ticketmanagement/TicketManagementMapper.xml @@ -13,6 +13,7 @@ UPDATE mes_ticket_management SET job_status = #{jobStatus}, + cancel_reason = #{cancelReason}, update_time = NOW() WHERE id IN diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/zjtask/ZjTaskMapper.xml b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/zjtask/ZjTaskMapper.xml index 61303a7cf6..b27c2956a9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/zjtask/ZjTaskMapper.xml +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/zjtask/ZjTaskMapper.xml @@ -8,5 +8,15 @@ 代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。 文档可见:https://www.iocoder.cn/MyBatis/x-plugins/ --> - + + + UPDATE mes_zj_task + SET status = #{status}, + cancel_reason = #{cancelReason}, + update_time = NOW() + WHERE id IN + + #{id} + + \ No newline at end of file