From 7aff57ff9144de22e1d952fd2cf80a3abc93a866 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 5 Aug 2024 15:36:22 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8D=8F=E8=AE=AE=E7=B1=BB?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E9=87=8A=E6=94=BE=E5=92=8C=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E5=85=B3=E8=81=94OA=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsSupplierController.java | 5 +++- .../serve/modules/goods/entity/GoodsSpu.java | 3 +++ .../modules/tbs/common/TbsSeeYonConst.java | 2 ++ .../impl/TbsBudgetManagerServiceImpl.java | 2 +- .../service/impl/TbsCostApplyServiceImpl.java | 3 +++ .../impl/VtbVerificationServiceImpl.java | 26 +++++++++++++++++-- .../resources/mapper/goods/GoodsSpuMapper.xml | 12 +++++++++ 7 files changed, 49 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 4b831a2e..1e626f1e 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -41,6 +41,7 @@ import com.qs.serve.modules.tbs.service.TbsBudgetService; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -78,6 +79,8 @@ public class BmsSupplierController { private SysAttachService attachService; private BirBudgetTargetService birBudgetTargetService; + private BmsSupplierMapper supplierMapper; + @GetMapping("/queryList") public R> getQueryList(BmsSupplier param){ @@ -607,7 +610,7 @@ public class BmsSupplierController { bmsSupplier.setUserVos(userVos); initSupplierList(Arrays.asList(bmsSupplier)); - + return R.ok(bmsSupplier); } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java index f6ba100b..9929ae78 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java @@ -235,6 +235,9 @@ public class GoodsSpu implements Serializable { @TableField(exist = false) private String keyword; + @TableField(exist = false) + private String spuCodeOrName; + @TableField(exist = false) private String keywordName; diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index 4db087a9..19334705 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -77,6 +77,8 @@ public interface TbsSeeYonConst { String API_TEST = "/testConnection"; String API_PROCESS_CREATE = "/process/create"; + String API_CONTRACT_RELEASE_CANCEL = "/process/cancelReleaseContractApply"; + String API_CONTRACT_RELEASE = "/process/releaseContractApply"; String API_PROCESS_GET_CONST = "/process/getConst"; String API_PROCESS_CREATE_NEW = "/process/newCreate"; String API_PROCESS_CREATE_CALLBACK = "/process/createCallback"; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetManagerServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetManagerServiceImpl.java index 29db4315..87047da7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetManagerServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetManagerServiceImpl.java @@ -105,7 +105,7 @@ public class TbsBudgetManagerServiceImpl implements TbsBudgetManagerService { //判断成本中心 List centerList = centerListMap.get(activityId); for (TbsActivityCenter center : centerList) { - if(!center.getCenterType().equals(budget.getCenterType())||center.getCenterId().equals(budget.getCenterId())){ + if(!center.getCenterType().equals(budget.getCenterType())||!center.getCenterId().equals(budget.getCenterId())){ String msg = "无法匹配成本中心["+center.getCenterCode()+"]"+center.getCenterName(); msgVoList.add(new TbsBudgetMatchMsgVo(budget,activity,msg)); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index b07d4af7..57070b12 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -933,6 +933,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl payConditions, BmsSupplier supplier, SysUser sysUser, Map data,List contracts, List costTodoList ,Map newWayData) { + /** + * 重要：exsp3 已用，在OA系统中标记是否释放拦截 + */ data.put("title", tbsCostApply.getChargeTheme()); data.put("orgId", tbsCostApply.getId().toString()); data.put("costApplyCode", tbsCostApply.getCode()); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index ef1f644b..0f4434f0 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -31,6 +31,7 @@ import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo; import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo; import com.qs.serve.modules.seeyon.service.SeeYonRequestService; import com.qs.serve.modules.seeyon.service.XiaoLuTonService; +import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService; import com.qs.serve.modules.sys.entity.SysSyncLog; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysSyncLogService; @@ -107,6 +108,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_CONTRACT_RELEASE + +"?id="+costApply.getId() + +"&code="+costApply.getCode(),null,"协议类申请取消释放"); + if(result==null||result.getStatus()==null||result.getStatus()!=200){ + Assert.throwEx("协议类取消释放时，调用OA失败"); + } + } BirActivityCenterGoodsUtil.buildBir(costApply.getId()); } @@ -613,6 +625,17 @@ public class VtbVerificationServiceImpl extends ServiceImpl result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_CONTRACT_RELEASE_CANCEL + + "?id="+costApply.getId() + + "&code="+costApply.getCode() + ,null,"协议类申请取消释放"); + if(result==null||result.getStatus()==null||result.getStatus()!=200){ + Assert.throwEx("协议类取消释放时，调用OA失败"); + } + } if(activity.getReleaseFlag().equals(1)){ //还原活动状态 TbsActivity param = new TbsActivity(); @@ -627,7 +650,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl + + and ( + `spu`.`name` like concat('%', #{query.spuCodeOrName},'%') or + `spu`.`spu_code` like concat('%', #{query.spuCodeOrName},'%') + ) + and ( `sku`.`sku_code` like concat('%', #{query.keywordCode},'%') or @@ -374,6 +380,12 @@ `spu`.`spu_code` like concat('%', #{query.keyword},'%') ) + + and ( + `spu`.`name` like concat('%', #{query.spuCodeOrName},'%') or + `spu`.`spu_code` like concat('%', #{query.spuCodeOrName},'%') + ) + and ( `sku`.`sku_code` like concat('%', #{query.keywordCode},'%') or