添加量申报二级审批

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;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java

@@ -89,7 +89,7 @@ public class PlateGoodsApplyController extends BladeController {
 		List<Long> 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);
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java

@@ -42,4 +42,12 @@ public interface IPlateGoodsApplyService extends BaseService<PlateGoodsApply> {
 	 */
 	boolean confirmBatch(List<Long> ids, Integer approvalStatus, String approvalMemo);
 
+	/**
+	 * 添加量申报二级审核
+	 * @param ids
+	 * @param approvalStatus
+	 * @param approvalMemo
+	 * @return
+	 */
+	boolean secondConfirmBatch(List<Long> ids, Integer approvalStatus, String approvalMemo);
 }

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<PlateGoodsApplyM
 		return this.updateBatchById(dataList);
 	}
 
+	@Override
+	public boolean secondConfirmBatch(List<Long> 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<AssayContentDetail> assayContentDetailList, List<Long> recordIdList) {

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java

@@ -461,6 +461,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 			plateGoodsRecord.setApprovalTime2(DateUtil.now());
 			plateGoodsRecord.setApprovalStatus2(approvalStatus);
 			plateGoodsRecord.setApprovalMemo2(approvalMemo);
+			plateGoodsRecord.setStatus(approvalStatus);
 
 			// 3. 审批成功时的额外处理
 			if (approvalStatus.equals(PlateGoodsEnum.SECOND_STATUS_PASS.getCode())) {