审批流程调整

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;
 

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;
 }

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface SeeYonService {
 
-    R<List<CtpAffair>> commonListAffairs(String syFormId, String templateId, String viewName);
+    R<List<CtpAffair>> commonListAffairs(String targetId,String syFormId, String templateId, String templateCode);
 
     R<String> commonCommit(TbsAffairCommitBo affairCommit,String formCode);
 

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<List<CtpAffair>> commonListAffairs(String syFormId, String templateId, String viewName) {
+    public R<List<CtpAffair>> 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);
     }
 

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";

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -286,13 +286,12 @@ public class TbsCostApplyController {
     @GetMapping("/ListAffairs")
     public R<List<CtpAffairVo>> 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<List<CtpAffair>> syResult = seeYonService.commonListAffairs(syFormId,templateId,viewName);
+        String templateCode = TbsSeeYonConst.COST_APPLY_CODE;
+        R<List<CtpAffair>> syResult = seeYonService.commonListAffairs(costApplyId+"",null,templateId,templateCode);
         List<CtpAffair> ctpAffairs = syResult.getData();
         if(ctpAffairs.size()>0){
             List<String> 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<PageVo<CtpAffairVo>> pageMemberAffair(Integer state,Integer pageNum,Integer pageSize){
+    public R<PageVo<CtpAffairVo>> 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<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param);
         PageVo<CtpAffair> pageVo = syResult.getData();
         List<CtpAffair> ctpAffairs = pageVo.getList();

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -413,7 +413,7 @@ public class TbsBudgetApplicationService {
         List<TbsScheduleItemBudget> currentScheduleItemBudgets = new ArrayList<>();
         for (TbsActivity activity : activityList) {
             //忽略重叠情况
-            if(activityCostItem.getActivityId().equals(activity.getId())){
+            if(!activityCostItem.getActivityId().equals(activity.getId())){
                 continue;
             }
             for (TbsBudget budget : currentItemBudgetList) {

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<TbsActivityTempl
     private final TbsActivityTemplateLogService activityTemplateLogService;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public TbsActivityTemplate modify(TbsActivityTemplateBo templateBo) {
         TbsActivityTemplate template = CopierUtil.copy(templateBo,new TbsActivityTemplate());
         this.saveOrUpdate(template);
         if(templateBo.getId()!=null){
-            TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,3);
+            TbsActivityTemplate templateDb = this.getById(template.getId());
+            TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(templateDb,3);
             activityTemplateLogService.save(templateLog);
         }
         //移除历史

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -66,6 +66,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         data.put("supplierCode",tbsCostApply.getSupplierCode());
         data.put("title",tbsCostApply.getChargeTheme());
         data.put("rowDate",DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME));
+        data.put("rowState","00");
         data.put("orgId",tbsCostApply.getId());
         data.put("targetId",tbsCostApply.getId());
         data.put("targetCode",tbsCostApply.getCode());

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -150,8 +150,8 @@ public class VtbVerificationController {
             return R.ok();
         }
         String templateId = TbsSeeYonConst.VERIFICATION_TMP_ID;
-        String viewName = TbsSeeYonConst.VERIFICATION_VIEW;
-        R<List<CtpAffair>> result = seeYonService.commonListAffairs(syFormId, templateId,viewName);
+        String templateCode = TbsSeeYonConst.VERIFICATION_CODE;
+        R<List<CtpAffair>> result = seeYonService.commonListAffairs(verificationId+"",null, templateId,templateCode);
         List<CtpAffairVo> 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<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param);
         PageVo<CtpAffair> pageVo = syResult.getData();
         List<CtpAffair> ctpAffairs = pageVo.getList();

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -256,7 +256,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         verification.setAmount(totalAmount);
         //保存
         this.saveOrUpdate(verification);
-        this.commitSy(sysUser,verification);
+        this.commitSy(activity.getActTitle(),sysUser,verification);
         this.updateById(verification);
         if(!StringUtils.hasText(verification.getSyFormId())||!StringUtils.hasText(verification.getSyFlowId())){
             Assert.throwEx("远程调用失败");
@@ -286,17 +286,25 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
 
     /**
      * 提交到致远审批流程
+     * @param actTitle
      * @param sysUser
      * @param verification
      */
-    private void commitSy(SysUser sysUser,VtbVerification verification){
-        Map<String, Object> 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<String, Object> 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));