From ff95983768bc64c7c3c0f966a3f5ee4582ea0599 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 19 Jan 2026 14:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/pojo/entity/AuditFile.java | 162 ++++---- .../quality/pojo/entity/LiquidTankTask.java | 27 ++ .../desk/quality/pojo/entity/RemindMsg.java | 358 +++++++++--------- .../quality/pojo/request/AuditFileSearch.java | 2 + .../pojo/request/CycleTestItemSubmit.java | 2 + .../quality/pojo/request/CycleTestSubmit.java | 2 + .../desk/quality/pojo/vo/RemindMsgVO.java | 5 - .../desk/basic/service/ITeamSetService.java | 8 + .../service/impl/TeamSetServiceImpl.java | 12 + .../desk/quality/constant/AuditFileConst.java | 2 + .../quality/constant/LiquidTankTaskConst.java | 5 +- .../controller/AuditFileController.java | 18 +- .../controller/RemindMsgController.java | 5 +- .../desk/quality/mapper/AuditFileMapper.xml | 7 +- .../quality/mapper/LiquidTankTaskMapper.xml | 3 + .../desk/quality/mapper/RemindMsgMapper.java | 2 - .../desk/quality/mapper/RemindMsgMapper.xml | 1 + .../desk/quality/mapper/ReviewSheetMapper.xml | 8 +- .../service/LiquidTankTaskSetVoService.java | 7 +- .../service/impl/AuditFileServiceImpl.java | 2 +- .../impl/LiquidTankTaskServiceImpl.java | 27 +- .../service/impl/RemindMsgServiceImpl.java | 14 +- 22 files changed, 379 insertions(+), 300 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java index 86188dba..c02c65c8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java @@ -4,10 +4,13 @@ package org.springblade.desk.quality.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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.serializer.Integer0ToEmptyStringSerializer; +import org.springblade.desk.util.json.serializer.IntegerAllToStringSerializer; import java.io.Serial; import java.math.BigDecimal; @@ -24,94 +27,95 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) public class AuditFile extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * 名称 - */ + /** + * 名称 + */ public static final String COL_NAME = "NAME"; - /** - * [工序]id - */ + /** + * [工序]id + */ public static final String COL_PPS_ID = "PPS_ID"; - /** - * [作业中心]id - */ + /** + * [作业中心]id + */ public static final String COL_WC_ID = "WC_ID"; - /** - * [生产标识]id - */ + /** + * [生产标识]id + */ public static final String COL_PQ_ID = "PQ_ID"; - /** - * [生产标识]编码 - */ + /** + * [生产标识]编码 + */ public static final String COL_PQ_CODE = "PQ_CODE"; - /** - * 引用文件/版本号 - */ + /** + * 引用文件/版本号 + */ public static final String COL_REFERENCE_FILE = "REFERENCE_FILE"; - /** - * 工艺文件编号/版本号 - */ + /** + * 工艺文件编号/版本号 + */ public static final String COL_PAPERS = "PAPERS"; - /** - * 排序 - */ + /** + * 排序 + */ public static final String COL_SORT = "SORT"; - /** - * 备注 - */ + /** + * 备注 + */ public static final String COL_REMARK = "REMARK"; - /** - * 名称 - */ - @Schema(description = "名称") - private String name; - /** - * [工序]id - */ - @Schema(description = "[工序]id") - private Long ppsId; - /** - * [作业中心]id - */ - @Schema(description = "[作业中心]id") - private Long wcId; - /** - * [生产标识]id - */ - @Schema(description = "[生产标识]id") - private Long pqId; - /** - * [生产标识]编码 - */ - @Schema(description = "[生产标识]编码") - private String pqCode; - /** - * 引用文件/版本号 - */ - @Schema(description = "引用文件/版本号") - private String referenceFile; - /** - * 工艺文件编号/版本号 - */ - @Schema(description = "工艺文件编号/版本号") - private String papers; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 产品应用领域 - */ - @Schema(description = "产品应用领域") - private Integer prodApplyArea; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private Long ppsId; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + private Long wcId; + /** + * [生产标识]id + */ + @Schema(description = "[生产标识]id") + private Long pqId; + /** + * [生产标识]编码 + */ + @Schema(description = "[生产标识]编码") + private String pqCode; + /** + * 引用文件/版本号 + */ + @Schema(description = "引用文件/版本号") + private String referenceFile; + /** + * 工艺文件编号/版本号 + */ + @Schema(description = "工艺文件编号/版本号") + private String papers; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 产品应用领域 + */ + @Schema(description = "产品应用领域") + @JsonSerialize(using = Integer0ToEmptyStringSerializer.class) + private Integer prodApplyArea; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java index decec152..d557b09e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java @@ -227,6 +227,18 @@ public class LiquidTankTask extends BaseEntity { * 备注 */ public static final String COL_REMARK = "REMARK"; + /** + * 撤回原因 + */ + public static final String COL_REVOKE_REASON = "REVOKE_REASON"; + /** + * 首次填报时间 + */ + public static final String COL_FIRST_FILL_DATE = "FIRST_FILL_DATE"; + /** + * 复检填报时间 + */ + public static final String COL_REPEAT_FILL_DATE = "REPEAT_FILL_DATE"; /** * [槽液检测任务]编码 @@ -478,4 +490,19 @@ public class LiquidTankTask extends BaseEntity { */ @Schema(description = "备注") private String remark; + /** + * 撤回原因 + */ + @Schema(description = "撤回原因") + private String revokeReason; + /** + * 首次填报时间 + */ + @Schema(description = "首次填报时间") + private LocalDateTime firstFillDate; + /** + * 复检填报时间 + */ + @Schema(description = "复检填报时间") + private LocalDateTime repeatFillDate; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java index ca4df634..b5595dbc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java @@ -6,9 +6,12 @@ package org.springblade.desk.quality.pojo.entity; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; + import java.math.BigDecimal; + import org.springblade.core.mp.base.BaseEntity; import lombok.EqualsAndHashCode; + import java.io.Serial; /** @@ -23,179 +26,188 @@ import java.io.Serial; @EqualsAndHashCode(callSuper = true) public class RemindMsg extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * 编码 - */ - public static final String COL_CODE = "CODE"; - /** - * 类型 - */ - public static final String COL_REMIND_MSG_TYPE = "REMIND_MSG_TYPE"; - /** - * [零件]id - */ - public static final String COL_PART_ID = "PART_ID"; - /** - * [零件]编码 - */ - public static final String COL_PART_CODE = "PART_CODE"; - /** - * 是否热处理 - */ - public static final String COL_IS_HEAT_TREATMENT = "IS_HEAT_TREATMENT"; - /** - * 是否镀后检验 - */ - public static final String COL_IS_AFTER_PLATING = "IS_AFTER_PLATING"; - /** - * 质量等级 - */ - public static final String COL_QUALITY_LEVEL = "QUALITY_LEVEL"; - /** - * 镀金检测 - */ - public static final String COL_TEST_AU = "TEST_AU"; - /** - * 镀银检测 - */ - public static final String COL_TEST_AG = "TEST_AG"; - /** - * 提醒内容 - */ - public static final String COL_REMIND_CONTENT = "REMIND_CONTENT"; - /** - * 排序 - */ - public static final String COL_SORT = "SORT"; - /** - * 备注 - */ - public static final String COL_REMARK = "REMARK"; - /** - * 子[零件]id - */ - public static final String COL_SUB_PART_ID = "SUB_PART_ID"; - /** - * 子[零件]编码 - */ - public static final String COL_SUB_PART_CODE = "SUB_PART_CODE"; - /** - * 生产标识 - */ - public static final String COL_PROD_FLAG_TEXT = "PROD_FLAG_TEXT"; - /** - * 参数1 - */ - public static final String COL_PARAM_1 = "PARAM_1"; - /** - * 参数2 - */ - public static final String COL_PARAM_2 = "PARAM_2"; - /** - * 参数3 - */ - public static final String COL_PARAM_3 = "PARAM_3"; - /** - * 参数4 - */ - public static final String COL_PARAM_4 = "PARAM_4"; + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 类型 + */ + public static final String COL_REMIND_MSG_TYPE = "REMIND_MSG_TYPE"; + /** + * [零件]id + */ + public static final String COL_PART_ID = "PART_ID"; + /** + * [零件]编码 + */ + public static final String COL_PART_CODE = "PART_CODE"; + /** + * 是否热处理 + */ + public static final String COL_IS_HEAT_TREATMENT = "IS_HEAT_TREATMENT"; + /** + * 是否镀后检验 + */ + public static final String COL_IS_AFTER_PLATING = "IS_AFTER_PLATING"; + /** + * 质量等级 + */ + public static final String COL_QUALITY_LEVEL = "QUALITY_LEVEL"; + /** + * 镀金检测 + */ + public static final String COL_TEST_AU = "TEST_AU"; + /** + * 镀银检测 + */ + public static final String COL_TEST_AG = "TEST_AG"; + /** + * 提醒内容 + */ + public static final String COL_REMIND_CONTENT = "REMIND_CONTENT"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 子[零件]id + */ + public static final String COL_SUB_PART_ID = "SUB_PART_ID"; + /** + * 子[零件]编码 + */ + public static final String COL_SUB_PART_CODE = "SUB_PART_CODE"; + /** + * 生产标识 + */ + public static final String COL_PROD_FLAG_TEXT = "PROD_FLAG_TEXT"; + /** + * 参数1 + */ + public static final String COL_PARAM_1 = "PARAM_1"; + /** + * 参数2 + */ + public static final String COL_PARAM_2 = "PARAM_2"; + /** + * 参数3 + */ + public static final String COL_PARAM_3 = "PARAM_3"; + /** + * 参数4 + */ + public static final String COL_PARAM_4 = "PARAM_4"; + /** + * [零件]名称 + */ + public static final String PART_NAME = "PART_NAME"; - /** - * 编码 - */ - @Schema(description = "编码") - private String code; - /** - * 类型 - */ - @Schema(description = "类型") - private Long remindMsgType; - /** - * [零件]id - */ - @Schema(description = "[零件]id") - private Long partId; - /** - * [零件]编码 - */ - @Schema(description = "[零件]编码") - private String partCode; - /** - * 是否热处理 - */ - @Schema(description = "是否热处理") - private String isHeatTreatment; - /** - * 是否镀后检验 - */ - @Schema(description = "是否镀后检验") - private String isAfterPlating; - /** - * 质量等级 - */ - @Schema(description = "质量等级") - private String qualityLevel; - /** - * 镀金检测 - */ - @Schema(description = "镀金检测") - private String testAu; - /** - * 镀银检测 - */ - @Schema(description = "镀银检测") - private String testAg; - /** - * 提醒内容 - */ - @Schema(description = "提醒内容") - private String remindContent; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 子[零件]id - */ - @Schema(description = "子[零件]id") - private Long subPartId; - /** - * 子[零件]编码 - */ - @Schema(description = "子[零件]编码") - private String subPartCode; - /** - * 生产标识 - */ - @Schema(description = "生产标识") - private String prodFlagText; - /** - * 参数1 - */ - @Schema(description = "参数1") - private String param1; - /** - * 参数2 - */ - @Schema(description = "参数2") - private String param2; - /** - * 参数3 - */ - @Schema(description = "参数3") - private String param3; - /** - * 参数4 - */ - @Schema(description = "参数4") - private String param4; + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long remindMsgType; + /** + * [零件]id + */ + @Schema(description = "[零件]id") + private Long partId; + /** + * [零件]编码 + */ + @Schema(description = "[零件]编码") + private String partCode; + /** + * 是否热处理 + */ + @Schema(description = "是否热处理") + private String isHeatTreatment; + /** + * 是否镀后检验 + */ + @Schema(description = "是否镀后检验") + private String isAfterPlating; + /** + * 质量等级 + */ + @Schema(description = "质量等级") + private String qualityLevel; + /** + * 镀金检测 + */ + @Schema(description = "镀金检测") + private String testAu; + /** + * 镀银检测 + */ + @Schema(description = "镀银检测") + private String testAg; + /** + * 提醒内容 + */ + @Schema(description = "提醒内容") + private String remindContent; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 子[零件]id + */ + @Schema(description = "子[零件]id") + private Long subPartId; + /** + * 子[零件]编码 + */ + @Schema(description = "子[零件]编码") + private String subPartCode; + /** + * 生产标识 + */ + @Schema(description = "生产标识") + private String prodFlagText; + /** + * 参数1 + */ + @Schema(description = "参数1") + private String param1; + /** + * 参数2 + */ + @Schema(description = "参数2") + private String param2; + /** + * 参数3 + */ + @Schema(description = "参数3") + private String param3; + /** + * 参数4 + */ + @Schema(description = "参数4") + private String param4; + /** + * [零件]名称 + */ + @Schema(description = "[零件]名称") + private String partName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java index 8554b322..b626887e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java @@ -3,10 +3,12 @@ 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.AuditFile; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class AuditFileSearch extends AuditFile { @Schema(description = "") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java index e2fd6c89..bd878af9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java @@ -3,10 +3,12 @@ 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.CycleTestItem; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class CycleTestItemSubmit extends CycleTestItem { /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java index 36d3a4c5..135d6bd2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java @@ -3,10 +3,12 @@ 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.CycleTest; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class CycleTestSubmit extends CycleTest { /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java index b2e7df50..226690d2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java @@ -22,11 +22,6 @@ public class RemindMsgVO extends RemindMsg { @Serial private static final long serialVersionUID = 1L; - /** - * todo: - */ - @Schema(description = "零件名称") - private String partName = ""; @Schema(description = "材料名称") private String matName = ""; @Schema(description = "镀种名称") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java index 853de900..ca939f00 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java @@ -93,4 +93,12 @@ public interface ITeamSetService extends BaseService { * @return */ R setExChangeTime(Long id, String exChangeTime); + + /** + * 获取班组长[用户]id + * + * @param id + * @return + */ + Long getTeamSetLeader(Long id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java index 3f6738f3..0b7f133f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java @@ -24,6 +24,7 @@ import org.springblade.desk.basic.pojo.vo.TeamSetVO; import org.springblade.desk.basic.service.IRelTeamSetUserService; import org.springblade.desk.basic.service.ITeamSetService; import org.springblade.desk.order.pojo.entity.YieldPlan; +import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.User; import org.springframework.stereotype.Service; @@ -45,6 +46,9 @@ public class TeamSetServiceImpl extends BaseServiceImpl @Resource private IRelTeamSetUserService relTeamSetUserService; + @Resource + private IUserClient userClient; + @Override public IPage selectTeamSetPage(IPage page, TeamSetVO teamSet) { return page.setRecords(baseMapper.selectTeamSetPage(page, teamSet)); @@ -107,4 +111,12 @@ public class TeamSetServiceImpl extends BaseServiceImpl f.setExChangeTime(exChangeTime); return R.status(updateById(f)); } + + @Override + public Long getTeamSetLeader(Long id) { + TeamSet f = getById(id); + // todo:班组长 都为管理员 + // return f.getTeamLeader(); + return 2004027390417698818L; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java index fb6295f9..2a3815f3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java @@ -5,4 +5,6 @@ public interface AuditFileConst { Integer S_NORMAL = 1; Integer S_ABANDON = 2; + + String DICT_KEY = "AuditFile-Status"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java index 4dd2c0dd..0809e9d6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java @@ -28,7 +28,7 @@ public interface LiquidTankTaskConst { */ Integer S_PENDING_TEST = 2; /** - * 状态-已填报，待自动计算加药量-检测员填报 不显示 + * 状态-已填报，待自动计算加药量-检测员填报 UI不显示 */ Integer S_DATA_FIRST = 3; /** @@ -40,7 +40,7 @@ public interface LiquidTankTaskConst { */ Integer S_PENDING_REVIEW = 5; /** - * 状态-:已经通过加药量审核，待领药-工艺员同意 + * 状态-已经通过加药量审核，待领药-工艺员同意 */ Integer S_PENDING_SEND_DRUG = 6; /** @@ -74,6 +74,7 @@ public interface LiquidTankTaskConst { */ Integer FILL_DATA_SECOND = 2; + Integer REVIEW_INIT = 0; Integer REVIEW_YES = 1; Integer REVIEW_NO = 2; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index 14b956f2..7531436d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.controller; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -84,20 +85,8 @@ public class AuditFileController extends BladeController { public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { // QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); - AuditFileSearch search = new AuditFileSearch(); - // todo: Func 用法 - if (map.containsKey(AuditFile.COL_PPS_ID)) { - search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); - } - if (map.containsKey(AuditFile.COL_PQ_ID)) { - search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); - } - if (map.containsKey(BaseRequest.KEEP_USER_REAL_NAME)) { - search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); - } - if (map.containsKey(BaseCol.STATUS)) { - search.setStatus(Func.toInt(map.get(BaseCol.STATUS))); - } + AuditFileSearch search = BeanUtil.toBeanIgnoreError(map, AuditFileSearch.class); + log.info("search = " + search); IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() @@ -140,6 +129,7 @@ public class AuditFileController extends BladeController { @Operation(summary = "新增一条", description = "传入AuditFile Obj") public R save(@Valid @RequestBody AuditFile addOne) { addOne.setId(null); + log.info("addOne = {}", addOne); return R.status(service.save(addOne)); } 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 a769f8dd..5672b76f 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 @@ -83,8 +83,11 @@ public class RemindMsgController extends BladeController { public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { RemindMsgSearch search = BeanUtil.toBean(map, RemindMsgSearch.class); - String partName = map.get("partName").toString(); + if (map.containsKey("partName")) { + String partName = map.get("partName").toString(); + } QueryWrapper qw = Condition.getQueryWrapper(map, RemindMsg.class); + qw.like(map.containsKey("partName"), RemindMsg.PART_NAME, map.get("partName")); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = RemindMsgWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml index 06fb0f6c..eef87a97 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml @@ -33,7 +33,12 @@ FROM QA_AUDIT_FILE f LEFT JOIN BLADE_USER u ON (f.CREATE_USER = u.ID OR f.UPDATE_USER = u.ID) - WHERE (f.IS_DELETED = 0 AND u.IS_DELETED = 0) + WHERE ( + f.IS_DELETED = 0 + ) + + AND f.STATUS = #{q.status} + AND f.PPS_ID = #{q.ppsId} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml index 052b7a8f..c539f208 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml @@ -56,6 +56,9 @@ + + + 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 4d47f7f9..5cc3b195 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 @@ -108,16 +108,16 @@ AND wo.XXXX = #{q.prodIdent} - + AND rs.BATCH_NO = #{q.batchNo} - + AND wo.CARD_NO = #{q.cardNo} - + AND rs.CREATE_TIME >= #{q.createTimeStart} - + AND rs.CREATE_TIME <= #{q.createTimeEnd} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java index b233b56e..2b61ff5a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java @@ -92,20 +92,23 @@ public class LiquidTankTaskSetVoService { vo.setProcessUserRealName(processUI.getUser().getRealName()); } } + // 审核人 if (IdUtil.isValid(vo.getReviewUserId())) { UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData(); if (reviewUI != null) { vo.setReviewUserRealName(reviewUI.getUser().getRealName()); } } + // 发药人 if (IdUtil.isValid(vo.getSendDrugUserId())) { UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData(); if (sendUI != null) { vo.setSendDurgUserRealName(sendUI.getUser().getRealName()); } } - if (IdUtil.isValid(vo.getReviewUserId())) { - UserInfo receiveUI = userClient.userInfo(vo.getReviewUserId()).getData(); + // 领药人 + if (IdUtil.isValid(vo.getReceiveDrugUserId())) { + UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData(); if (receiveUI != null) { vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index 069ea2e9..e4abdf42 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -64,7 +64,7 @@ public class AuditFileServiceImpl extends EnBaseServiceImpl list = Func.toLongList(ids); for (Long id : list) { LiquidTankTask task = baseMapper.selectById(id); - if (reviewPass == LiquidTankTaskConst.REVIEW_YES) { + if (Objects.equals(reviewPass, LiquidTankTaskConst.REVIEW_YES)) { // todo: flag // todo: 是否需要加药？ // 审核通过 @@ -169,7 +172,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl list) { + // 用户权限过滤 for (LiquidTankTask task : list) { task.setStatus(LiquidTankTaskConst.S_PENDING_FILL_DATA_SECOND); // basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_FILL_DATA_SECOND); - // - task.setReceiveDrugUserId(AuthUtil.getUserId()); + // 领药人 为指定班组 班组长 + // task.setReceiveDrugUserId(AuthUtil.getUserId()); + Long teamId = task.getTeamId(); + task.setReceiveDrugUserId(teamSetService.getTeamSetLeader(teamId)); // 领药时间 task.setReceiveDrugDate(LocalDateTime.now()); basicUpdateById(task); @@ -233,10 +241,11 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl