debug,加签异常修改

src/main/java/com/qs/serve/common/util/HttpUtil.java

@@ -130,6 +130,7 @@ public class HttpUtil {
         String result = HttpUtil.doPost(url,jsonStr,headers);
         log.debug("url:{},result:{}",url,result);
         if(result==null){
+            log.warn("jsonStr:{}",jsonStr);
             Assert.throwEx("远程服务连接失败");
         }
         JSONObject jsonObject = JSONObject.parseObject(result);

src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java

@@ -55,9 +55,9 @@ public class BmsRegion2ServiceImpl extends ServiceImpl<BmsRegion2Mapper,BmsRegio
         BmsRegion2 ori = this.getById(param.getId());
         param = this.toSetLevel(param);
         boolean changePid = !ori.getPid().equals(param.getPid());
-        if(changePid){
-            Assert.throwEx("当前版本限制上下级变更");
-        }
+//        if(changePid){
+//            Assert.throwEx("当前版本限制上下级变更");
+//        }
         boolean b = updateById(param);
         if(!ori.getName().equals(param.getName())||changePid) {
             BmsRegion2 parentRegion = this.updatePathByPid(param.getId());

src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java

@@ -59,9 +59,9 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
         BmsRegion ori = this.getById(param.getId());
         param = this.flushSetLevel(param);
         boolean changePid = !ori.getPid().equals(param.getPid());
-        if(changePid){
-            Assert.throwEx("当前版本限制上下级变更");
-        }
+//        if(changePid){
+//            Assert.throwEx("当前版本限制上下级变更");
+//        }
         boolean b = this.updateById(param);
         if(!ori.getName().equals(param.getName())||changePid) {
             BmsRegion parentRegion = this.updatePathByPid(param.getId());

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

@@ -80,14 +80,28 @@ public interface SeeYonOperationService extends SeeYonBaseService{
     default R<String> addNode(CtpAddNodeParam param){
         getRequestService().testConnection();
         CtpAddNodeDTO addNodeDTO = new CtpAddNodeDTO();
-        addNodeDTO.setUserIds(param.getUserIds());
         addNodeDTO.setBackToMe(param.getBackToMe());
         addNodeDTO.setTargetId(param.getTargetId());
+        List<String> selectUserIds = new ArrayList<>();
+        for (String userId : param.getUserIds()) {
+            SysUser user = getUserMapper().selectById(userId);
+            if(StringUtils.hasText(user.getSyUserId())&&!user.getSyUserId().equals("0")){
+                selectUserIds.add(user.getSyUserId());
+            }
+        }
+        if(selectUserIds.size()==0){
+            Assert.throwEx("选中的用户未绑定OA凭证");
+        }
+        addNodeDTO.setUserIds(selectUserIds);
         SysUser sysUser = getUserMapper().selectById(AuthContextUtils.getSysUserId());
         addNodeDTO.setUserCode(sysUser.getAccount());
         addNodeDTO.setUserSyId(sysUser.getSyUserId());
         addNodeDTO.setTemplateCode(getTemplateCode());
-        return getRequestService().addNode(addNodeDTO);
+        R<String> result = getRequestService().addNode(addNodeDTO);
+        if(result.getData()!=null&&result.getData().contains("OK")){
+            return R.ok();
+        }
+        return R.error(result.getMsg());
     }
 
     /**

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

@@ -160,9 +160,7 @@ public class TbsBudgetController {
             optType = BudgetLogOptFlag.State_2;
         }
         TbsBudgetLog budgetLog = TbsBudgetLogBuildUtil.toTbsBudgetLog(sysUser,budget,scheduleItemBudget,optType, amount);
-        if(budgetLog!=null){
-            tbsBudgetLogService.save(budgetLog);
-        }
+        tbsBudgetLogService.save(budgetLog);
         return R.ok();
     }
 

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

@@ -203,6 +203,8 @@ public class TbsBudgetApplicationService {
             LambdaQueryWrapper<TbsBudget> budgetLqw = new LambdaQueryWrapper<>();
             budgetLqw.in(TbsBudget::getId,budgetIds);
             budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds)));
+            //排除随货编码
+            budgetLqw.ne(TbsBudget::getSubjectCode,"FYMC05");
             budgetLqw.in(TbsBudget::getCenterId,centerIds);
             budgetLqw.eq(TbsBudget::getBudgetState,1);
             //科目限制>品类之间>时间区间

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

@@ -35,8 +35,9 @@ public interface TbsCostApplyService extends IService<TbsCostApply> {
      * 1.前提先刷新活动状态
      * 2.在释放费用和审批完成后调用
      * @param costApplyId
+     * @param isContractFlag 是否协议类
      */
-    void flushCostStatus(Long costApplyId);
+    void flushCostStatus(Long costApplyId,boolean isContractFlag);
 
 }
 

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

@@ -279,14 +279,25 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     }
 
     @Override
-    public void flushCostStatus(Long costApplyId) {
-        LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
-        actLqw.eq(TbsActivity::getCostApplyId,costApplyId);
-        List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
-        for (TbsActivity activity : activityList) {
-            if(!activity.getActivityState().equals(TbsActivityState.STATE_4_Release)
-                    &&!activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
-                return;
+    public void flushCostStatus(Long costApplyId,boolean isContractFlag) {
+        if(isContractFlag){
+            LambdaQueryWrapper<TbsActivityPayCondition> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(TbsActivityPayCondition::getCostApplyId,costApplyId);
+            List<TbsActivityPayCondition> conditionList = tbsActivityPayConditionMapper.selectList(lqw);
+            for (TbsActivityPayCondition condition : conditionList) {
+                if(condition.getFinishedFlag().equals(0)){
+                    return;
+                }
+            }
+        }else {
+            LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
+            actLqw.eq(TbsActivity::getCostApplyId,costApplyId);
+            List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
+            for (TbsActivity activity : activityList) {
+                if(!activity.getActivityState().equals(TbsActivityState.STATE_4_Release)
+                        &&!activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
+                    return;
+                }
             }
         }
         TbsCostApply costApply = new TbsCostApply();

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java

@@ -13,6 +13,7 @@ import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
+import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
@@ -287,7 +288,7 @@ public class TzcPolicyController {
      * @return
      */
     @PostMapping("/commitAffair")
-    @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
+    @SysLog(module = SystemModule.Policy, title = "政策", biz = BizType.DELETE)
     @PreAuthorize("hasRole('tbs:costApply:commit')")
     public R<?> commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){
         return tzcPolicyOperationService.commitAffair(affairCommit);
@@ -370,5 +371,16 @@ public class TzcPolicyController {
     }
 
 
+    /**
+     * 加签
+     * @param param
+     * @return
+     */
+    @PostMapping("/addNode")
+    @SysLog(module = SystemModule.Budget, title = "政策", biz = BizType.DELETE)
+    public R<String> addNode(@RequestBody CtpAddNodeParam param){
+        return tzcPolicyOperationService.addNode(param);
+    }
+
 }
 

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -364,7 +364,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
             budgetLqw.in(TbsBudget::getId,budgetIds);
             //默认为随货折让(FYMC05)
             //budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds)));
-            budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.eq(TbsBudget::getSubjectCode,"FYMC05")));
+            budgetLqw.eq(TbsBudget::getSubjectCode,"FYMC05");
             budgetLqw.in(TbsBudget::getCenterId,centerIds);
             budgetLqw.eq(TbsBudget::getBudgetState,1);
             budgetList = tbsBudgetMapper.selectList(budgetLqw);

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

@@ -9,6 +9,7 @@ import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.*;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
+import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
 import com.qs.serve.modules.seeyon.entity.dto.CtpAffairPageSo;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysAttach;
@@ -211,8 +212,6 @@ public class VtbVerificationController {
         return R.byEmptyList();
     }
 
-
-
     /**
      * 提交审批节点
      * @return
@@ -225,7 +224,17 @@ public class VtbVerificationController {
         return verificationApplication.commitAffair(affairCommit);
     }
 
-
+    /**
+     * 加签
+     * @param param
+     * @return
+     */
+//    @PostMapping("/addNode")
+//    @SysLog(module = SystemModule.Verification, title = "核销加签", biz = BizType.OTHER)
+//    public R<String> addNode(@RequestBody CtpAddNodeParam param){
+//        seeYonService.testConnection();
+//        return verificationApplication.commitAffair(param);
+//    }
 
 
 }

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

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
-import com.qs.serve.modules.tbs.entity.TbsActivity;
-import com.qs.serve.modules.tbs.entity.TbsActivityCenter;
-import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
-import com.qs.serve.modules.tbs.entity.TbsActivitySubject;
+import com.qs.serve.modules.tbs.entity.*;
+import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.vtb.common.VtbFundFlowType;
 import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
@@ -36,6 +34,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFundFlow> implements VtbFundFlowService {
 
+    private final TbsCostApplyMapper costApplyMapper;
     private final TbsActivityService activityService;
     private final TbsActivitySubjectService activitySubjectService;
     private final TbsActivityCenterService activityCenterService;
@@ -89,7 +88,13 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
             activity.setActivityState(TbsActivityState.STATE_1_Finished);
             activity.setFinishedTime(LocalDateTime.now());
         }else {
-            activity.setActivityState(TbsActivityState.STATE_0_Todo);
+            //判断是否协议类
+            TbsCostApply costApply = costApplyMapper.selectById(activity.getCostApplyId());
+            if(costApply.getContractFlag().equals(1)){
+                activity.setActivityState(TbsActivityState.STATE_1_Finished);
+            }else {
+                activity.setActivityState(TbsActivityState.STATE_0_Todo);
+            }
         }
         activityService.updateById(activity);
     }

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

@@ -157,7 +157,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             budgetLogService.saveBatch(budgetLogList);
         }
         //如果为最后的活动，更变费用申请状态
-        costApplyService.flushCostStatus(costApply.getId());
+        costApplyService.flushCostStatus(costApply.getId(),costApply.getContractFlag().equals(1));
     }
 
     @Override