liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程发起修改，用户查询，组织机构查询修改

Browse Source
This commit is contained in:
TL
2025-08-11 11:05:41 +08:00
parent 1697269dd9
commit 4b8ed5cbb5
29 changed files with 814 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java
View File

@ -62,12 +62,15 @@ public class CoscoType {
public static final Long IS_LEADER_FO = 0L;
//审批状态(0.审批中、1.通过、2.驳回)
//审批状态(0.审批中、2表示已通过 3表示已拒绝 4表示已终止 6表示退回 7.表示驳回 8审批失败)
public static final Long APPROVE_STATUS_SPZ = 0l;
public static final Long APPROVE_STATUS_TG = 2l;
public static final Long APPROVE_STATUS_JJ = 3l;
public static final Long APPROVE_STATUS_ZZ = 4l;
public static final Long APPROVE_STATUS_TH = 6l;
public static final Long APPROVE_STATUS_BH = 7l;
public static final Long APPROVE_STATUS_ERROR = 8l;
public static final Long APPROVE_STATUS_TG = 1l;
public static final Long APPROVE_STATUS_BH = 2l;
//供应商身份类型（dvs.境内企业/机构、ovs.境外企业、pe.个人）
public static final String SUPPLIER_TYPE_DVS = "dvs";

11
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java
View File

@ -1,5 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.login.common.Constants;
@ -45,6 +47,15 @@ public class OrgController {
return orgService.getOrglist(param);
}
@ApiOperation("查询分页数据")
@PostMapping("/getPage")
BaseResponse<Page<SysOrg>> getOrgPage(@ApiParam(value = "对象数据", required = true) @RequestBody SysOrgVO sysOrgVO){
return orgService.getOrgPage(sysOrgVO);
}
@ApiOperation("查询所有数据（树形结构）")
@GetMapping("/queryAll")
public BaseResponse<List<SysOrgVO>> queryAll(@SpringQueryMap SysOrg sysOrg){

63
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java
View File

@ -1,8 +1,10 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.workflow.constant.BusinessTypeEnum;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.ProcessCallbackVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrary;
@ -15,13 +17,19 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*;
import com.chinaunicom.zyhy.ebtp.supplier.process.entity.CoscoProcessBusiness;
import com.chinaunicom.zyhy.ebtp.supplier.process.service.ICoscoProcessBusinessService;
import org.apache.commons.lang3.EnumUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
/**
* /synchronous/receiveApprove 供应商准入审批回调接口
* /synchronous/receiveCategoryApprove 供应商品类准入审批回调接口
@ -57,6 +65,8 @@ public class SynchronousController {
@Autowired
private ICoscoSupplierChangeApplyService coscoSupplierChangeApplyService;
@Autowired
private ICoscoProcessBusinessService coscoProcessBusinessService;
/**
@ -95,8 +105,7 @@ public class SynchronousController {
}
//验证当前工作任务是否已经处理完成
if (CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus())) {
if (!CoscoType.APPROVE_STATUS_SPZ.equals(coscoAccessWorkData.getApproveStatus())) {
return BaseResponse.fail("该任务已处理完成");
}
//审批状态
@ -118,8 +127,7 @@ public class SynchronousController {
}
//验证当前工作任务是否已经处理完成
if (CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus())) {
if (!CoscoType.APPROVE_STATUS_SPZ.equals(coscoAccessWorkData.getApproveStatus())) {
return BaseResponse.fail("该任务已处理完成");
}
//审批状态
@ -138,8 +146,7 @@ public class SynchronousController {
if (ObjectUtils.isEmpty(coscoSupplierexit)) {
return BaseResponse.fail("任务信息不能为空");
}
if (CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierexit.getApproveStatus())) {
if (!CoscoType.APPROVE_STATUS_SPZ.equals(coscoSupplierexit.getApproveStatus())) {
return BaseResponse.fail("任务已处理完成");
}
@ -175,11 +182,11 @@ public class SynchronousController {
return BaseResponse.fail("任务信息不能为空");
}
//先验证一下主任务表数据状态
if (CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus())) {
if (CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus())) {
return BaseResponse.fail("任务已处理完成");
}
coscoSupplierChangeApply.setApproveStatus(vo.getApproveStatus());
coscoSupplierChangeApply.setWorkFlowId(vo.getWorkFlowId());
return BaseResponse.success(coscoSupplierBaseService.updateCoscoSupplierBase(coscoSupplierChangeApply));
}
@ -192,5 +199,45 @@ public class SynchronousController {
return BaseResponse.success();
}
/**
* 流程审批回调
*/
@PostMapping("/callback")
public BaseResponse callback(@RequestBody @Valid ProcessCallbackVo vo) {
CoscoProcessBusiness coscoProcessBusiness = coscoProcessBusinessService.selectCoscoProcessBusinessByProcessInstanceId(vo.getProcessInstanceId());
if(ObjectUtils.isEmpty(coscoProcessBusiness)){
return BaseResponse.fail("流程业务数据不能为空");
}
//供应商准入审批
if(BusinessTypeEnum.SUPPLIER_ACCESS_APPROVAL.getKey().equals(vo.getBusinessType())){
CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
coscoAccessWork.setApproveStatus(vo.getApproveStatus());
coscoAccessWork.setId(coscoProcessBusiness.getBusinessId());
return receiveApprove(coscoAccessWork);
}
//供应商品类准入审批
if(BusinessTypeEnum.SUPPLIER_CATEGORY_ACCESS_APPROVAL.getKey().equals(vo.getBusinessType())){
CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
coscoAccessWork.setApproveStatus(vo.getApproveStatus());
coscoAccessWork.setId(coscoProcessBusiness.getBusinessId());
return receiveCategoryApprove(coscoAccessWork);
}
//退出审批
if(BusinessTypeEnum.EXIT_APPROVAL.getKey().equals(vo.getBusinessType())){
CoscoSupplierexit coscoSupplierexit = new CoscoSupplierexit();
coscoSupplierexit.setApproveStatus(vo.getApproveStatus());
coscoSupplierexit.setId(coscoProcessBusiness.getBusinessId());
return supplierCategoryTcApprove(coscoSupplierexit);
}
//供应商信息变更审批
if(BusinessTypeEnum.SUPPLIER_INFO_CHANGE_APPROVAL.getKey().equals(vo.getBusinessType())){
CoscoSupplierChangeApply coscoSupplierChangeApply = new CoscoSupplierChangeApply();
coscoSupplierChangeApply.setApproveStatus(vo.getApproveStatus());
coscoSupplierChangeApply.setId(coscoProcessBusiness.getBusinessId());
coscoSupplierChangeApply.setWorkFlowId(vo.getProcessInstanceId());
return supplierChangeApprove(coscoSupplierChangeApply);
}
return BaseResponse.success();
}
}

24
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java
View File

@ -1,15 +1,17 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.entity.SysSupplierUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysUserVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserServiceImpl;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@RestController
@ -55,8 +57,14 @@ public class UserController {
return BaseResponse.success(userService.supplierUserPwd(sysSupplierUser));
}
@ApiOperation("根据用户ID查询本单位下所有用户分页数据")
@PostMapping("/getPageByUserCompany")
public BaseResponse<Page<SysUser>> getPageByUserCompany(@ApiParam(value = "分页及查询条件", required = true) @RequestBody SysUserVO sysUserVO){
//如果单位orgId 是空就通过当前登录人id查询
if(StringUtils.isEmpty(sysUserVO.getOrgId())){
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
sysUserVO.setUserId(currentUser.getUserId());
}
return userService.getPageByUserCompany(sysUserVO);
}
}

