fix：修复核销模板同步异常

src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java

@@ -213,7 +213,7 @@ public class SeeYonController {
                 for (Object o : pageVo.getList()) {
                     String json = JsonUtil.objectToJson(o);
                     SeeYonApproveDataVo obj = JsonUtil.jsonToPojo(json,SeeYonApproveDataVo.class);
-                    if(obj!=null&&obj.getTargetCode()!=null){
+                    if(obj!=null&&obj.getTemplateCode()!=null){
                         //tempCode不参与业务。统一类型重新赋值，方便前端跳转
                         String tempCode = obj.getTemplateCode().replace("_Test","");
                         tempCode = tempCode.replace("contractApply","CostBill");

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

@@ -460,7 +460,7 @@ public class TbsBudgetController {
                 new LambdaQueryWrapper<TbsBudget>()
                         .in(TbsBudget::getId,idsLong)
                         .eq(TbsBudget::getBudgetState,0)
-                        .eq(TbsBudget::getBudgetCheckState,TbsCommonCheckState.State_0_unPublish)
+                        .ne(TbsBudget::getBudgetCheckState,TbsCommonCheckState.State_0_unPublish)
         );
         if(countUnPub>0){
             return R.error("预算状态不支持删除");

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

@@ -115,34 +115,39 @@ public class TbsActivityTemplateServiceImpl extends ServiceImpl<TbsActivityTempl
     public void updateState() {
         AuthContextUtils.setTenant("001");
         LocalDateTime nowTime = LocalDateTime.now();
+        //启用未开始的模板
         LambdaQueryWrapper<TbsActivityTemplate> lqw = new LambdaQueryWrapper<>();
-        lqw.select(TbsActivityTemplate::getId);
-        lqw.le(TbsActivityTemplate::getStartTime,nowTime);
-        lqw.and(qw->
-                qw.ge(TbsActivityTemplate::getEndTime,nowTime)
+        lqw.select(
+                TbsActivityTemplate::getId,
+                TbsActivityTemplate::getStartTime,
+                TbsActivityTemplate::getEndTime
+                )
+        .le(TbsActivityTemplate::getStartTime,nowTime)
+        .and(qw->{
+            qw.isNull(TbsActivityTemplate::getEndTime)
                     .or()
-                    .isNull(TbsActivityTemplate::getEndTime)
-        );
-        lqw.eq(TbsActivityTemplate::getTemplateState,0);
+                    .ge(TbsActivityTemplate::getEndTime,nowTime);
+        })
+        .eq(TbsActivityTemplate::getTemplateState,0);
         List<TbsActivityTemplate> preStartList = this.list(lqw);
         if(CollectionUtil.isNotEmpty(preStartList)){
             preStartList.forEach(a->a.setTemplateState(1));
             this.updateBatchById(preStartList);
         }
 
+        //关闭超时模板
         LambdaQueryWrapper<TbsActivityTemplate> lqw2 = new LambdaQueryWrapper<>();
-        lqw2.select(TbsActivityTemplate::getId);
-        lqw2.and(a->
-            a.ge(TbsActivityTemplate::getStartTime,nowTime)
-                    .or()
-                    .le(TbsActivityTemplate::getEndTime,nowTime)
-        );
+        lqw2.select(TbsActivityTemplate::getId,
+                TbsActivityTemplate::getStartTime,
+                TbsActivityTemplate::getEndTime);
+        lqw2.le(TbsActivityTemplate::getEndTime,nowTime);
         lqw2.eq(TbsActivityTemplate::getTemplateState,1);
         List<TbsActivityTemplate> preCloseList = this.list(lqw2);
         if(CollectionUtil.isNotEmpty(preCloseList)){
             preCloseList.forEach(a->a.setTemplateState(0));
             this.updateBatchById(preCloseList);
         }
+
     }
 }