From 5848ad9bbeda1470884d0355f4e1a264658e9f55 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Sat, 16 May 2026 15:14:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8F=E7=94=B3=E6=8A=A5?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/pojo/entity/PlateGoodsApply.java | 24 +++++++++++++++++ .../controller/PlateGoodsApplyController.java | 14 +++++++++- .../service/IPlateGoodsApplyService.java | 8 ++++++ .../impl/PlateGoodsApplyServiceImpl.java | 26 +++++++++++++++++++ .../impl/PlateGoodsRecordServiceImpl.java | 1 + 5 files changed, 72 insertions(+), 1 deletion(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java index 2fdecb938..39dec399b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java @@ -101,4 +101,28 @@ public class PlateGoodsApply extends BaseEntity { @Schema(description = "已申报定额总量") @TableField(value = "DECLARED_QUOTA_TOTAL") private BigDecimal declaredQuotaTotal; + + /** + * 二级审批人 + */ + @TableField(value = "APPROVAL_MAN2") + private Long approvalMan2; + + /** + * 二级审批时间 + */ + @TableField(value = "APPROVAL_TIME2") + private Date approvalTime2; + + /** + * 二级审批状态 + */ + @TableField(value = "APPROVAL_STATUS2") + private Integer approvalStatus2; + + /** + * 二级审批结果/备注 + */ + @TableField(value = "APPROVAL_MEMO2") + private String approvalMemo2; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java index 80652c53b..794b12d87 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java @@ -89,7 +89,7 @@ public class PlateGoodsApplyController extends BladeController { List recordIdList = saveData.getRecordIdList(); plateGoodsApplyService.save(apply, assayContentDetailList, recordIdList); - mesNotifyMessageService.saveMsg(BizTypeConstant.GOODS_APPLY, "", "", apply.getApprovalMan()); +// mesNotifyMessageService.saveMsg(BizTypeConstant.GOODS_APPLY, "", "", apply.getApprovalMan()); return R.status(true); } @@ -104,4 +104,16 @@ public class PlateGoodsApplyController extends BladeController { Boolean result = plateGoodsApplyService.confirmBatch(Func.toLongList(ids), approvalStatus, approvalMemo); return R.status(result); } + + /** + * 二级批量审核（厂长，副厂长） + */ + @PostMapping("/secondConfirmBatch") + @Operation(summary = "批量审核", description = "") + public R secondConfirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids, + @Parameter(description = "审核结果", required = true) @RequestParam Integer approvalStatus, + @Parameter(description = "审批意见", required = true) @RequestParam String approvalMemo) { + Boolean result = plateGoodsApplyService.secondConfirmBatch(Func.toLongList(ids), approvalStatus, approvalMemo); + return R.status(result); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java index 5fb22ece1..b8bd79177 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java @@ -42,4 +42,12 @@ public interface IPlateGoodsApplyService extends BaseService { */ boolean confirmBatch(List ids, Integer approvalStatus, String approvalMemo); + /** + * 添加量申报二级审核 + * @param ids + * @param approvalStatus + * @param approvalMemo + * @return + */ + boolean secondConfirmBatch(List ids, Integer approvalStatus, String approvalMemo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java index fc83c3f39..f98f336a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.RequiredArgsConstructor; import org.springblade.common.utils.StringPrefixUtils; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -23,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; @@ -64,6 +66,30 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl ids, Integer approvalStatus, String approvalMemo) { + BladeUser user = AuthUtil.getUser(); + + for (Long id : ids) { + // 1. 查询完整对象 + PlateGoodsApply plateGoodsApply = this.getById(id); + if (plateGoodsApply == null) { + throw new ServiceException("记录不存在，id：" + id); + } + + // 2. 设置审批信息 + plateGoodsApply.setApprovalMan2(user.getUserId()); + plateGoodsApply.setApprovalTime2(DateUtil.now()); + plateGoodsApply.setApprovalStatus2(approvalStatus); + plateGoodsApply.setApprovalMemo2(approvalMemo); + plateGoodsApply.setStatus(approvalStatus); + + // 3. 更新数据库 + this.updateById(plateGoodsApply); + } + return true; + } + @Transactional(rollbackFor = Exception.class) @Override public boolean save(PlateGoodsApply apply, List assayContentDetailList, List recordIdList) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java index bb08a2ce0..0a5653b1c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java @@ -461,6 +461,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl