From d0a58048869627eb753c18c69483688c99b424f8 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 18 Jan 2023 15:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/seeyon/entity/CtpAffair.java | 2 ++ .../modules/seeyon/entity/CtpAffairQo.java | 16 +++++++++---- .../modules/seeyon/service/SeeYonService.java | 2 +- .../service/impl/SeeYonServiceImpl.java | 5 ++-- .../modules/tbs/common/TbsSeeYonConst.java | 4 ---- .../controller/TbsCostApplyController.java | 21 +++++++--------- .../service/TbsBudgetApplicationService.java | 2 +- .../impl/TbsActivityTemplateServiceImpl.java | 5 +++- .../service/impl/TbsCostApplyServiceImpl.java | 1 + .../controller/VtbVerificationController.java | 8 +++---- .../impl/VtbVerificationServiceImpl.java | 24 ++++++++++++------- 11 files changed, 52 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java index e960c7ca..08345bb4 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java @@ -14,6 +14,8 @@ import java.util.Date; @Data public class CtpAffair { + private Integer finishedflag; + /** 审批节点id */ private String affairId; diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java index 30617055..7ed59ff8 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java @@ -13,19 +13,17 @@ import java.util.List; public class CtpAffairQo { String memberId; - String formMainId; /** - * 状态：0-未完成与已完成；1-未完成；2已完成；其它-加载所有 + * 状态：0-未完成与已完成(默认)；1-未完成；2已完成；3-我发起的；其它-被拦截 */ Integer state; Integer pageNum; - Integer pageSize; - String viewName; + String templateCode; String templateId; @@ -36,7 +34,17 @@ public class CtpAffairQo { String title; String rowState; + String targetId; String startTime; String endTime; + /** + * 费用申请专用 + */ + String chargeTheme; + + /** + * 费用申请专用 + */ + String userName; } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java index eafa651c..d4c88991 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java @@ -17,7 +17,7 @@ import java.util.List; */ public interface SeeYonService { - R> commonListAffairs(String syFormId, String templateId, String viewName); + R> commonListAffairs(String targetId,String syFormId, String templateId, String templateCode); R commonCommit(TbsAffairCommitBo affairCommit,String formCode); diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java index a170ce60..8651c7da 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java @@ -39,15 +39,16 @@ public class SeeYonServiceImpl implements SeeYonService { @Nullable @Override - public R> commonListAffairs(String syFormId, String templateId, String viewName) { + public R> commonListAffairs(String targetId,String syFormId, String templateId, String templateCode) { SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){ return R.error("当前账号未绑定致远用户信息"); } CtpAffairQo param = new CtpAffairQo(); + param.setTargetId(targetId); param.setFormMainId(syFormId); param.setTemplateId(templateId); - param.setViewName(viewName); + param.setTemplateCode(templateCode); return this.listFormAffair(param); } 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 3d2439d7..0c38a4f0 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 @@ -17,10 +17,6 @@ public interface TbsSeeYonConst { String COST_APPLY_TMP_ID = "3018014149748736162"; String VERIFICATION_TMP_ID = "8370474123848467567"; - //模板对应表单 - String VERIFICATION_VIEW = "vw_qs_formmain_1781"; - String COST_APPLY_VIEW = "vw_qs_formmain_1758"; - String API_PROCESS_CREATE = "/process/create"; String API_PROCESS_COMMIT = "/process/commit"; String API_PROCESS_CANCEL = "/process/cancel"; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 2a8ecba2..48c311db 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -286,13 +286,12 @@ public class TbsCostApplyController { @GetMapping("/ListAffairs") public R> pageMemberAffair(Long costApplyId){ TbsCostApply costApplyParam = tbsCostApplyService.getById(costApplyId); - String syFormId = costApplyParam.getSyFormId(); - if(syFormId==null){ + if(costApplyParam.getSyFormId()==null){ return R.ok(); } String templateId = TbsSeeYonConst.COST_APPLY_TMP_ID; - String viewName = TbsSeeYonConst.COST_APPLY_VIEW; - R> syResult = seeYonService.commonListAffairs(syFormId,templateId,viewName); + String templateCode = TbsSeeYonConst.COST_APPLY_CODE; + R> syResult = seeYonService.commonListAffairs(costApplyId+"",null,templateId,templateCode); List ctpAffairs = syResult.getData(); if(ctpAffairs.size()>0){ List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); @@ -315,24 +314,20 @@ public class TbsCostApplyController { /** * 审批列表(翻页) - * @param state 状态：0-未完成与已完成(默认)；1-未完成；2已完成；3-我发起的；其它-被拦截 - * @param pageNum - * @param pageSize + * @param param * @return */ @GetMapping("/pageMemberAffair") - public R> pageMemberAffair(Integer state,Integer pageNum,Integer pageSize){ + public R> pageMemberAffair(CtpAffairQo param){ + param.setTitle(param.getChargeTheme()); + param.setApplyUserName(param.getUserName()); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){ return R.error("当前账号未绑定致远用户信息"); } - CtpAffairQo param = new CtpAffairQo(); param.setMemberId(sysUser.getSyUserId()); - param.setState(state); - param.setPageNum(pageNum); - param.setPageSize(pageSize); param.setTemplateId(TbsSeeYonConst.COST_APPLY_TMP_ID); - param.setViewName(TbsSeeYonConst.COST_APPLY_VIEW); + param.setTemplateCode(TbsSeeYonConst.COST_APPLY_CODE); R> syResult = seeYonService.pageMemberAffair(param); PageVo pageVo = syResult.getData(); List ctpAffairs = pageVo.getList(); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 1aa5d367..148a72fd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -413,7 +413,7 @@ public class TbsBudgetApplicationService { List currentScheduleItemBudgets = new ArrayList<>(); for (TbsActivity activity : activityList) { //忽略重叠情况 - if(activityCostItem.getActivityId().equals(activity.getId())){ + if(!activityCostItem.getActivityId().equals(activity.getId())){ continue; } for (TbsBudget budget : currentItemBudgetList) { diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java index 59741eec..01f21f0f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import com.qs.serve.modules.tbs.entity.TbsActivityTemplate; import com.qs.serve.modules.tbs.service.TbsActivityTemplateService; import com.qs.serve.modules.tbs.mapper.TbsActivityTemplateMapper; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -40,11 +41,13 @@ public class TbsActivityTemplateServiceImpl extends ServiceImpl> result = seeYonService.commonListAffairs(syFormId, templateId,viewName); + String templateCode = TbsSeeYonConst.VERIFICATION_CODE; + R> result = seeYonService.commonListAffairs(verificationId+"",null, templateId,templateCode); List result2 = this.buildCtpAffairVoList(result.getData()); return R.ok(result2); } @@ -174,8 +174,8 @@ public class VtbVerificationController { param.setState(state); param.setPageNum(pageNum); param.setPageSize(pageSize); - param.setViewName(TbsSeeYonConst.VERIFICATION_VIEW); - param.setViewName(TbsSeeYonConst.VERIFICATION_TMP_ID); + param.setTemplateId(TbsSeeYonConst.VERIFICATION_TMP_ID); + param.setTemplateCode(TbsSeeYonConst.VERIFICATION_CODE); R> syResult = seeYonService.pageMemberAffair(param); PageVo pageVo = syResult.getData(); List ctpAffairs = pageVo.getList(); 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 dae55201..c5cfc805 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 @@ -256,7 +256,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl data = new HashMap<>(10); - data.put("empId",sysUser.getCode()); - data.put("applyTime", DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME)); - data.put("verAmount",verification.getAmount()); - data.put("verId",verification.getId()); + private void commitSy(String actTitle,SysUser sysUser,VtbVerification verification){ + Map data = new HashMap<>(20); + data.put("applyUserCode",sysUser.getCode()); + data.put("applyUserName",sysUser.getName()); + data.put("supplierName",verification.getSupplierName()); + data.put("supplierCode",verification.getSupplierCode()); + data.put("title",actTitle); + data.put("rowDate",DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME)); + data.put("rowState","00"); + data.put("orgId",verification.getId()); + data.put("targetId",verification.getId()); + data.put("targetCode",verification.getVerificationCode()); + data.put("exsp1",TbsSeeYonConst.VERIFICATION_CODE); BaseCreateProcessBo createProcess = new BaseCreateProcessBo(); - createProcess.setTemplateCode(TbsSeeYonConst.VERIFICATION_VIEW); + createProcess.setTemplateCode(TbsSeeYonConst.VERIFICATION_CODE); createProcess.setMemberLoginName(sysUser.getSyAccount()); createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_VERIFICATION + verification.getRemark()); createProcess.setDataJson(JsonUtil.objectToJson(data));