From 9234f262017d1bca77f7456346d681722c1239db Mon Sep 17 00:00:00 2001 From: Tom Li Date: Fri, 16 Jan 2026 16:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/pojo/entity/ReviewSheet.java | 6 + .../pojo/request/InspectionTaskSearch.java | 2 + .../quality/pojo/request/RemindMsgSearch.java | 16 + .../pojo/request/ReviewSheetErpSearch.java | 8 + .../pojo/request/ReviewSheetInitSearch.java | 6 + .../quality/pojo/vo/InspectionTaskListVO.java | 4 +- .../desk/quality/pojo/vo/ReviewDutyVO.java | 2 + .../desk/quality/pojo/vo/ReviewFaultVO.java | 2 + .../quality/pojo/vo/ReviewSheetDetailVO.java | 2 + .../quality/pojo/vo/ReviewSheetInitVO.java | 2 +- .../json/Integer0ToEmptyStringSerializer.java | 31 ++ .../json/IntegerAllToStringSerializer.java | 30 ++ .../springblade/desk/basic/util/RoleUtil.java | 52 +++ .../quality/constant/ReviewSheetConst.java | 2 +- .../controller/InspectionTaskController.java | 17 +- .../controller/RemindMsgController.java | 318 +++++++++--------- .../controller/ReviewSheetController.java | 113 ++++--- .../quality/mapper/InspectionTaskMapper.xml | 4 +- .../desk/quality/mapper/RemindMsgMapper.java | 2 + .../quality/mapper/ReviewSheetMapper.java | 2 +- .../desk/quality/mapper/ReviewSheetMapper.xml | 43 ++- .../quality/service/IReviewSheetService.java | 17 +- .../impl/InspectionTaskServiceImpl.java | 9 + .../service/impl/ReviewSheetServiceImpl.java | 68 +++- .../desk/quality/util/RoleUtil.java | 21 -- 25 files changed, 497 insertions(+), 282 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/RemindMsgSearch.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/Integer0ToEmptyStringSerializer.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/IntegerAllToStringSerializer.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RoleUtil.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index 022948ae..6599ca2b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -4,10 +4,14 @@ package org.springblade.desk.quality.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; +import org.springblade.desk.util.json.Integer0ToEmptyStringSerializer; +import org.springblade.desk.util.json.IntegerAllToStringSerializer; import java.io.Serial; import java.time.LocalDateTime; @@ -197,6 +201,8 @@ public class ReviewSheet extends BaseEntity { * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; */ @Schema(description = "[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;") + @JsonSerialize(using = IntegerAllToStringSerializer.class) + // @JsonSerialize(using = ToStringSerializer.class) private Integer reviewOrderMode; /** * 名称 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index c7b3eaaf..4843d8cf 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -3,12 +3,14 @@ package org.springblade.desk.quality.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.InspectionTask; import java.time.LocalDate; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class InspectionTaskSearch extends InspectionTask { @Schema(description = "流程卡号") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/RemindMsgSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/RemindMsgSearch.java new file mode 100644 index 00000000..119168cd --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/RemindMsgSearch.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springblade.desk.quality.pojo.entity.RemindMsg; + +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class RemindMsgSearch extends RemindMsg { + + @Schema(description = "零件名称") + private String partName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java index afdec040..15acb61e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java @@ -14,4 +14,12 @@ public class ReviewSheetErpSearch extends ReviewSheet { @Schema(description = "责任零件") private String dutyPart; + + private String createTimeStart; + + private String createTimeEnd; + + private String reviewTimeStart; + + private String reviewTimeEnd; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java index b8393159..3482b0e9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java @@ -32,4 +32,10 @@ public class ReviewSheetInitSearch extends ReviewSheet { private String createTimeStart; @Schema(description = "创建时间-结束") private String createTimeEnd; + @Schema(description = "审理时间-开始") + private String reviewTimeStart; + @Schema(description = "审理时间-结束") + private String reviewTimeEnd; + @Schema(description = "[外协厂商]名称") + private String oemName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java index a9e33b58..e000bf89 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -46,11 +46,11 @@ public class InspectionTaskListVO extends InspectionTask { @Schema(description = "车间订单号") private String woCode = "XXXX12345"; @Schema(description = "零件号") - private String partCode = "XXXX12345"; + private String partCode = ""; @Schema(description = "生产标识") private String prodIdent = "XXXX12345"; @Schema(description = "流程卡号") - private String cardNo = "XXXX12345"; + private String cardNo = ""; @Schema(description = "需求部门") private String needDeptName = "XXXX12345"; @Schema(description = "批次号") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java index e1afcb01..79744bf4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java @@ -5,6 +5,7 @@ package org.springblade.desk.quality.pojo.vo; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewDuty; import java.io.Serial; @@ -17,6 +18,7 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewDutyVO extends ReviewDuty { @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/ReviewFaultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java index c683498b..4aa11a5b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java @@ -6,6 +6,7 @@ package org.springblade.desk.quality.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewFault; import java.io.Serial; @@ -18,6 +19,7 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewFaultVO extends ReviewFault { @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 bf1b510c..a054dc0c 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 @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewSheet; import java.io.Serial; @@ -20,6 +21,7 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewSheetDetailVO extends ReviewSheet { @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 a9c7f038..509edaa5 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 @@ -33,7 +33,7 @@ public class ReviewSheetInitVO extends ReviewSheet { @Schema(description = "[生产处置单]模式 名称") private String reviewOrderModeName; @Schema(description = "打回[用户]真名") - private String backUserRealName; + private String backUserRealName; @Schema(description = "审理状态 名称") private String reviewStatusName; @Schema(description = "审理[用户]真名") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/Integer0ToEmptyStringSerializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/Integer0ToEmptyStringSerializer.java new file mode 100644 index 00000000..26767495 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/Integer0ToEmptyStringSerializer.java @@ -0,0 +1,31 @@ +package org.springblade.desk.util.json; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; + +import java.io.IOException; + +/** + * 自定义Integer序列化器：0值 或 null 序列化为空字符串，其他值正常序列化 + */ +public class Integer0ToEmptyStringSerializer extends StdScalarSerializer { + + /** + * 提供无参构造器，指定处理的类型为Integer + */ + public Integer0ToEmptyStringSerializer() { + super(Integer.class); + } + + @Override + public void serialize(Integer value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + // 核心逻辑：判断值是否为null或0，是则写空字符串，否则写原数值 + if (value == null || value == 0) { + gen.writeString(""); // 0或null时返回空字符串 + } else { + gen.writeNumber(value); // 非0数值正常返回数字 + } + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/IntegerAllToStringSerializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/IntegerAllToStringSerializer.java new file mode 100644 index 00000000..d3006594 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/IntegerAllToStringSerializer.java @@ -0,0 +1,30 @@ +package org.springblade.desk.util.json; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; + +import java.io.IOException; + +/** + * + */ +public class IntegerAllToStringSerializer extends StdScalarSerializer { + + /** + * + */ + public IntegerAllToStringSerializer() { + super(Integer.class); + } + + @Override + public void serialize(Integer value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + if (value == null || value == 0) { + gen.writeString(""); + } else { + gen.writeString("" + value); + } + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RoleUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RoleUtil.java new file mode 100644 index 00000000..2366ca5c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RoleUtil.java @@ -0,0 +1,52 @@ +package org.springblade.desk.basic.util; + +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.secure.utils.AuthUtil; + +public class RoleUtil { + + /** + * @param roleAlias 角色别名 + * @return 登录用户是否有角色 + */ + public static Boolean hasRole(String roleAlias) { + if (StringUtils.isBlank(roleAlias)) { + throw new IllegalArgumentException("roleAlias参数错误"); + } + return AuthUtil.getUserRole().contains(roleAlias); + } + + /** + * + * @param roleAliasArray + * @return 登录用户是否有所有角色（逻辑与关系） + */ + public static Boolean hasAllRole(String... roleAliasArray) { + if (roleAliasArray == null || roleAliasArray.length == 0) { + throw new IllegalArgumentException("roleAliasArray参数错误"); + } + for (String roleAlias : roleAliasArray) { + if (!hasRole(roleAlias)) { + return false; + } + } + return true; + } + + /** + * + * @param roleAliasArray + * @return 登录用户是否有任意角色（逻辑或关系） + */ + public static Boolean hasAnyRole(String... roleAliasArray) { + if (roleAliasArray == null || roleAliasArray.length == 0) { + throw new IllegalArgumentException("roleAliasArray参数错误"); + } + for (String roleAlias : roleAliasArray) { + if (hasRole(roleAlias)) { + return true; + } + } + return true; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java index 2945e512..c8a9d68a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java @@ -28,7 +28,7 @@ public interface ReviewSheetConst { /** * 新建 内部 ERP 都用 */ - Integer S_NEW = -1; + Integer S_NEW = 0; /** * 待审理 内部用 ERP不用 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 58c52764..e1bfb6bd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -27,6 +27,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.config.RoleConfig; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.pojo.vo.UrlVO; +import org.springblade.desk.basic.util.RoleUtil; import org.springblade.desk.quality.constant.CycleTestTaskConst; import org.springblade.desk.quality.constant.InspectionTaskConst; import org.springblade.desk.quality.constant.QAModuleConst; @@ -53,6 +54,7 @@ import java.util.Map; * 工序级的检验任务 * mes v1: rb_pr_work_check PrWorkCheck * + * ppsName:烧结包装防护 才有子件列表 * @author Tom Shuo * @since 2025-11-14 */ @@ -90,18 +92,19 @@ public class InspectionTaskController extends BladeController { @PostMapping("/listSearch") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") - public R> listSearch( - @Parameter(hidden = true) @RequestParam(required = false) InspectionTaskSearch search, Query query) { + public R> listSearch(@Valid @RequestBody InspectionTaskSearch search, + @RequestBody Query query) { + log.info("search = {}", search); + log.info("query = {}", query); log.info("getUserRole = {}", AuthUtil.getUserRole()); // 热表 烧结 检验员 数据区分。 - if (AuthUtil.getUserRole().contains(roleConfig.getRbCheckerAlias())) { + if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { search.setFromType(InspectionTaskConst.FROM_TYPE_RB); } - if (AuthUtil.getUserRole().contains(roleConfig.getSjCheckerAlias())) { + if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); } - if (AuthUtil.getUserRole().contains(roleConfig.getRbCheckerAlias()) && - AuthUtil.getUserRole().contains(roleConfig.getSjCheckerAlias())) { + if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { search.setFromType(null); } IPage pagesVO = service.listSearch(Condition.getPage(query), search); @@ -235,6 +238,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 101) @Operation(summary = "跳转-质量记录", description = "传入inspectionTask id") public R toQaRecord(@Parameter(hidden = true) @RequestParam Long id) { + // todo: fake url String url = "https://www.baidu.com" + "?id=" + id; return R.data(new UrlVO(url)); } @@ -243,6 +247,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 101) @Operation(summary = "跳转-合格证", description = "传入inspectionTask id") public R toCertificate(@Parameter(hidden = true) @RequestParam Long id) { + // todo: fake url String url = "https://www.baidu.com" + "?id=" + id; return R.data(new UrlVO(url)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java index fc1c2013..a769f8dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java @@ -22,12 +22,14 @@ 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.BeanUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RemindMsgExcel; import org.springblade.desk.quality.pojo.entity.RemindMsg; +import org.springblade.desk.quality.pojo.request.RemindMsgSearch; import org.springblade.desk.quality.pojo.vo.RemindMsgVO; import org.springblade.desk.quality.service.IRemindMsgService; import org.springblade.desk.quality.wrapper.RemindMsgWrapper; @@ -56,184 +58,186 @@ import java.util.stream.Collectors; public class RemindMsgController extends BladeController { @Resource - private IRemindMsgService service; - - /** - * [提醒信息] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入RemindMsg Obj") - public R detail(RemindMsg remindMsg) { - QueryWrapper qw = Condition.getQueryWrapper(remindMsg); - RemindMsg detail = service.getOne(qw); - RemindMsgVO detailVO = RemindMsgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [提醒信息] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入RemindMsg Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map remindMsg, - Query query) { - QueryWrapper qw = Condition.getQueryWrapper(remindMsg, RemindMsg.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = RemindMsgWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [提醒信息] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入RemindMsg Obj") - public R> page(RemindMsgVO remindMsg, Query query) { - IPage pagesVO = service.selectRemindMsgPage( - Condition.getPage(query), remindMsg - ); - return R.data(pagesVO); - } - - /** + private IRemindMsgService service; + + /** + * [提醒信息] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入RemindMsg Obj") + public R detail(RemindMsg remindMsg) { + QueryWrapper qw = Condition.getQueryWrapper(remindMsg); + RemindMsg detail = service.getOne(qw); + RemindMsgVO detailVO = RemindMsgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [提醒信息] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入RemindMsg Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map map, + Query query) { + RemindMsgSearch search = BeanUtil.toBean(map, RemindMsgSearch.class); + String partName = map.get("partName").toString(); + QueryWrapper qw = Condition.getQueryWrapper(map, RemindMsg.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = RemindMsgWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [提醒信息] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入RemindMsg Obj") + public R> page(RemindMsgVO remindMsg, Query query) { + IPage pagesVO = service.selectRemindMsgPage( + Condition.getPage(query), remindMsg + ); + return R.data(pagesVO); + } + + /** * [提醒信息] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = RemindMsgWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = RemindMsgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [提醒信息] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入RemindMsg Obj") + public R save(@Valid @RequestBody RemindMsg addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [提醒信息] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入RemindMsg Obj") - public R save(@Valid @RequestBody RemindMsg addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [提醒信息] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入RemindMsg 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 = "传入RemindMsg Obj") - public R update(@Valid @RequestBody RemindMsg updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入RemindMsg 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 = "传入RemindMsg Obj") + public R update(@Valid @RequestBody RemindMsg updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [提醒信息] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入RemindMsg List") + @Operation(summary = "修改批量", description = "传入RemindMsg List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [提醒信息] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入RemindMsg Obj") - public R submit(@Valid @RequestBody RemindMsg mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [提醒信息] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入RemindMsg Obj") + public R submit(@Valid @RequestBody RemindMsg mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [提醒信息] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入RemindMsg 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 = "传入RemindMsg") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map remindMsg, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(remindMsg, RemindMsg.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(RemindMsg::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(RemindMsgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportRemindMsg(qw); - ExcelUtil.export(response, "[提醒信息]数据" + DateUtil.time(), - "[提醒信息]数据表", list, RemindMsgExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入RemindMsg 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 = "传入RemindMsg") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map remindMsg, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(remindMsg, RemindMsg.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(RemindMsg::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(RemindMsgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportRemindMsg(qw); + ExcelUtil.export(response, "[提醒信息]数据" + DateUtil.time(), + "[提醒信息]数据表", list, RemindMsgExcel.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, RemindMsg.class - ); - return R.status(service.saveBatch(importList)); - } + @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, RemindMsg.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 60adf159..094d6155 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 @@ -25,10 +25,8 @@ 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.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; -import org.springblade.desk.quality.constant.ReviewSheetConst; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewDuty; import org.springblade.desk.quality.pojo.entity.ReviewFault; @@ -36,7 +34,6 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; -import org.springblade.desk.quality.pojo.request.ReviewSheetSelfSearch; import org.springblade.desk.quality.pojo.vo.*; import org.springblade.desk.quality.service.IReviewDutyService; import org.springblade.desk.quality.service.IReviewFaultService; @@ -84,7 +81,7 @@ public class ReviewSheetController extends BladeController { QueryWrapper qw = Condition.getQueryWrapper(reviewSheet); ReviewSheet detail = service.getOne(qw); ReviewSheetDetailVO detailVO = ReviewSheetDetailWrapper.build().entityVO(detail); - service.setVOValue(detailVO); + service.setDetailVOValue(detailVO); return R.data(detailVO); } @@ -114,23 +111,24 @@ public class ReviewSheetController extends BladeController { @PostMapping("/listInit") @ApiOperationSupport(order = 20) @Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj") - public R> listInit(@Parameter() @RequestBody - ReviewSheetInitSearch search, Query query) { - Map demo = new HashMap(); - demo.put(BaseRequest.STATUS, ReviewSheetConst.STATUS.S_INIT); - QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetInitWrapper.build().pageVO(pages); - - // todo: -// pagesVO.getRecords() -// .stream() -// .peek(service::setVOValue) -// .collect(Collectors.toList()); + public R> listInit(@Valid @RequestBody ReviewSheetInitSearch search, + @RequestBody Query query) { + // - for (ReviewSheetInitVO initVO : pagesVO.getRecords()) { - initVO.setDocCode("" + initVO.getId()); - } +// Map demo = new HashMap(); +// if (search.getStatus() == null) { +// demo.put(BaseRequest.STATUS, ReviewSheetConst.STATUS.S_INIT); +// } +// QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = ReviewSheetInitWrapper.build().pageVO(pages); +// for (ReviewSheetInitVO initVO : pagesVO.getRecords()) { +// // todo: fake data. +// initVO.setDocCode("" + initVO.getId()); +// } +// return R.data(pagesVO); + + IPage pagesVO = service.listInit(Condition.getPage(query), search); return R.data(pagesVO); } @@ -140,24 +138,25 @@ public class ReviewSheetController extends BladeController { @PostMapping("/listReviewRedoScrap") @ApiOperationSupport(order = 20) @Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj") - public R> listReviewRedoScrap(@Parameter() @RequestBody - ReviewSheetRedoScrapSearch search, Query query) { + public R> listReviewRedoScrap(@Valid @RequestBody ReviewSheetRedoScrapSearch search, + @RequestBody Query query) { // todo: mapper - Map demo = new HashMap(); - QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - Integer bizType = search.getBizType(); - if (bizType != null && bizType != 0) { - qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType()); - } else { - qw.ne(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_ERP); - } - // qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setRedoScrapVOValue) - .collect(Collectors.toList()); +// Map demo = new HashMap(); +// QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); +// Integer bizType = search.getBizType(); +// if (bizType != null && bizType != 0) { +// qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType()); +// } else { +// qw.ne(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_ERP); +// } +// // qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages); +// pagesVO.getRecords() +// .stream() +// .peek(service::setRedoScrapVOValue) +// .collect(Collectors.toList()); + IPage pagesVO = service.listReviewRedoScrap(Condition.getPage(query), search); return R.data(pagesVO); } @@ -187,18 +186,20 @@ public class ReviewSheetController extends BladeController { @PostMapping("/listErp") @ApiOperationSupport(order = 20) @Operation(summary = "Erplist分页", description = "传入ReviewSheet Obj") - public R> listErp(@Parameter() @RequestBody ReviewSheetErpSearch search, - Query query) { - Map demo = new HashMap(); - // todo: mapper - QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - qw.eq(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_ERP); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetErpWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setErpVOValue) - .collect(Collectors.toList()); + public R> listErp(@Valid @RequestBody ReviewSheetErpSearch search, + @RequestBody Query query) { +// Map demo = new HashMap(); +// // todo: mapper +// QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); +// qw.eq(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_ERP); +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = ReviewSheetErpWrapper.build().pageVO(pages); +// pagesVO.getRecords() +// .stream() +// .peek(service::setErpVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); + IPage pagesVO = service.listErp(Condition.getPage(query), search); return R.data(pagesVO); } @@ -217,8 +218,8 @@ public class ReviewSheetController extends BladeController { @PostMapping("/getHisWOList") @ApiOperationSupport(order = 20) @Operation(summary = "历史已经完成的车间订单", description = "Obj") - public R> getHisWOList(@Parameter() @RequestBody ReviewSheetErpSearch search, - Query query) { + public R> getHisWOList(@Valid @RequestBody ReviewSheetErpSearch search, + @RequestBody Query query) { List list = new ArrayList<>(); ReviewSheetHisWOVO vo1 = new ReviewSheetHisWOVO(); vo1.setWoId(1000L); @@ -474,11 +475,11 @@ public class ReviewSheetController extends BladeController { @ApiOperationSupport(order = 51) @Operation(summary = "相关零件list", description = "") public R getRSRelevantPartList(@Parameter(description = "id") @RequestParam Long id) { - ReviewSheetRelevantPartVO vo1 = new ReviewSheetRelevantPartVO("21E8-571-3000-K5"); - ReviewSheetRelevantPartVO vo2 = new ReviewSheetRelevantPartVO("21E8-003-11234-K5"); - ReviewSheetRelevantPartVO vo3 = new ReviewSheetRelevantPartVO("21E8-001-1625-H8-N"); - ReviewSheetRelevantPartVO vo4 = new ReviewSheetRelevantPartVO("21E8-570-3238-K8"); - ReviewSheetRelevantPartVO vo5 = new ReviewSheetRelevantPartVO("21E8-570-1066-K5"); + ReviewSheetRelevantPartVO vo1 = new ReviewSheetRelevantPartVO("21E6-575-16015_002-H13(SJ)"); + ReviewSheetRelevantPartVO vo2 = new ReviewSheetRelevantPartVO("21E6-575-13821-B1"); + ReviewSheetRelevantPartVO vo3 = new ReviewSheetRelevantPartVO("21E6-575-13635_001-H39-N"); + ReviewSheetRelevantPartVO vo4 = new ReviewSheetRelevantPartVO("21E6-575-14734-001-B1"); + ReviewSheetRelevantPartVO vo5 = new ReviewSheetRelevantPartVO("21E6-575-10381_002-K5"); List list = new ArrayList<>(); list.add(vo1); list.add(vo2); 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 cbe155f0..0521ad3f 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 @@ -64,7 +64,9 @@ - SELECT rs.* + SELECT rs.*, + wo.WO_CODE AS woCode FROM QA_REVIEW_SHEET rs -- 车间作业计划 wp LEFT JOIN MES_WORK_PLAN wp ON rs.WP_ID = wp.ID @@ -75,9 +76,9 @@ LEFT JOIN BA_OEM oem ON wp.OC_ID = oem.ID WHERE ( rs.IS_DELETED = 0 - AND wp.IS_DELETED = 0 - AND wo.IS_DELETED = 0 - AND oem.IS_DELETED = 0 + -- AND wp.IS_DELETED = 0 + -- AND wo.IS_DELETED = 0 + -- AND oem.IS_DELETED = 0 ) AND rs.STATUS = #{q.status} @@ -94,16 +95,16 @@ AND rs.RS_CODE = #{q.rsCode} - + AND wo.XXXX = #{q.prodCode} - + AND wo.XXXX = #{q.prodName} - + AND wo.XXXX = #{q.prodTypeName} - + AND wo.XXXX = #{q.prodIdent} @@ -136,7 +137,7 @@ AND oem.ABBREVIATION = '%' || #{q.oemName} || '%' - ORDER BY task.ID DESC + ORDER BY rs.ID DESC diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java index 034fd853..e9576934 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java @@ -6,13 +6,14 @@ package org.springblade.desk.quality.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.v3.oas.annotations.Parameter; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; import org.springblade.desk.quality.pojo.vo.*; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -41,14 +42,14 @@ public interface IReviewSheetService extends EnBaseService { */ List exportReviewSheet(Wrapper queryWrapper); - void setVOValue(ReviewSheetDetailVO vo); + void setDetailVOValue(ReviewSheetDetailVO vo); + + void setInitVOValue(ReviewSheetInitVO vo); void setRedoScrapVOValue(ReviewSheetRedoScrapVO vo); void setErpVOValue(ReviewSheetErpVO vo); - void setSelfVOValue(ReviewSheetSelfVO vo); - /** *

方法名: getByTrialId

*

方法描述: 按审理单erpId查询

@@ -139,4 +140,10 @@ public interface IReviewSheetService extends EnBaseService { R sameCopyFromHiWO(Long id, Long woId); ReviewSheet getOneByWoId(Long woId); + + IPage listInit(IPage page, ReviewSheetInitSearch search); + + IPage listReviewRedoScrap(IPage page, ReviewSheetRedoScrapSearch search); + + IPage listErp(IPage page, ReviewSheetErpSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 7fc48a17..c9e48175 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -405,8 +405,17 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl uiR = userClient.userInfo(vo.getReviewUserId()); if (uiR != null && uiR.isSuccess() && uiR.getData() != null) { vo.setReviewUserRealName(uiR.getData().getUser().getRealName()); } } - } - - @Override - public void setSelfVOValue(ReviewSheetSelfVO vo) { - + // 责任零件 + StringBuilder sbDutyPart = new StringBuilder(); + // 责任批号 + StringBuilder sbDutyBatNo = new StringBuilder(); + // 查询明细表 + List listRD = dutyService.listByReviewSheetId(vo.getId()); + for (ReviewDuty reviewDuty : listRD) { + sbDutyPart.append(reviewDuty.getDutyPart()).append(","); + sbDutyBatNo.append(reviewDuty.getDutyBatch()).append(","); + } + vo.setDutyPart(sbDutyPart.toString()); + vo.setDutyBatNo(sbDutyBatNo.toString()); } /** @@ -238,7 +260,10 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listInit(IPage page, ReviewSheetInitSearch search) { + List listVO = baseMapper.listInit(page, search); + for (ReviewSheetInitVO oneVO : listVO) { + setInitVOValue(oneVO); + } + return page.setRecords(listVO); + } + + @Override + public IPage listReviewRedoScrap(IPage page, ReviewSheetRedoScrapSearch search) { + List listVO = baseMapper.listReviewRedoScrap(page, search); + for (ReviewSheetRedoScrapVO oneVO : listVO) { + setRedoScrapVOValue(oneVO); + } + return page.setRecords(listVO); + } + + @Override + public IPage listErp(IPage page, ReviewSheetErpSearch search) { + List listVO = baseMapper.listErp(page, search); + for (ReviewSheetErpVO oneVO : listVO) { + setErpVOValue(oneVO); + } + return page.setRecords(listVO); + } + @Override public ReviewSheet getByRsCode(String rsCode) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java deleted file mode 100644 index e56d367b..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.springblade.desk.quality.util; - -import org.apache.commons.lang3.StringUtils; -import org.springblade.core.secure.utils.AuthUtil; - -public class RoleUtil { - - - /** - * API权限 - * todo: - * @param roleAlias - * @return - */ - public static Boolean hasRole(String roleAlias) { - if (StringUtils.isBlank(roleAlias)) { - throw new IllegalArgumentException("roleAlias参数错误"); - } - return false; - } -}