diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java index 22333819..d20ed33d 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java @@ -166,6 +166,7 @@ public interface ErrorCodeConstants { ErrorCode DEVICE_CALIBRATION_PLAN_NOT_EXISTS = new ErrorCode(1_032_150_000, "检定校准计划不存在"); ErrorCode DEVICE_CALIBRATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "检定校准数据不存在"); ErrorCode DEVICE_USE_RECORD_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备使用记录不存在"); + ErrorCode DEVICE_USE_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备-使用记录明细不存在"); ErrorCode DEVICE_AFFILIATION_RELATIVITY_NOT_EXISTS = new ErrorCode(1_032_150_000, "附属设备关系不存在"); ErrorCode DEVICE_APPLY_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请明细数据不存在"); ErrorCode DEVICE_APPLY_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请数据不存在"); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceUseRecordDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceUseRecordDetailController.java new file mode 100644 index 00000000..39f86473 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceUseRecordDetailController.java @@ -0,0 +1,123 @@ +package com.zt.plat.module.qms.resource.device.controller.admin; + +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailPageReqVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailRespVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailSaveReqVO; +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; +import com.zt.plat.framework.business.annotation.FileUploadController; +import com.zt.plat.framework.business.controller.AbstractFileUploadController; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceUseRecordDetailDO; +import com.zt.plat.module.qms.resource.device.service.DeviceUseRecordDetailService; + +@Tag(name = "管理后台 - 设备-使用记录明细") +@RestController +@RequestMapping("/qms/resource/device-use-record-detail") +@Validated +@FileUploadController(source = "qms.deviceuserecorddetail") +public class DeviceUseRecordDetailController extends AbstractFileUploadController implements BusinessControllerMarker{ + + static { + FileUploadController annotation = DeviceUseRecordDetailController.class.getAnnotation(FileUploadController.class); + if (annotation != null) { + setFileUploadInfo(annotation); + } + } + + @Resource + private DeviceUseRecordDetailService deviceUseRecordDetailService; + + @GetMapping("/getListByParentId") + @Operation(summary = "获得设备-使用记录明细分页") + public CommonResult> getListByParentId(Long parentId) { + List list = deviceUseRecordDetailService.getListByParentId(parentId); + return success(BeanUtils.toBean(list, DeviceUseRecordDetailRespVO.class)); + } + + @PostMapping("/create") + @Operation(summary = "创建设备-使用记录明细") + @PreAuthorize("@ss.hasPermission('qms:device-use-record-detail:create')") + public CommonResult createDeviceUseRecordDetail(@Valid @RequestBody DeviceUseRecordDetailSaveReqVO createReqVO) { + return success(deviceUseRecordDetailService.createDeviceUseRecordDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新设备-使用记录明细") + @PreAuthorize("@ss.hasPermission('qms:device-use-record-detail:update')") + public CommonResult updateDeviceUseRecordDetail(@Valid @RequestBody DeviceUseRecordDetailSaveReqVO updateReqVO) { + deviceUseRecordDetailService.updateDeviceUseRecordDetail(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除设备-使用记录明细") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('qms:device-use-record-detail:delete')") + public CommonResult deleteDeviceUseRecordDetail(@RequestParam("id") Long id) { + deviceUseRecordDetailService.deleteDeviceUseRecordDetail(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除设备-使用记录明细") + @PreAuthorize("@ss.hasPermission('qms:device-use-record-detail:delete')") + public CommonResult deleteDeviceUseRecordDetailList(@RequestBody BatchDeleteReqVO req) { + deviceUseRecordDetailService.deleteDeviceUseRecordDetailListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得设备-使用记录明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getDeviceUseRecordDetail(@RequestParam("id") Long id) { + DeviceUseRecordDetailDO deviceUseRecordDetail = deviceUseRecordDetailService.getDeviceUseRecordDetail(id); + return success(BeanUtils.toBean(deviceUseRecordDetail, DeviceUseRecordDetailRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得设备-使用记录明细分页") + public CommonResult> getDeviceUseRecordDetailPage(@Valid DeviceUseRecordDetailPageReqVO pageReqVO) { + PageResult pageResult = deviceUseRecordDetailService.getDeviceUseRecordDetailPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, DeviceUseRecordDetailRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出设备-使用记录明细 Excel") + @PreAuthorize("@ss.hasPermission('qms:device-use-record-detail:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportDeviceUseRecordDetailExcel(@Valid DeviceUseRecordDetailPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = deviceUseRecordDetailService.getDeviceUseRecordDetailPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "设备-使用记录明细.xls", "数据", DeviceUseRecordDetailRespVO.class, + BeanUtils.toBean(list, DeviceUseRecordDetailRespVO.class)); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailPageReqVO.java new file mode 100644 index 00000000..62d0d552 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailPageReqVO.java @@ -0,0 +1,40 @@ +package com.zt.plat.module.qms.resource.device.controller.vo; + +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 设备-使用记录明细分页 Request VO") +@Data +public class DeviceUseRecordDetailPageReqVO extends PageParam { + + @Schema(description = "使用记录ID", example = "14073") + private Long parentId; + + @Schema(description = "任务单编号") + private String taskNo; + + @Schema(description = "任务单ID", example = "71") + private Long taskId; + + @Schema(description = "样品名称", example = "王五") + private String sampleName; + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailRespVO.java new file mode 100644 index 00000000..9c6813bc --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailRespVO.java @@ -0,0 +1,50 @@ +package com.zt.plat.module.qms.resource.device.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 设备-使用记录明细 Response VO") +@Data +@ExcelIgnoreUnannotated +public class DeviceUseRecordDetailRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "11040") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "使用记录ID", example = "14073") + @ExcelProperty("使用记录ID") + private Long parentId; + + @Schema(description = "任务单编号") + @ExcelProperty("任务单编号") + private String taskNo; + + @Schema(description = "任务单ID", example = "71") + @ExcelProperty("任务单ID") + private Long taskId; + + @Schema(description = "样品名称", example = "王五") + @ExcelProperty("样品名称") + private String sampleName; + + @Schema(description = "样品编号") + @ExcelProperty("样品编号") + private String sampleCode; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailSaveReqVO.java new file mode 100644 index 00000000..f04b6185 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailSaveReqVO.java @@ -0,0 +1,34 @@ +package com.zt.plat.module.qms.resource.device.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +@Schema(description = "管理后台 - 设备-使用记录明细新增/修改 Request VO") +@Data +public class DeviceUseRecordDetailSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "11040") + private Long id; + + @Schema(description = "使用记录ID", example = "14073") + private Long parentId; + + @Schema(description = "任务单编号") + private String taskNo; + + @Schema(description = "任务单ID", example = "71") + private Long taskId; + + @Schema(description = "样品名称", example = "王五") + private String sampleName; + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + private String remark; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java index 8ebbe58c..0b450c16 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java @@ -59,4 +59,8 @@ public class DeviceUseRecordSaveReqVO { @Schema(description = "备注") private String remark; + //扩展字段 + @Schema(description = "使用记录明细列表") + List detailList; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceUseRecordDetailDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceUseRecordDetailDO.java new file mode 100644 index 00000000..cbe9fc3f --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceUseRecordDetailDO.java @@ -0,0 +1,67 @@ +package com.zt.plat.module.qms.resource.device.dal.dataobject; + +import lombok.*; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +/** +* 设备-使用记录明细 DO +* +* @author 后台管理 +*/ +@TableName("t_dev_use_rcd_dtl") +@KeySequence("t_dev_use_rcd_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class DeviceUseRecordDetailDO extends BusinessBaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 使用记录ID + */ + @TableField("PRN_ID") + private Long parentId; + /** + * 任务单编号 + */ + @TableField("TSK_NO") + private String taskNo; + /** + * 任务单ID + */ + @TableField("TSK_ID") + private Long taskId; + /** + * 样品名称 + */ + @TableField("SMP_NAME") + private String sampleName; + /** + * 样品编号 + */ + @TableField("SMP_CD") + private String sampleCode; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordDetailMapper.java new file mode 100644 index 00000000..ed851242 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordDetailMapper.java @@ -0,0 +1,31 @@ +package com.zt.plat.module.qms.resource.device.dal.mapper; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceUseRecordDetailDO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailPageReqVO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 设备-使用记录明细 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface DeviceUseRecordDetailMapper extends BaseMapperX { + + default PageResult selectPage(DeviceUseRecordDetailPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(DeviceUseRecordDetailDO::getParentId, reqVO.getParentId()) + .eqIfPresent(DeviceUseRecordDetailDO::getTaskNo, reqVO.getTaskNo()) + .eqIfPresent(DeviceUseRecordDetailDO::getTaskId, reqVO.getTaskId()) + .likeIfPresent(DeviceUseRecordDetailDO::getSampleName, reqVO.getSampleName()) + .eqIfPresent(DeviceUseRecordDetailDO::getSampleCode, reqVO.getSampleCode()) + .eqIfPresent(DeviceUseRecordDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .eqIfPresent(DeviceUseRecordDetailDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(DeviceUseRecordDetailDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(DeviceUseRecordDetailDO::getId)); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordDetailService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordDetailService.java new file mode 100644 index 00000000..b64a71f5 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordDetailService.java @@ -0,0 +1,68 @@ +package com.zt.plat.module.qms.resource.device.service; + +import java.util.*; + +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailPageReqVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailRespVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailSaveReqVO; +import jakarta.validation.*; +import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceUseRecordDetailDO; +import com.zt.plat.framework.common.pojo.PageResult; + +/** + * 设备-使用记录明细 Service 接口 + * + * @author 后台管理 + */ +public interface DeviceUseRecordDetailService { + + List getListByParentId(Long parentId); + + void saveList(Long parentId, List list); + + /** + * 创建设备-使用记录明细 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + DeviceUseRecordDetailRespVO createDeviceUseRecordDetail(@Valid DeviceUseRecordDetailSaveReqVO createReqVO); + + /** + * 更新设备-使用记录明细 + * + * @param updateReqVO 更新信息 + */ + void updateDeviceUseRecordDetail(@Valid DeviceUseRecordDetailSaveReqVO updateReqVO); + + /** + * 删除设备-使用记录明细 + * + * @param id 编号 + */ + void deleteDeviceUseRecordDetail(Long id); + + /** + * 批量删除设备-使用记录明细 + * + * @param ids 编号 + */ + void deleteDeviceUseRecordDetailListByIds(List ids); + + /** + * 获得设备-使用记录明细 + * + * @param id 编号 + * @return 设备-使用记录明细 + */ + DeviceUseRecordDetailDO getDeviceUseRecordDetail(Long id); + + /** + * 获得设备-使用记录明细分页 + * + * @param pageReqVO 分页查询 + * @return 设备-使用记录明细分页 + */ + PageResult getDeviceUseRecordDetailPage(DeviceUseRecordDetailPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordDetailServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordDetailServiceImpl.java new file mode 100644 index 00000000..6ed83509 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordDetailServiceImpl.java @@ -0,0 +1,157 @@ +package com.zt.plat.module.qms.resource.device.service; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailPageReqVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailRespVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordDetailSaveReqVO; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.util.*; + +import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceUseRecordDetailDO; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; + +import com.zt.plat.module.qms.resource.device.dal.mapper.DeviceUseRecordDetailMapper; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; + +/** + * 设备-使用记录明细 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class DeviceUseRecordDetailServiceImpl implements DeviceUseRecordDetailService { + @Resource + private DeviceUseRecordDetailMapper deviceUseRecordDetailMapper; + + @Override + public List getListByParentId(Long parentId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DeviceUseRecordDetailDO::getParentId, parentId); + return deviceUseRecordDetailMapper.selectList(queryWrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveList(Long parentId, List list) { + if(CollUtil.isEmpty(list)) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(DeviceUseRecordDetailDO::getParentId, parentId); + deviceUseRecordDetailMapper.delete(updateWrapper); + return; + } + List hasList = getListByParentId(parentId); + List updateList = new ArrayList<>(); + List insertList = new ArrayList<>(); + List deleteList = new ArrayList<>(); + boolean exist = false; + for (DeviceUseRecordDetailDO has : hasList) { + exist = false; + for (DeviceUseRecordDetailSaveReqVO reqVO : list) { + if (has.getId().equals(reqVO.getId())) { + exist = true; + updateList.add(reqVO); + break; + } + } + if (!exist) { + deleteList.add(has); + } + } + for (DeviceUseRecordDetailSaveReqVO reqVO : list) { + exist = false; + for(DeviceUseRecordDetailDO has : hasList){ + if(has.getId().equals(reqVO.getId())){ + exist = true; + break; + } + } + if(!exist){ + insertList.add(reqVO); + } + } + if(!insertList.isEmpty()){ + List insertDOList = BeanUtils.toBean(insertList, DeviceUseRecordDetailDO.class); + deviceUseRecordDetailMapper.insertBatch(insertDOList); + } + if(!updateList.isEmpty()){ + List updateDOList = BeanUtils.toBean(updateList, DeviceUseRecordDetailDO.class); + deviceUseRecordDetailMapper.updateBatch(updateDOList); + } + if(!deleteList.isEmpty()){ + List deleteIdList = convertList(deleteList, DeviceUseRecordDetailDO::getId); + deviceUseRecordDetailMapper.deleteByIds(deleteIdList); + } + } + + + + @Override + public DeviceUseRecordDetailRespVO createDeviceUseRecordDetail(DeviceUseRecordDetailSaveReqVO createReqVO) { + // 插入 + DeviceUseRecordDetailDO deviceUseRecordDetail = BeanUtils.toBean(createReqVO, DeviceUseRecordDetailDO.class); + deviceUseRecordDetailMapper.insert(deviceUseRecordDetail); + // 返回 + return BeanUtils.toBean(deviceUseRecordDetail, DeviceUseRecordDetailRespVO.class); + } + + @Override + public void updateDeviceUseRecordDetail(DeviceUseRecordDetailSaveReqVO updateReqVO) { + // 校验存在 + validateDeviceUseRecordDetailExists(updateReqVO.getId()); + // 更新 + DeviceUseRecordDetailDO updateObj = BeanUtils.toBean(updateReqVO, DeviceUseRecordDetailDO.class); + deviceUseRecordDetailMapper.updateById(updateObj); + } + + @Override + public void deleteDeviceUseRecordDetail(Long id) { + // 校验存在 + validateDeviceUseRecordDetailExists(id); + // 删除 + deviceUseRecordDetailMapper.deleteById(id); + } + + @Override + public void deleteDeviceUseRecordDetailListByIds(List ids) { + // 校验存在 + validateDeviceUseRecordDetailExists(ids); + // 删除 + deviceUseRecordDetailMapper.deleteByIds(ids); + } + + private void validateDeviceUseRecordDetailExists(List ids) { + List list = deviceUseRecordDetailMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(DEVICE_USE_RECORD_DETAIL_NOT_EXISTS); + } + } + + private void validateDeviceUseRecordDetailExists(Long id) { + if (deviceUseRecordDetailMapper.selectById(id) == null) { + throw exception(DEVICE_USE_RECORD_DETAIL_NOT_EXISTS); + } + } + + @Override + public DeviceUseRecordDetailDO getDeviceUseRecordDetail(Long id) { + return deviceUseRecordDetailMapper.selectById(id); + } + + @Override + public PageResult getDeviceUseRecordDetailPage(DeviceUseRecordDetailPageReqVO pageReqVO) { + return deviceUseRecordDetailMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordServiceImpl.java index 05ad0903..d29241fb 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordServiceImpl.java @@ -38,6 +38,7 @@ public class DeviceUseRecordServiceImpl implements DeviceUseRecordService { @Resource private DeviceInfomationService deviceInfomationService; @Resource private DeviceProductService deviceProductService; @Resource private DeviceUseRecordMapper deviceUseRecordMapper; + @Resource private DeviceUseRecordDetailService deviceUseRecordDetailService; @Override public PageResult queryPageListWithCount(DeviceUseRecordPageReqVO reqVO) { @@ -73,6 +74,7 @@ public class DeviceUseRecordServiceImpl implements DeviceUseRecordService { deviceInfomationService.updateDeviceInUseFlag(deviceId, 1); else deviceInfomationService.updateDeviceInUseFlag(deviceId, 0); + deviceUseRecordDetailService.saveList(deviceUseRecord.getId(), reqVO.getDetailList()); // 返回 DeviceUseRecordRespVO respVO = BeanUtils.toBean(deviceUseRecord, DeviceUseRecordRespVO.class); return success(respVO); @@ -88,6 +90,7 @@ public class DeviceUseRecordServiceImpl implements DeviceUseRecordService { deviceInfomationService.updateDeviceInUseFlag(deviceId, 1); else deviceInfomationService.updateDeviceInUseFlag(deviceId, 0); + deviceUseRecordDetailService.saveList(reqVO.getId(), reqVO.getDetailList()); // 更新 DeviceUseRecordDO updateObj = BeanUtils.toBean(reqVO, DeviceUseRecordDO.class); deviceUseRecordMapper.updateById(updateObj); diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordDetailMapper.xml new file mode 100644 index 00000000..afe9c6ef --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordDetailMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file