zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

超市增加工作流-1

Browse Source
This commit is contained in:
zjf committed 2025-03-14 17:46:22 +08:00
1 parent 89715d39f0
commit 51bc224ec4
12 files changed
+165 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java
+3
View File
@@ -120,4 +120,7 @@ public class BoxesBookingEntity extends Model<BoxesBookingEntity> {
@Schema(description="流程实例id")
private String processInstanceId;
@Schema(description="审核原因")
private String checkReason;
}
pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java
+9 -6
View File
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.canteen.controller;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +14,8 @@ import com.bsd.pjcloud.canteen.service.BoxesBookingService;
import com.bsd.pjcloud.common.security.annotation.Inner;
import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum;
import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto;
import com.bsd.pjcloud.flow.task.utils.GetCheckReasonUtils;
import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo;
import org.apache.seata.spring.annotation.GlobalTransactional;
import org.springframework.security.access.prepost.PreAuthorize;
import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -138,20 +141,20 @@ public class BoxesBookingController {
@PostMapping("/flow-callback")
@Operation(summary = "流程节点回调通知")
@Inner
public R createBooking(@RequestBody ProcessNodeRecordParamDto processNodeRecordParamDto) {
@Inner(value = false)
@Transactional
public R flowCallback(@RequestBody ProcessNodeRecordParamDto processNodeRecordParamDto) {
String processInstanceId = processNodeRecordParamDto.getProcessInstanceId();
BoxesBookingEntity boxesBookingEntity = new BoxesBookingEntity();
boxesBookingEntity.setProcessInstanceId(processInstanceId);
boxesBookingEntity.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode());
System.out.println("***************************");
System.out.println(processNodeRecordParamDto.getData());
// boxesBookingService.update()
LambdaQueryWrapper<BoxesBookingEntity> boxesBookingEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
boxesBookingEntityLambdaQueryWrapper.eq(BoxesBookingEntity::getProcessInstanceId, processInstanceId);
CheckStatusAndReasonVo checkReason = GetCheckReasonUtils.getCheckReason(processNodeRecordParamDto);
boxesBookingEntity.setCheckStatus(checkReason.getCheckStatus());
boxesBookingEntity.setCheckReason(checkReason.getCheckReason());
boxesBookingService.update(boxesBookingEntity,boxesBookingEntityLambdaQueryWrapper);
System.out.println(processNodeRecordParamDto);
return R.ok();
}
pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml
+1
View File
@@ -21,5 +21,6 @@
<result property="updateTime" column="update_time"/>
<result property="deptId" column="dept_id"/>
<result property="processInstanceId" column="process_instance_id"/>
<result property="checkReason" column="check_reason"/>
</resultMap>
</mapper>
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/UserRootDto.java
+11
View File
@@ -0,0 +1,11 @@
package com.bsd.pjcloud.flow.task.dto;
import lombok.Data;
@Data
public class UserRootDto {
private long id;
private String name;
}
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/utils/GetCheckReasonUtils.java
+34
View File
@@ -0,0 +1,34 @@
package com.bsd.pjcloud.flow.task.utils;
import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum;
import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto;
import com.bsd.pjcloud.flow.task.dto.UserRootDto;
import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.StringReader;
import java.util.List;
import java.util.Optional;
public class GetCheckReasonUtils {
public static CheckStatusAndReasonVo getCheckReason(ProcessNodeRecordParamDto dto) {
String statusKey = dto.getNodeId() + "_approve_condition";
try {
JsonNode jsonNode = new ObjectMapper().readTree(dto.getData());
Boolean changeStatus = jsonNode.get(statusKey).asBoolean();
String approveDesc = Optional.ofNullable(jsonNode).map(node -> node.get("approveDesc")).filter(JsonNode::isTextual).map(JsonNode::asText).orElse("");
// String approveDesc = jsonNode.get("approveDesc").toString();
CheckStatusAndReasonVo checkStatusAndReasonVo = new CheckStatusAndReasonVo();
checkStatusAndReasonVo.setCheckStatus(changeStatus ? TaskCheckStatusEnum.RESULT.getCode() : TaskCheckStatusEnum.REJECT.getCode());
checkStatusAndReasonVo.setCheckReason(approveDesc);
return checkStatusAndReasonVo;
} catch (Exception e) {
// 处理解析异常
e.printStackTrace();
return null;
}
}
}
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/vo/CheckStatusAndReasonVo.java
+12
View File
@@ -0,0 +1,12 @@
package com.bsd.pjcloud.flow.task.vo;
import lombok.Data;
@Data
public class CheckStatusAndReasonVo {
private String checkStatus;
private String checkReason;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/SupermarketFlowConstant.java
+32
View File
@@ -0,0 +1,32 @@
package com.bsd.pjcloud.supermarket.constant;
import lombok.Data;
@Data
public final class SupermarketFlowConstant {
/**
* 补货申请
*/
public static final String SUPERMARKET_BHSQ_FLOW= "SUPERMARKET_BHSQ_FLOW";
/**
* 补货申请
*/
public static final String SUPERMARKET_CGDD_FLOW= "SUPERMARKET_CGDD_FLOW";
/**
* 补货申请
*/
public static final String SUPERMARKET_CGRK_FLOW= "SUPERMARKET_CGRK_FLOW";
/**
* 补货申请
*/
public static final String SUPERMARKET_CGTH_FLOW= "SUPERMARKET_CGTH_FLOW";
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanEntity.java
+8
View File
@@ -136,6 +136,12 @@ public class SmErpCgPlanEntity extends Model<SmErpCgPlanEntity> {
@Schema(description="关联状态")
private String linkStatus;
@Schema(description="流程实例id")
private String processInstanceId;
@Schema(description="审核原因")
private String checkReason;
@TableField(exist = false)
@Schema(description="商品名称")
private String productName;
@@ -144,4 +150,6 @@ public class SmErpCgPlanEntity extends Model<SmErpCgPlanEntity> {
@TableField(exist = false)
public String handlerUserName;
}
pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml
+11
View File
@@ -64,6 +64,17 @@
<artifactId>pjcloud-supermarket-api</artifactId>
<version>5.7.0</version>
</dependency>
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-flow-task-api</artifactId>
<version>5.7.0</version>
</dependency>
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-seata</artifactId>
<version>5.7.0</version>
</dependency>
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-wallet-api</artifactId>
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java
+25
View File
@@ -3,12 +3,18 @@ package com.bsd.pjcloud.supermarket.controller;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.core.util.BeanUtils;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.log.annotation.SysLog;
import com.bsd.pjcloud.common.security.annotation.Inner;
import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto;
import com.bsd.pjcloud.flow.task.utils.GetCheckReasonUtils;
import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo;
import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanDTO;
import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanEditDTO;
import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanSaveDTO;
@@ -22,6 +28,7 @@ import com.bsd.pjcloud.supermarket.service.SmErpUnitService;
import com.bsd.pjcloud.supermarket.vo.cgplan.ErpUnitVo;
import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanVo;
import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanItemVo;
import org.apache.seata.spring.annotation.GlobalTransactional;
import org.springframework.security.access.prepost.PreAuthorize;
import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -104,6 +111,24 @@ public class SmErpCgPlanController {
}
@Operation(summary = "回调" , description = "回调" )
@SysLog("采购补货回调" )
@PostMapping("/flow-callback")
@Inner(value = false)
@Transactional
public R supermarketFlowCallback(@RequestBody ProcessNodeRecordParamDto processNodeRecordParamDto) {
String processInstanceId = processNodeRecordParamDto.getProcessInstanceId();
CheckStatusAndReasonVo checkReason = GetCheckReasonUtils.getCheckReason(processNodeRecordParamDto);
smErpCgPlanService.update(
new LambdaUpdateWrapper<SmErpCgPlanEntity>()
.eq(SmErpCgPlanEntity::getProcessInstanceId, processInstanceId)
.set(SmErpCgPlanEntity::getCheckStatus, checkReason.getCheckStatus())
.set(SmErpCgPlanEntity::getCheckReason, checkReason.getCheckReason())
);
return R.ok();
}
/**
* 通过id查询采购计划
* @param id id
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java
+17 -2
View File
@@ -9,6 +9,11 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.data.datascope.DataScope;
import com.bsd.pjcloud.common.security.util.SecurityUtils;
import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService;
import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum;
import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.bsd.pjcloud.supermarket.constant.SupermarketFlowConstant;
import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanEditDTO;
import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanSaveDTO;
import com.bsd.pjcloud.supermarket.dto.cgplan.SmCgPlanEditItemDTO;
@@ -48,7 +53,7 @@ public class SmErpCgPlanServiceImpl extends ServiceImpl<SmErpCgPlanMapper, SmErp
private final RemoteUserService remoteUserService;
private final RemoteFlowApiFlowService remoteFlowApiFlowService;
@Override
@Transactional
@@ -58,8 +63,18 @@ public class SmErpCgPlanServiceImpl extends ServiceImpl<SmErpCgPlanMapper, SmErp
smErpCgPlanEntity.setDeptId(deptId);
smErpCgPlanEntity.setCheckStatus("0");
smErpCgPlanEntity.setDeptId(deptId);
int insert = baseMapper.insert(smErpCgPlanEntity);
//发起流程
R<Process> processR = remoteFlowApiFlowService.getProcessByBusinessKey(SupermarketFlowConstant.SUPERMARKET_BHSQ_FLOW);
String flowId = processR.getData().getFlowId();
ProcessInstanceParamDto processInstanceParamDto = new ProcessInstanceParamDto();
processInstanceParamDto.setFlowId(flowId);
R<String> stringR = remoteFlowApiFlowService.startProcessInstance(processInstanceParamDto);
String processInstanceId = stringR.getData();
smErpCgPlanEntity.setProcessInstanceId(processInstanceId);
smErpCgPlanEntity.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode());
int insert = baseMapper.insert(smErpCgPlanEntity);
List<SmCgPlanSaveItemDTO> items = erpCgPlanSaveDTO.getItems();
List<SmErpCgPlanItemEntity> cgPlanItemEntities = BeanUtils.toBean(items, SmErpCgPlanItemEntity.class);
for (SmErpCgPlanItemEntity cgPlanItemEntity : cgPlanItemEntities) {
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgPlanMapper.xml
+2
View File
@@ -22,5 +22,7 @@
<result property="delFlag" column="del_flag"/>
<result property="tenantId" column="tenant_id"/>
<result property="linkStatus" column="link_status"/>
<result property="processInstanceId" column="process_instance_id"/>
<result property="checkReason" column="check_reason"/>
</resultMap>
</mapper>