4584dd1d by xiaojie

【数据资产】

1、数据需求-修改上架状态
1 parent bb3ae584
package com.csbr.qingcloud.portal.controller;
import com.csbr.cloud.common.entity.CsbrUpdate;
import com.csbr.cloud.common.response.CommonRes;
import com.csbr.qingcloud.portal.domain.vo.*;
import csbr.cloud.entity.annotation.SystemLog;
......@@ -11,6 +12,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......@@ -46,6 +48,12 @@ public class DemandController {
demandService.updateDemand(vo);
return CommonRes.success(true);
}
@PostMapping("/update-grounding-pick")
@Operation(summary= "数据需求-修改上架状态")
public CommonRes<Boolean> updateGroundingPick(@Validated(value = {CsbrUpdate.class})@RequestBody @Valid DemandRQVO vo) {
return CommonRes.success(demandService.updateGroundingPick(vo));
}
@DeleteMapping("/delete")
@SystemLog(value = "数据需求-批量删除")
......
......@@ -221,6 +221,9 @@ public class DemandRQVO extends FlowRQBaseVO {
@Schema(description = "加工单位名称")
private String processCompanyName;
@Schema(title = "上架状态(Y 上架 N 下架)")
private String listingStatus = "N";
/******** 子对象 *****/
......
package com.csbr.qingcloud.portal.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import com.csbr.cloud.workflow.domain.vo.appove.BizApproveVO;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import com.csbr.cloud.workflow.domain.vo.appove.BizApproveVO;
import java.math.BigDecimal;
import java.util.Date;
......@@ -243,7 +244,10 @@ public class DemandRSVO {
*/
@Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
private String crossPlatformApproveState;
@Schema(title = "上架状态(Y 上架 N 下架)")
private String listingStatus;
/******** 库表存储属性 需处理 *****/
/******** 自定义扩展 *****/
......
......@@ -230,4 +230,7 @@ public class MfDemand extends BaseShardingDO {
@Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
private String crossPlatformApproveState;
@Name("上架状态(Y 上架 N 下架)")
private String listingStatus;
}
......
......@@ -84,4 +84,11 @@ public interface DemandService {
* @return
*/
List<ProcessOrderProcessDtlRSVO> listByProcessOrderNo();
/**
* 数据需求-修改上架状态
* @param vo
* @return
*/
Boolean updateGroundingPick(DemandRQVO vo);
}
......
......@@ -322,12 +322,14 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(FUNCTION_NAME));
}
String orderNo = null;
LambdaUpdateWrapper<MfDemand> updateWrapper = new LambdaUpdateWrapper<>();
if (ApprovalStateEnum.PASSED.getValue().equals(dto.getApprovalState()) && !dto.getIsZqPlatformApprove() && StringUtils.isEmpty(entity.getZqName())) {
//生成加工单
orderNo = addOrder(mfDemandService.getById(dto.getBizGuid()),dto);
// 判断是否审核自动上架
updateWrapper.set(MfDemand::getListingStatus, "Y");
}
// 同步更新审批状态
LambdaUpdateWrapper<MfDemand> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(MfDemand::getBizApproveState, dto.getApprovalState());
updateWrapper.set(StringUtils.isNotBlank(orderNo),MfDemand::getProcessOrderNo, orderNo);
updateWrapper.set(StringUtils.isNotBlank(orderNo),MfDemand::getProcessingGenerateTime, new Date());
......@@ -345,12 +347,14 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(FUNCTION_NAME));
}
String orderNo = null;
LambdaUpdateWrapper<MfDemand> updateWrapper = new LambdaUpdateWrapper<>();
if (ApprovalStateEnum.PASSED.getValue().equals(dto.getApprovalState())) {
//生成加工单
orderNo = addOrder(mfDemandService.getById(dto.getBizGuid()),dto);
// 判断是否审核自动上架
updateWrapper.set(MfDemand::getListingStatus, "Y");
}
// 同步更新审批状态
LambdaUpdateWrapper<MfDemand> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(MfDemand::getBizApproveState, dto.getApprovalState());
updateWrapper.set(MfDemand::getCrossPlatformApproveState, dto.getApprovalState());
updateWrapper.set(StringUtils.isNotBlank(orderNo),MfDemand::getProcessOrderNo, orderNo);
......@@ -440,6 +444,14 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
return dataProcessBasicFeign.processOrderList(guids).getData();
}
@Override
public Boolean updateGroundingPick(DemandRQVO vo) {
LambdaUpdateWrapper<MfDemand> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(MfDemand::getGuid, vo.getGuid())
.set(MfDemand::getListingStatus, vo.getListingStatus());
return mfDemandService.update(updateWrapper);
}
/**
* 获取发起流程参数
*
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!