14
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java
View File

@ -1,8 +1,14 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
@ -44,6 +50,14 @@ public interface IOrgService {
*/
BaseResponse<List<SysOrg>> getOrglist(SysOrgVO param);
/**
* 查询机构列表(分页)
* @param sysOrgVO
* @return
*/
BaseResponse<Page<SysOrg>> getOrgPage(SysOrgVO sysOrgVO);
/**
* 查询所有数据（树形结构）
* @param sysOrg

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java
View File

@ -1,11 +1,14 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@ -30,6 +33,6 @@ public interface IUserService{
boolean supplierUserPwd(SysSupplierUser sysSupplierUser);
BaseResponse<Page<SysUser>> getPageByUserCompany(SysUserVO sysUserVO);
}

19
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/WorkFlowService.java Normal file
View File

@ -0,0 +1,19 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.service;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.WorkflowCreateVo;
public interface WorkFlowService {
/**
* 流程启动方法
* @param key 业务类型
* @param businessId 业务id
* @param userId 人员id
* @param orgId 人员单位
* @param object 业务对象
* @return
*/
WorkflowCreateVo create(String key,String businessId,String userId,String orgId,Object object);
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl;
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.client.SystemClient;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
@ -76,6 +78,11 @@ public class OrgServiceImpl implements IOrgService {
return systemClient.getOrglist(param);
}
@Override
public BaseResponse<Page<SysOrg>> getOrgPage(SysOrgVO sysOrgVO) {
return systemClient.getOrgPage(sysOrgVO);
}
/**
* 查询所有数据（树形结构）
* @param sysOrg

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.client.SystemClient;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
@ -86,6 +87,11 @@ public class UserServiceImpl implements IUserService {
return systemClient.update(sysSupplierUser).isSuccess();
}
@Override
public BaseResponse<Page<SysUser>> getPageByUserCompany(SysUserVO sysUserVO) {
return systemClient.getPageByUserCompany(sysUserVO);
}
public List<UserVo> getUser(SelectUserVo vo) {
BaseResponse<List<SysUser>> userlist = systemClient.getUserlist(new SysUser());
List<UserVo> list = new ArrayList<>();

62
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/WorkFlowServiceImpl.java Normal file
View File

@ -0,0 +1,62 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.workflow.client.WorkflowFeignClient;
import com.chinaunicom.mall.ebtp.common.workflow.entity.WorkflowCreateResponse;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.WorkFlowService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.WorkflowCreateVo;
import com.chinaunicom.zyhy.ebtp.supplier.process.entity.CoscoProcessEnv;
import com.chinaunicom.zyhy.ebtp.supplier.process.service.CoscoProcessEnvService;
import com.chinaunicom.zyhy.ebtp.supplier.process.service.ICoscoProcessBusinessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@Service
public class WorkFlowServiceImpl implements WorkFlowService {
@Autowired
private WorkflowFeignClient workflowFeignClient;
@Autowired
private CoscoProcessEnvService coscoProcessEnvService;
@Autowired
private ICoscoProcessBusinessService coscoProcessBusinessService;
/**
* 流程启动方法
* @param key 业务类型
* @param businessId 业务id
* @param userId 人员id
* @param orgId 人员单位
* @param object 业务对象
* @return
*/
@Override
public WorkflowCreateVo create(String key,String businessId, String userId,String orgId, Object object) {
WorkflowCreateVo workflowCreateVo = new WorkflowCreateVo();
//查询流程配置表
CoscoProcessEnv coscoProcessEnv = coscoProcessEnvService.selectByBusinessType(key);
//封装url
String url = coscoProcessEnvService.buildBusinessUrl(key,userId, object);
//调用流程
BaseResponse<WorkflowCreateResponse> baseResponse = workflowFeignClient.create(userId,userId,orgId,coscoProcessEnv.getModelId(),coscoProcessEnv.getBusinessKey(),url);
if(baseResponse.isSuccess() && !ObjectUtils.isEmpty(baseResponse.getData())){
workflowCreateVo.setProcessInstanceId(baseResponse.getData().getProcessInstanceId());//流程id
workflowCreateVo.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
}else{
workflowCreateVo.setApproveStatus(CoscoType.APPROVE_STATUS_ERROR);
}
workflowCreateVo.setUrl(url);
//保存流程记录
coscoProcessBusinessService.insertCoscoProcessBusiness(key,businessId,workflowCreateVo.getUrl(),workflowCreateVo.getProcessInstanceId());
return workflowCreateVo;
}
}

