diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java new file mode 100644 index 00000000..c1781811 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java @@ -0,0 +1,74 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * [工序检验项明细,硬度] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_WORK_RAISE_HAND") +@Schema(description = "RaiseHand Entity对象") +@EqualsAndHashCode(callSuper = true) +public class RaiseHand extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 提出人 + */ + @Schema(description = "提出人") + private Long reportUserId; + /** + * 岗位 + */ + @Schema(description = "岗位") + private String postName; + private Long postId; + /** + * 发生时间 + */ + @Schema(description = "发生时间") + private LocalDate happenDate; + /** + * 免责问题描述 + */ + @Schema(description = "免责问题描述") + private String notes; + /** + * 原因 + */ + @Schema(description = "原因") + private String reason; + /** + * 措施 + */ + @Schema(description = "措施") + private String measure; + /** + * 免责理由 + */ + @Schema(description = "免责理由") + private String raiseHandReason; + /** + * 免责金额 + */ + @Schema(description = "免责金额") + private BigDecimal amount; + + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandVO.java new file mode 100644 index 00000000..ad419f71 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandVO.java @@ -0,0 +1,25 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.RaiseHand; +import org.springblade.desk.quality.pojo.entity.WorkPlanThicknessDetail; + +import java.io.Serial; + +/** + * [工序检验项明细] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RaiseHandVO extends RaiseHand { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java index a054dc0c..f7bfb607 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java @@ -22,7 +22,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class ReviewSheetDetailVO extends ReviewSheet { +public class ReviewSheetDetailVO extends ReviewSheetInitVO { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java index 509edaa5..80a10453 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java @@ -38,4 +38,5 @@ public class ReviewSheetInitVO extends ReviewSheet { private String reviewStatusName; @Schema(description = "审理[用户]真名") private String reviewUserRealName; + private String findPrecessName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java index 6d5f261e..cc8ccb9c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java @@ -131,7 +131,7 @@ public class IotHardnessController extends BladeController { QueryWrapper qwhard = new QueryWrapper<>(); qwhard.eq("EQUIPMENT_ID",card.getId()); -// qwhard.eq("FLAG_READ",0); + qwhard.eq("FLAG_READ",0); qwhard.orderByDesc("CREATE_TIME"); List qcHardnessIotList = service.list(qwhard); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java index 3f2ac52d..4c5320cf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java @@ -28,6 +28,8 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.constant.BaseRequest; +import org.springblade.desk.basic.pojo.entity.WorkCenter; +import org.springblade.desk.basic.service.IWorkCenterService; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.util.RequestUtil; import org.springblade.desk.quality.constant.QAModuleConst; @@ -78,6 +80,8 @@ public class LiquidTankWaveController extends BladeController { private IRelTankWaveItemService relReportItemService; @Resource private IUserClient userClient; + @Resource + private IWorkCenterService workCenterService; public List getListByLiquidTankReportId(Long liquidTankReportId) { @@ -156,7 +160,11 @@ public class LiquidTankWaveController extends BladeController { List pagesVO = getListByLiquidTankReportId(detailVO.getId()); detailVO.setTaskCopys(pagesVO); - detailVO.setWorkCenterName(pagesVO.get(0).getWcName()); + + WorkCenter center = workCenterService.getById(detail.getWcId()); + if(center != null){ + detailVO.setWorkCenterName(center.getWcName()); + } detailVO.setUpdateUserRealName(user.getRealName()); // pagesVO.stream() // .peek(copyService::setVOValue) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RaiseHandController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RaiseHandController.java new file mode 100644 index 00000000..b12ebe46 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RaiseHandController.java @@ -0,0 +1,242 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BaseCol; +import org.springblade.desk.basic.constant.BaseRequest; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.util.RequestUtil; +import org.springblade.desk.quality.constant.QAModuleConst; +import org.springblade.desk.quality.excel.LiquidTankWaveExcel; +import org.springblade.desk.quality.excel.RaiseHandExcel; +import org.springblade.desk.quality.pojo.entity.*; +import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO; +import org.springblade.desk.quality.pojo.vo.LiquidTankWaveVO; +import org.springblade.desk.quality.pojo.vo.RaiseHandVO; +import org.springblade.desk.quality.service.ILiquidTankTaskCopyService; +import org.springblade.desk.quality.service.ILiquidTankWaveService; +import org.springblade.desk.quality.service.IRaiseHandService; +import org.springblade.desk.quality.service.IRelTankWaveItemService; +import org.springblade.desk.quality.wrapper.LiquidTankTaskCopyWrapper; +import org.springblade.desk.quality.wrapper.LiquidTankWaveWrapper; +import org.springblade.desk.quality.wrapper.RaiseHandWrapper; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 举手免责控制器 + * + * @author Tom Shuo + * @since 2025-12-19 + */ +@RestController +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RaiseHand") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[举手免责]", description = "[举手免责]接口") +public class RaiseHandController extends BladeController { + + @Resource + private IRaiseHandService service; + + @Resource + private ILiquidTankTaskCopyService copyService; + @Resource + private IRelTankWaveItemService relReportItemService; + @Resource + private IUserClient userClient; + + + + /** + * [槽液曲线] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入LiquidTankWave Obj") + public R detail(RaiseHand liquidTankWave) { + QueryWrapper qw = Condition.getQueryWrapper(liquidTankWave); + RaiseHand detail = service.getOne(qw); + RaiseHandVO detailVO = RaiseHandWrapper.build().entityVO(detail); + + return R.data(detailVO); + } + + /** + * [槽液曲线] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入LiquidTankWave Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map liquidTankWave, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(liquidTankWave, RaiseHand.class); + qw.eq(liquidTankWave.containsKey("name"), LiquidTankReport.COL_NAME, liquidTankWave.get("name")); + if (liquidTankWave.containsKey(BaseRequest.CREATE_TIME_START) && liquidTankWave.containsKey(BaseRequest.CREATE_TIME_END)) { + Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankWave, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankWave, BaseRequest.CREATE_TIME_END); + qw.between(BaseCol.CREATE_TIME, crStart, crEnd); + } + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = RaiseHandWrapper.build().pageVO(pages); + return R.data(pagesVO); + } + + + /** + * [槽液曲线] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入LiquidTankWave Obj") + public R> page(RaiseHandVO liquidTankWave, Query query) { + IPage pagesVO = service.selectRaiseHandPage( + Condition.getPage(query), liquidTankWave + ); + return R.data(pagesVO); + } + + + + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入LiquidTankWave Obj") + public R save(@Valid @RequestBody RaiseHand addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入LiquidTankWave List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入LiquidTankWave Obj") + public R update(@Valid @RequestBody RaiseHand updateOne) { + return R.status(service.updateById(updateOne)); + } + + + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入LiquidTankWave List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入LiquidTankWave Obj") + public R submit(@Valid @RequestBody RaiseHand mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入LiquidTankWave List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [槽液曲线] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [槽液曲线] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入LiquidTankWave") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map liquidTankWave, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(liquidTankWave, RaiseHand.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(LiquidTankWave::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(LiquidTankWaveEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportRaiseHand(qw); + ExcelUtil.export(response, "[举手免责]数据" + DateUtil.time(), + "[举手免责]数据表", list, RaiseHandExcel.class); + } + + /** + * [槽液曲线] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [槽液曲线] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, RaiseHand.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index 48f12257..e312fd33 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -78,9 +78,12 @@ public class ReviewSheetController extends BladeController { public R detail(ReviewSheet reviewSheet) { QueryWrapper qw = Condition.getQueryWrapper(reviewSheet); ReviewSheet detail = service.getOne(qw); - ReviewSheetDetailVO detailVO = ReviewSheetDetailWrapper.build().entityVO(detail); - service.setDetailVOValue(detailVO); - return R.data(detailVO); +// ReviewSheetDetailVO detailVO = ReviewSheetDetailWrapper.build().entityVO(detail); + ReviewSheetInitVO detailVO = service.getById( detail.getId()); + ReviewSheetDetailVO detaiinit = ReviewSheetDetailWrapper.build().entityVO(detailVO); + + service.setDetailVOValue(detaiinit); + return R.data(detaiinit); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RaiseHandExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RaiseHandExcel.java new file mode 100644 index 00000000..16d9648f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RaiseHandExcel.java @@ -0,0 +1,94 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [IOT硬度] Excel实体类 + * + * @author Tom Shuo + * @since 2025-12-23 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class RaiseHandExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + +// /** +// * 编码 +// */ +// @ColumnWidth(20) +// @ExcelProperty("编码") +// private String code; +// /** +// * 使用标记位 +// */ +// @ColumnWidth(20) +// @ExcelProperty("使用标记位") +// private Long flagUse; +// /** +// * 读取标记位 +// */ +// @ColumnWidth(20) +// @ExcelProperty("读取标记位") +// private Long flagRead; +// /** +// * 设备号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("设备号") +// private String equipmentCode; +// /** +// * 批次号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("批次号") +// private String batchNo; +// /** +// * 检测内容 +// */ +// @ColumnWidth(20) +// @ExcelProperty("检测内容") +// private String data; +// /** +// * 排序 +// */ +// @ColumnWidth(20) +// @ExcelProperty("排序") +// private Long sort; +// /** +// * 备注 +// */ +// @ColumnWidth(20) +// @ExcelProperty("备注") +// private String remark; +// /** +// * 数据上传时间 +// */ +// @ColumnWidth(20) +// @ExcelProperty("数据上传时间") +// private LocalDateTime uploadDate; +// /** +// * [设备]id +// */ +// @ColumnWidth(20) +// @ExcelProperty("[设备]id") +// private BigDecimal equipmentId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index 6f207ef8..c66427aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -88,6 +88,8 @@ yo.PART_VERSION AS partVersion, yo.ID AS yoId, yo.PART_CODE AS prodCode, + dp.HARDNESS AS hardness, + dp.CRAFT_WAY AS process, wo.TEST_QTY as orderCheckQty, wo.LOSS_QTY as orderLossQty, wo.SCRAP_QTY as orderScrapQty, @@ -109,6 +111,9 @@ LEFT JOIN BS_TEAM_SET ts ON wp.MAKE_TEAM = ts.ID -- 部门 LEFT JOIN BLADE_DEPT bl_dept on t.CREATE_DEPT = bl_dept.ID + + LEFT JOIN DS_PART dp on yo.PART_CODE = dp.PART_CODE + WHERE ( t.IS_DELETED = 0 and t.ID = #{q.id} -- AND wp.IS_DELETED = 0 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.java new file mode 100644 index 00000000..7da3f863 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.java @@ -0,0 +1,45 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.RaiseHandExcel; +import org.springblade.desk.quality.excel.StandardExcel; +import org.springblade.desk.quality.pojo.entity.RaiseHand; +import org.springblade.desk.quality.pojo.entity.Standard; +import org.springblade.desk.quality.pojo.entity.WorkPlanThicknessDetail; +import org.springblade.desk.quality.pojo.vo.RaiseHandVO; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemThicknessVO; + +import java.util.List; + +/** + * [工序检验项] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface RaiseHandMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItem 查询参数 + * @return List + */ + IPage selectRaiseHandPage(IPage page, RaiseHandVO workPlanItem); + List exportRaiseHand(@Param("ew") Wrapper queryWrapper); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ +// List exportWorkPlanItem(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.xml new file mode 100644 index 00000000..fc275d8f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java index 8884f741..f70172ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java @@ -45,6 +45,9 @@ public interface ReviewSheetMapper extends BaseMapper { List listInit(IPage page, @Param("q") ReviewSheetInitSearch search); + + ReviewSheetInitVO getById(Long id); + List listReviewRedoScrap(IPage page, @Param("q") ReviewSheetRedoScrapSearch search); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 7cd9642c..76848d82 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -64,6 +64,42 @@ FROM QA_REVIEW_SHEET ${ew.customSqlSegment} + + + + + +