34
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/ProcessCallbackVo.java Normal file
View File

@ -0,0 +1,34 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 流程处理回调实体
*/
@Data
public class ProcessCallbackVo {
/**
* 业务类型（枚举）
*/
@NotBlank(message = "业务类型不能为空")
private String businessType;
/**
* 流程实例ID
*/
@NotBlank(message = "流程实例ID不能为空")
private String processInstanceId;
/**
* 业务ID
*/
private String businessId;
/**
* 审批状态(0.审批中、2表示已通过 3表示已拒绝 4表示已终止 6表示退回 7.表示驳回 8审批失败)
*/
@NotNull(message = "审批状态不能为空")
private Long approveStatus;
}

28
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/WorkflowCreateVo.java Normal file
View File

@ -0,0 +1,28 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.vo;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.workflow.entity.WorkflowCreateResponse;
import lombok.Data;
/**
* 流程发起实体
*/
@Data
public class WorkflowCreateVo {
/**
* 封装好的url
*/
private String url;
/**
* 流程实例id
*/
private String processInstanceId;
/**
* 审批状态
*/
private Long approveStatus;
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java
View File

@ -42,7 +42,7 @@ public interface CoscoAccessSupplierCategoryMapper {
*/
public int selectCount(CoscoAccessSupplierCategory category);
public List<String> selectCategoryByDeptIdList(List<String> deptIds);
public List<String> selectOrgIdBySupplierId(String supplierId);
/**

74
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeWorkFlowMapper.java Normal file
View File

@ -0,0 +1,74 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeWorkFlow;
import java.util.List;
/**
* 中远海运_供应商_供应商信息变更与审批单位关联Mapper接口
*
* @author ruoyi
* @date 2025-08-11
*/
public interface CoscoSupplierChangeWorkFlowMapper {
/**
* 查询中远海运_供应商_供应商信息变更与审批单位关联
*
* @param id 中远海运_供应商_供应商信息变更与审批单位关联主键
* @return 中远海运_供应商_供应商信息变更与审批单位关联
*/
public CoscoSupplierChangeWorkFlow selectCoscoSupplierChangeWorkFlowById(String id);
/**
* 通过流程id查询
* @param workFlowId
* @return
*/
public CoscoSupplierChangeWorkFlow selectCoscoSupplierChangeWorkFlowId(String workFlowId);
/**
* 查询中远海运_供应商_供应商信息变更与审批单位关联列表
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 中远海运_供应商_供应商信息变更与审批单位关联集合
*/
public List<CoscoSupplierChangeWorkFlow> selectCoscoSupplierChangeWorkFlowList(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow);
/**
* 新增中远海运_供应商_供应商信息变更与审批单位关联
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 结果
*/
public int insertCoscoSupplierChangeWorkFlow(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow);
public int batchCoscoSupplierChangeWorkFlow(List<CoscoSupplierChangeWorkFlow> coscoSupplierChangeWorkFlows);
/**
* 修改中远海运_供应商_供应商信息变更与审批单位关联
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 结果
*/
public int updateCoscoSupplierChangeWorkFlow(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow);
/**
* 删除中远海运_供应商_供应商信息变更与审批单位关联
*
* @param id 中远海运_供应商_供应商信息变更与审批单位关联主键
* @return 结果
*/
public int deleteCoscoSupplierChangeWorkFlowById(String id);
/**
* 批量删除中远海运_供应商_供应商信息变更与审批单位关联
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCoscoSupplierChangeWorkFlowByIds(String[] ids);
}

35
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeWorkFlow.java Normal file
View File

@ -0,0 +1,35 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
import lombok.Data;
/**
* 中远海运_供应商_供应商信息变更与审批单位关联对象 cosco_supplier_change_work_flow
*
* @author ruoyi
* @date 2025-08-11
*/
@Data
public class CoscoSupplierChangeWorkFlow extends CoscoBaseEntity {
private static final long serialVersionUID = 1L;
/** 主键ID */
private String id;
/** 供应商信息变更申请id(cosco_supplier_change_apply表主键) */
private String supplierChangeApplyId;
/** 供应商id(cosco_supplier_base表主键) */
private String supplierId;
/** 审批工作流id */
private String workFlowId;
/** 单位id */
private String orgId;
/** 审批状态(0.待审批、1.通过、2.驳回) */
private Long approveStatus;
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java
View File

@ -1,6 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessUserItemVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
@ -90,7 +91,7 @@ public interface ICoscoAccessWorkService {
* 发起审批
* @return
*/
public int startApprove(String id);
public Integer startApprove(String id);
/**

68
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeWorkFlowService.java Normal file
View File

@ -0,0 +1,68 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeWorkFlow;
import java.util.List;
/**
* 中远海运_供应商_供应商信息变更与审批单位关联Service接口
*
* @author ruoyi
* @date 2025-08-11
*/
public interface ICoscoSupplierChangeWorkFlowService {
/**
* 查询中远海运_供应商_供应商信息变更与审批单位关联
*
* @param id 中远海运_供应商_供应商信息变更与审批单位关联主键
* @return 中远海运_供应商_供应商信息变更与审批单位关联
*/
public CoscoSupplierChangeWorkFlow selectCoscoSupplierChangeWorkFlowById(String id);
/**
* 查询中远海运_供应商_供应商信息变更与审批单位关联列表
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 中远海运_供应商_供应商信息变更与审批单位关联集合
*/
public List<CoscoSupplierChangeWorkFlow> selectCoscoSupplierChangeWorkFlowList(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow);
/**
* 新增中远海运_供应商_供应商信息变更与审批单位关联
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 结果
*/
public int insertCoscoSupplierChangeWorkFlow(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow);
public int batchCoscoSupplierChangeWorkFlow(List<CoscoSupplierChangeWorkFlow> coscoSupplierChangeWorkFlows);
/**
* 修改中远海运_供应商_供应商信息变更与审批单位关联
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 结果
*/
public int updateCoscoSupplierChangeWorkFlow(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow);
public int updateCoscoSupplierChangeWorkFlowByWorkFlowId(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow);
/**
* 批量删除中远海运_供应商_供应商信息变更与审批单位关联
*
* @param ids 需要删除的中远海运_供应商_供应商信息变更与审批单位关联主键集合
* @return 结果
*/
public int deleteCoscoSupplierChangeWorkFlowByIds(String[] ids);
/**
* 删除中远海运_供应商_供应商信息变更与审批单位关联信息
*
* @param id 中远海运_供应商_供应商信息变更与审批单位关联主键
* @return 结果
*/
public int deleteCoscoSupplierChangeWorkFlowById(String id);
}

22
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
View File

@ -7,7 +7,10 @@ import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrgVO;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.mall.ebtp.common.workflow.constant.BusinessTypeEnum;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.WorkFlowService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.WorkflowCreateVo;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
@ -60,6 +63,12 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
private IOrgService orgService;
@Autowired
private WorkFlowService workFlowService;
@Override
public IPage<CoscoAccessWork> getPage(CoscoAccessWork data) {
// 创建分页对象（当前页，每页大小）
@ -178,13 +187,22 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
}
@Override
@Transactional
public Integer startApprove(String id) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
//修改任务主表审批状态--通过或者驳回
CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
coscoAccessWork.setId(id);
coscoAccessWork.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
//*************调用三方审批接口***********
//业务类型（枚举）
String key = BusinessTypeEnum.SUPPLIER_CATEGORY_ACCESS_APPROVAL.getKey();
//调用流程并保存流程发起记录
WorkflowCreateVo workflowCreateVo = workFlowService.create(key,id,userId,currentUser.getOrganizationId(),coscoAccessWork);
coscoAccessWork.setWorkFlowId(workflowCreateVo.getProcessInstanceId());//流程id
coscoAccessWork.setApproveStatus(workflowCreateVo.getApproveStatus());
return updateWork(coscoAccessWork);

27
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
View File

@ -5,9 +5,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.mall.ebtp.common.workflow.client.WorkflowFeignClient;
import com.chinaunicom.mall.ebtp.common.workflow.constant.BusinessTypeEnum;
import com.chinaunicom.mall.ebtp.common.workflow.entity.WorkflowCreateResponse;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IDtService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.WorkFlowService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.WorkflowCreateVo;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
@ -17,6 +22,10 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.*;
import com.chinaunicom.zyhy.ebtp.supplier.process.entity.CoscoProcessBusiness;
import com.chinaunicom.zyhy.ebtp.supplier.process.entity.CoscoProcessEnv;
import com.chinaunicom.zyhy.ebtp.supplier.process.service.CoscoProcessEnvService;
import com.chinaunicom.zyhy.ebtp.supplier.process.service.ICoscoProcessBusinessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -24,6 +33,8 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@ -65,6 +76,8 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
@Autowired
private IDtService dtService;
@Autowired
private WorkFlowService workFlowService;
/**
* 供应商准入管理列表
@ -695,21 +708,27 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
}
/**
* 发起审批
* 发起审批---供应商发起准入
* @return
*/
@Override
public int startApprove(String id) {
@Transactional
public Integer startApprove(String id) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
//修改任务主表审批状态--审批中
CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
coscoAccessWork.setId(id);
coscoAccessWork.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
coscoAccessWork.setUpdateBy(userId);
//业务类型（枚举）
String key = BusinessTypeEnum.SUPPLIER_ACCESS_APPROVAL.getKey();
//调用流程并保存流程发起记录
WorkflowCreateVo workflowCreateVo = workFlowService.create(key,id,userId,currentUser.getOrganizationId(),coscoAccessWork);
//*********************************调用三方接口******************************
coscoAccessWork.setWorkFlowId(workflowCreateVo.getProcessInstanceId());//流程id
coscoAccessWork.setApproveStatus(workflowCreateVo.getApproveStatus());
//主体任务修改
return updateWork(coscoAccessWork);
}

54
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
View File

@ -8,10 +8,13 @@ import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.mall.ebtp.common.workflow.constant.BusinessTypeEnum;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IDictService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.WorkFlowService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.OrgNameVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.WorkflowCreateVo;
import com.chinaunicom.zyhy.ebtp.supplier.common.ChineseName;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
@ -85,6 +88,9 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
@Autowired
private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper;
@Autowired
private ICoscoSupplierChangeWorkFlowService coscoSupplierChangeWorkFlowService;
@Autowired
private CoscoCategoryLibraryContainMapper coscoCategoryLibraryContainMapper;
@ -107,6 +113,8 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
@Qualifier("cacheRedisTemplate")
private RedisTemplate<String, Object> redisTemplate;
@Autowired
private WorkFlowService workFlowService;
/**
@ -537,33 +545,38 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
//修改主体审批状态，封装实体
CoscoSupplierChangeApply changeApply = new CoscoSupplierChangeApply();
//老基本信息
CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseMapper.selectCoscoSupplierBaseById(coscoSupplierChangeApply.getSupplierId());
String supplierId = coscoSupplierBase.getId();
//审批通过
if (CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus())) {
//新基本信息
CoscoSupplierChangeBase newCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(appid);
//老基本信息
CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseMapper.selectCoscoSupplierBaseById(coscoSupplierChangeApply.getSupplierId());
String supplierId = coscoSupplierBase.getId();
BeanUtil.copyProperties(newCoscoSupplierBase, coscoSupplierBase);
coscoSupplierBase.setId(supplierId);
coscoSupplierBase.setUpdateTime(date);
coscoSupplierBase.setLastUpdateTime(date);
coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
//消息通知用到的
changeApply.setSupplierName(coscoSupplierBase.getName());
changeApply.setSupplierId(supplierId);
}
//消息通知用到的
changeApply.setSupplierName(coscoSupplierBase.getName());
changeApply.setSupplierId(supplierId);
//修改任务主表
changeApply.setId(coscoSupplierChangeApply.getId());
changeApply.setApproveStatus(coscoSupplierChangeApply.getApproveStatus());
changeApply.setUpdateTime(date);
changeApply.setLastUpdateTime(date);
coscoSupplierChangeApplyMapper.updateCoscoSupplierChangeApply(changeApply);
//修改流程关联表
CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow = new CoscoSupplierChangeWorkFlow();
coscoSupplierChangeWorkFlow.setApproveStatus(coscoSupplierChangeApply.getApproveStatus());
coscoSupplierChangeWorkFlow.setWorkFlowId(coscoSupplierChangeApply.getWorkFlowId());
coscoSupplierChangeWorkFlowService.updateCoscoSupplierChangeWorkFlowByWorkFlowId(coscoSupplierChangeWorkFlow);
return changeApply;
}
@ -728,7 +741,6 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
coscoSupplierChangeApply.setChangeDesc(vo.getChangeDesc());
coscoSupplierChangeApply.setChangeBy(userId);
coscoSupplierChangeApply.setChangeTime(date);
coscoSupplierChangeApply.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
coscoSupplierChangeApply.setCreateBy(userId);
coscoSupplierChangeApply.setCreateTime(date);
coscoSupplierChangeApply.setUpdateBy(userId);
@ -762,8 +774,30 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments);
}
}
//**************调用审批接口**********************
//业务类型（枚举）
String key = BusinessTypeEnum.SUPPLIER_INFO_CHANGE_APPROVAL.getKey();
//查询所有供应商准入的单位 给每个单位都发一遍审批流程
List<String> orgIds = coscoAccessSupplierCategoryMapper.selectOrgIdBySupplierId(oldCoscoSupplierBase.getId());
List<CoscoSupplierChangeWorkFlow> coscoSupplierChangeWorkFlows = new ArrayList<>();
for(String orgId : orgIds){
//调用流程并保存流程发起记录
WorkflowCreateVo workflowCreateVo = workFlowService.create(key,applyId,userId,orgId,coscoSupplierChangeApply);
CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow = new CoscoSupplierChangeWorkFlow();
coscoSupplierChangeWorkFlow.setId(PropertyUtils.getSnowflakeId());
coscoSupplierChangeWorkFlow.setSupplierChangeApplyId(applyId);
coscoSupplierChangeWorkFlow.setSupplierId(oldCoscoSupplierBase.getId());
coscoSupplierChangeWorkFlow.setOrgId(orgId);
coscoSupplierChangeWorkFlow.setApproveStatus(workflowCreateVo.getApproveStatus());
coscoSupplierChangeWorkFlow.setWorkFlowId(workflowCreateVo.getProcessInstanceId());
coscoSupplierChangeWorkFlows.add(coscoSupplierChangeWorkFlow);
}
//变更表与审批单位关联表保存
coscoSupplierChangeWorkFlowService.batchCoscoSupplierChangeWorkFlow(coscoSupplierChangeWorkFlows);
//主表信息保存
coscoSupplierChangeApply.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
return coscoSupplierChangeApplyMapper.insertCoscoSupplierChangeApply(coscoSupplierChangeApply);
}

99
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeWorkFlowServiceImpl.java Normal file
View File

@ -0,0 +1,99 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import java.util.List;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierChangeWorkFlowMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeWorkFlow;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeWorkFlowService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 中远海运_供应商_供应商信息变更与审批单位关联Service业务层处理
*
* @author ruoyi
* @date 2025-08-11
*/
@Service
public class CoscoSupplierChangeWorkFlowServiceImpl implements ICoscoSupplierChangeWorkFlowService {
@Autowired
private CoscoSupplierChangeWorkFlowMapper coscoSupplierChangeWorkFlowMapper;
/**
* 查询中远海运_供应商_供应商信息变更与审批单位关联
*
* @param id 中远海运_供应商_供应商信息变更与审批单位关联主键
* @return 中远海运_供应商_供应商信息变更与审批单位关联
*/
@Override
public CoscoSupplierChangeWorkFlow selectCoscoSupplierChangeWorkFlowById(String id) {
return coscoSupplierChangeWorkFlowMapper.selectCoscoSupplierChangeWorkFlowById(id);
}
/**
* 查询中远海运_供应商_供应商信息变更与审批单位关联列表
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 中远海运_供应商_供应商信息变更与审批单位关联
*/
@Override
public List<CoscoSupplierChangeWorkFlow> selectCoscoSupplierChangeWorkFlowList(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow) {
return coscoSupplierChangeWorkFlowMapper.selectCoscoSupplierChangeWorkFlowList(coscoSupplierChangeWorkFlow);
}
/**
* 新增中远海运_供应商_供应商信息变更与审批单位关联
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 结果
*/
@Override
public int insertCoscoSupplierChangeWorkFlow(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow) {
return coscoSupplierChangeWorkFlowMapper.insertCoscoSupplierChangeWorkFlow(coscoSupplierChangeWorkFlow);
}
@Override
public int batchCoscoSupplierChangeWorkFlow(List<CoscoSupplierChangeWorkFlow> coscoSupplierChangeWorkFlows) {
return coscoSupplierChangeWorkFlowMapper.batchCoscoSupplierChangeWorkFlow(coscoSupplierChangeWorkFlows);
}
/**
* 修改中远海运_供应商_供应商信息变更与审批单位关联
*
* @param coscoSupplierChangeWorkFlow 中远海运_供应商_供应商信息变更与审批单位关联
* @return 结果
*/
@Override
public int updateCoscoSupplierChangeWorkFlow(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow) {
return coscoSupplierChangeWorkFlowMapper.updateCoscoSupplierChangeWorkFlow(coscoSupplierChangeWorkFlow);
}
@Override
public int updateCoscoSupplierChangeWorkFlowByWorkFlowId(CoscoSupplierChangeWorkFlow coscoSupplierChangeWorkFlow) {
CoscoSupplierChangeWorkFlow changeWorkFlow = coscoSupplierChangeWorkFlowMapper.selectCoscoSupplierChangeWorkFlowId(coscoSupplierChangeWorkFlow.getWorkFlowId());
coscoSupplierChangeWorkFlow.setId(changeWorkFlow.getId());
return coscoSupplierChangeWorkFlowMapper.updateCoscoSupplierChangeWorkFlow(coscoSupplierChangeWorkFlow);
}
/**
* 批量删除中远海运_供应商_供应商信息变更与审批单位关联
*
* @param ids 需要删除的中远海运_供应商_供应商信息变更与审批单位关联主键
* @return 结果
*/
@Override
public int deleteCoscoSupplierChangeWorkFlowByIds(String[] ids) {
return coscoSupplierChangeWorkFlowMapper.deleteCoscoSupplierChangeWorkFlowByIds(ids);
}
/**
* 删除中远海运_供应商_供应商信息变更与审批单位关联信息
*
* @param id 中远海运_供应商_供应商信息变更与审批单位关联主键
* @return 结果
*/
@Override
public int deleteCoscoSupplierChangeWorkFlowById(String id) {
return coscoSupplierChangeWorkFlowMapper.deleteCoscoSupplierChangeWorkFlowById(id);
}
}

15
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java
View File

@ -6,9 +6,12 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.mall.ebtp.common.workflow.constant.BusinessTypeEnum;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.WorkFlowService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.WorkflowCreateVo;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
@ -54,6 +57,8 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
@Autowired
private IOrgService orgService;
@Autowired
private WorkFlowService workFlowService;
@Override
public IPage<CoscoSupplierexit> getPage(CoscoSupplierexit data) {
@ -216,7 +221,12 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
}
coscoSupplierexitSupplierCategoryMapper.batchCoscoSupplierexitSupplierCategory(categoryList);
//****************调用三方接口*********************
//业务类型（枚举）
String key = BusinessTypeEnum.EXIT_APPROVAL.getKey();
//调用流程并保存流程发起记录
WorkflowCreateVo workflowCreateVo = workFlowService.create(key,exitId,userId,currentUser.getOrganizationId(),new CoscoSupplierexit());
//基础信息保存--审批中
CoscoSupplierexit coscoSupplierexit = vo.getCoscoSupplierexit();
@ -227,7 +237,8 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
coscoSupplierexit.setUpdateBy(userId);
coscoSupplierexit.setUpdateTime(date);
coscoSupplierexit.setLastUpdateTime(date);
coscoSupplierexit.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
coscoSupplierexit.setApproveStatus(workflowCreateVo.getApproveStatus());
coscoSupplierexit.setWorkFlowId(workflowCreateVo.getProcessInstanceId());
return coscoSupplierexitMapper.insertCoscoSupplierexit(coscoSupplierexit);
}

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/dao/CoscoProcessBusinessMapper.java
View File

@ -19,6 +19,14 @@ public interface CoscoProcessBusinessMapper {
*/
public CoscoProcessBusiness selectCoscoProcessBusinessById(String id);
/**
* 流程实例id
* @param processInstanceId
* @return
*/
public CoscoProcessBusiness selectCoscoProcessBusinessByProcessInstanceId(String processInstanceId);
/**
* 查询流程业务关联列表
*

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/entity/CoscoProcessBusiness.java
View File

@ -28,6 +28,10 @@ public class CoscoProcessBusiness extends BaseEntity {
/** 业务ID */
private String businessId;
/** 页面地址 */
private String businessUrl;
/** 扩展字段(json) */
private String businessExtend;

11
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/ICoscoProcessBusinessService.java
View File

@ -19,6 +19,13 @@ public interface ICoscoProcessBusinessService {
*/
public CoscoProcessBusiness selectCoscoProcessBusinessById(String id);
/**
* 流程实例id
* @param processInstanceId
* @return
*/
public CoscoProcessBusiness selectCoscoProcessBusinessByProcessInstanceId(String processInstanceId);
/**
* 查询流程业务关联列表
*
@ -30,10 +37,8 @@ public interface ICoscoProcessBusinessService {
/**
* 新增流程业务关联
*
* @param coscoProcessBusiness 流程业务关联
* @return 结果
*/
public int insertCoscoProcessBusiness(CoscoProcessBusiness coscoProcessBusiness);
public int insertCoscoProcessBusiness(String key,String businessId,String url,String processInstanceId);
/**
* 修改流程业务关联

28
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/process/service/impl/CoscoProcessBusinessServiceImpl.java
View File

@ -1,5 +1,8 @@
package com.chinaunicom.zyhy.ebtp.supplier.process.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.process.dao.CoscoProcessBusinessMapper;
import com.chinaunicom.zyhy.ebtp.supplier.process.entity.CoscoProcessBusiness;
import com.chinaunicom.zyhy.ebtp.supplier.process.service.ICoscoProcessBusinessService;
@ -7,6 +10,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.process.service.ICoscoProcessBusinessS
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@ -32,6 +36,11 @@ public class CoscoProcessBusinessServiceImpl implements ICoscoProcessBusinessSer
return coscoProcessBusinessMapper.selectCoscoProcessBusinessById(id);
}
@Override
public CoscoProcessBusiness selectCoscoProcessBusinessByProcessInstanceId(String processInstanceId) {
return coscoProcessBusinessMapper.selectCoscoProcessBusinessByProcessInstanceId(processInstanceId);
}
/**
* 查询流程业务关联列表
*
@ -45,13 +54,24 @@ public class CoscoProcessBusinessServiceImpl implements ICoscoProcessBusinessSer
/**
* 新增流程业务关联
*
* @param coscoProcessBusiness 流程业务关联
* @return 结果
* @param key 业务类型
* @param businessId 业务id
* @param url 组装的url
* @param processInstanceId 流程id
* @return
*/
@Override
public int insertCoscoProcessBusiness(CoscoProcessBusiness coscoProcessBusiness) {
public int insertCoscoProcessBusiness(String key,String businessId,String url,String processInstanceId) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
CoscoProcessBusiness coscoProcessBusiness = new CoscoProcessBusiness();
coscoProcessBusiness.setBusinessType(key);
coscoProcessBusiness.setBusinessId(businessId);
coscoProcessBusiness.setBusinessUrl(url);
coscoProcessBusiness.setProcessInstanceId(processInstanceId);
coscoProcessBusiness.setId(PropertyUtils.getSnowflakeId());
coscoProcessBusiness.setCreateBy(currentUser.getUserId());
coscoProcessBusiness.setCreateTime(new Date());
coscoProcessBusiness.setUpdateBy(currentUser.getUserId());
return coscoProcessBusinessMapper.insertCoscoProcessBusiness(coscoProcessBusiness);
}

12
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml
View File

@ -119,15 +119,9 @@
</if>
</select>
<select id="selectCategoryByDeptIdList" parameterType="java.util.List" resultType="String">
select cssc.category_id,cs.dept_id,cs.approve_status from cosco_supplierexit_supplier_category cssc
left join cosco_supplierexit cs on cs.id = cssc.supplierexit_id
where cs.approve_status in (0) and cs.del_flag = 'normal'
and cs.dept_id in (
<foreach item="item" index="index" collection="list" separator=",">
#{item}
</foreach>
)
<select id="selectOrgIdBySupplierId" parameterType="java.util.List" resultType="String">
select org_id from cosco_access_supplier_category where del_flag = 'normal' and supplier_id = #{supplierId}
GROUP BY org_id
</select>

11
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoprocess/dao/CoscoProcessBusinessMapper.xml → src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoProcessBusinessMapper.xml
View File

@ -9,6 +9,7 @@
<result property="businessType" column="business_type"/>
<result property="processInstanceId" column="process_instance_id"/>
<result property="businessId" column="business_id"/>
<result property="businessUrl" column="business_url"/>
<result property="businessExtend" column="business_extend"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
@ -19,7 +20,7 @@
</resultMap>
<sql id="selectCoscoProcessBusinessVo">
select id, business_type, process_instance_id, business_id, business_extend, del_flag, create_by, create_time, update_by, update_time, last_update_time
select id, business_type, process_instance_id, business_id,business_url, business_extend, del_flag, create_by, create_time, update_by, update_time, last_update_time
from cosco_process_business
</sql>
@ -50,6 +51,12 @@
where id = #{id}
</select>
<select id="selectCoscoProcessBusinessByProcessInstanceId" parameterType="String"
resultMap="CoscoProcessBusinessResult">
<include refid="selectCoscoProcessBusinessVo"/>
where process_instance_id = #{processInstanceId} and del_flag = 'normal'
</select>
<insert id="insertCoscoProcessBusiness" parameterType="com.chinaunicom.zyhy.ebtp.supplier.process.entity.CoscoProcessBusiness">
insert into cosco_process_business
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -57,6 +64,7 @@
<if test="businessType != null and businessType != ''">business_type,</if>
<if test="processInstanceId != null and processInstanceId != ''">process_instance_id,</if>
<if test="businessId != null and businessId != ''">business_id,</if>
<if test="businessUrl != null and businessUrl != ''">business_url,</if>
<if test="businessExtend != null">business_extend,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@ -70,6 +78,7 @@
<if test="businessType != null and businessType != ''">#{businessType},</if>
<if test="processInstanceId != null and processInstanceId != ''">#{processInstanceId},</if>
<if test="businessId != null and businessId != ''">#{businessId},</if>
<if test="businessUrl != null and businessUrl != ''">#{businessUrl},</if>
<if test="businessExtend != null">#{businessExtend},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>

115
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeWorkFlowMapper.xml Normal file
View File

@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierChangeWorkFlowMapper">
<resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeWorkFlow" id="CoscoSupplierChangeWorkFlowResult">
<result property="id" column="id"/>
<result property="supplierChangeApplyId" column="supplier_change_apply_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="workFlowId" column="work_flow_id"/>
<result property="orgId" column="org_id"/>
<result property="approveStatus" column="approve_status"/>
</resultMap>
<sql id="selectCoscoSupplierChangeWorkFlowVo">
select id, supplier_change_apply_id, supplier_id, work_flow_id, org_id, approve_status
from cosco_supplier_change_work_flow
</sql>
<select id="selectCoscoSupplierChangeWorkFlowList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeWorkFlow" resultMap="CoscoSupplierChangeWorkFlowResult">
<include refid="selectCoscoSupplierChangeWorkFlowVo"/>
<where>
<if test="supplierChangeApplyId != null and supplierChangeApplyId != ''">
and supplier_change_apply_id = #{supplierChangeApplyId}
</if>
<if test="supplierId != null and supplierId != ''">
and supplier_id = #{supplierId}
</if>
<if test="workFlowId != null and workFlowId != ''">
and work_flow_id = #{workFlowId}
</if>
<if test="orgId != null and orgId != ''">
and org_id = #{orgId}
</if>
<if test="approveStatus != null ">
and approve_status = #{approveStatus}
</if>
</where>
</select>
<select id="selectCoscoSupplierChangeWorkFlowById" parameterType="String"
resultMap="CoscoSupplierChangeWorkFlowResult">
<include refid="selectCoscoSupplierChangeWorkFlowVo"/>
where id = #{id}
</select>
<select id="selectCoscoSupplierChangeWorkFlowId" parameterType="String"
resultMap="CoscoSupplierChangeWorkFlowResult">
<include refid="selectCoscoSupplierChangeWorkFlowVo"/>
where work_flow_id = #{workFlowId} LIMIT 1
</select>
<insert id="insertCoscoSupplierChangeWorkFlow" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeWorkFlow">
insert into cosco_supplier_change_work_flow
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="supplierChangeApplyId != null and supplierChangeApplyId != ''">supplier_change_apply_id,</if>
<if test="supplierId != null and supplierId != ''">supplier_id,</if>
<if test="workFlowId != null and workFlowId != ''">work_flow_id,</if>
<if test="orgId != null and orgId != ''">org_id,</if>
<if test="approveStatus != null">approve_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="supplierChangeApplyId != null and supplierChangeApplyId != ''">#{supplierChangeApplyId},</if>
<if test="supplierId != null and supplierId != ''">#{supplierId},</if>
<if test="workFlowId != null and workFlowId != ''">#{workFlowId},</if>
<if test="orgId != null and orgId != ''">#{orgId},</if>
<if test="approveStatus != null">#{approveStatus},</if>
</trim>
</insert>
<insert id="batchCoscoSupplierChangeWorkFlow" parameterType="java.util.List">
insert into cosco_supplier_change_work_flow
( id, supplier_change_apply_id, supplier_id, work_flow_id, org_id, approve_status)
values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.supplierChangeApplyId}, #{item.supplierId}, #{item.workFlowId}, #{item.orgId}, #{item.approveStatus})
</foreach>
</insert>
<update id="updateCoscoSupplierChangeWorkFlow" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeWorkFlow">
update cosco_supplier_change_work_flow
<trim prefix="SET" suffixOverrides=",">
<if test="supplierChangeApplyId != null and supplierChangeApplyId != ''">supplier_change_apply_id =
#{supplierChangeApplyId},
</if>
<if test="supplierId != null and supplierId != ''">supplier_id =
#{supplierId},
</if>
<if test="workFlowId != null and workFlowId != ''">work_flow_id =
#{workFlowId},
</if>
<if test="orgId != null and orgId != ''">org_id =
#{orgId},
</if>
<if test="approveStatus != null">approve_status =
#{approveStatus},
</if>
</trim>
where id = #{id}
</update>
<update id="deleteCoscoSupplierChangeWorkFlowById" parameterType="String">
update cosco_supplier_change_work_flow set del_flag = 2
where id = #{id}
</update>
<update id="deleteCoscoSupplierChangeWorkFlowByIds" parameterType="String">
update cosco_supplier_change_work_flow set del_flag = 2 where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
</mapper>