fix: 合并分支

src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java

@@ -47,7 +47,7 @@ public class BazVisitInstanceController {
     public R<PageVo<BazVisitInstance>> getPage(BazVisitInstanceSo param){
         BazVisitInstance query = CopierUtil.copy(param,new BazVisitInstance());
         if(param.getQueryStartDate()!=null){
-            query.setQueryStartDate(param.getQueryStartDate().atStartOfDay());
+            query.setQueryEndDate(param.getQueryStartDate().atStartOfDay());
         }
         if(param.getQueryEndDate()!=null){
             query.setQueryEndDate(param.getQueryEndDate().atTime(23,59,59));

src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java

@@ -39,16 +39,10 @@ public class CtpAffair {
 
     private String targetId;
 
-    @TableField(exist = false)
     private String param0;
-    @TableField(exist = false)
     private String param1;
-    @TableField(exist = false)
     private String param2;
-    @TableField(exist = false)
     private String param3;
-    @TableField(exist = false)
     private String param4;
-    @TableField(exist = false)
     private String param5;
 }

src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java

@@ -163,12 +163,6 @@ public class TagDataController {
         Integer saveType = param.getSaveType();
         List<TagInfo> tagInfoList = new ArrayList<>();
         if(CollUtil.isNotEmpty(param.getTagIds())){
-            long count = tagInfoService.count(new LambdaQueryWrapper<TagInfo>()
-                    .eq(TagInfo::getBusinessFlag,1)
-                    .in(TagInfo::getId,param.getTagIds()));
-            if(count>0){
-                return R.error("业务标签不支持绑定");
-            }
             tagInfoList = tagInfoService.listByIds(param.getTagIds());
         }
         for (TargetObjectDTO objectDTO : param.getTargetList()) {
@@ -240,12 +234,6 @@ public class TagDataController {
                 LambdaQueryWrapper<TagData> lqw = new LambdaQueryWrapper<>();
                 lqw.eq(TagData::getTargetId,objectDTO.getTargetId());
                 lqw.eq(TagData::getTargetType,objectDTO.getTargetType());
-                //移除历史记录时，加载所有业务标签，并排除在外
-                List<TagInfo> tagInfos = tagInfoService.list(new LambdaQueryWrapper<TagInfo>()
-                        .eq(TagInfo::getBusinessFlag,1));
-                List<Long> businessTagIds = tagInfos.stream().map(TagInfo::getId).collect(Collectors.toList());
-                businessTagIds.add(-999L);
-                lqw.notIn(TagData::getTagId,businessTagIds);
                 tagDataService.remove(lqw);
                 for (TagInfo tagInfo : tagInfoList) {
                     TagData data = new TagData();

src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java

@@ -57,9 +57,6 @@ public class TagInfo implements Serializable {
     /** 工作类别 */
     private String workType;
 
-    /** 表示是否业务标签 */
-    private String businessFlag;
-
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;

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

@@ -151,8 +151,10 @@ public class TbsCostApplyCheckController {
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
     @PreAuthorize("hasRole('tbs:costApply:commit')")
     public R<?> commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){
+        tbsCostApplyOperationServiceImpl.commitAffair(affairCommit);
+        //tbsCostApplyOperationServiceImpl.doFinished(affairCommit);
         BirActivityCenterGoodsUtil.buildBir(affairCommit.getCostApplyId());
-        return tbsCostApplyOperationServiceImpl.commitAffair(affairCommit);
+        return R.ok();
     }
 
     /**

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

@@ -208,7 +208,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
             DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class);
             SysAttachMapper sysAttachMapper = SpringUtils.getBean(SysAttachMapper.class);
             List<DataAffairCommit> affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream()
-                    .filter(Objects::nonNull).map(CtpAffair::getAffairId).collect(Collectors.toList()));
+                    .map(CtpAffair::getAffairId).collect(Collectors.toList()));
             List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList());
             List<SysUser> userList = getSysUserService().listByOaMemberIds(oaUserIds);
             SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class);

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

@@ -1356,21 +1356,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             verification.setVerificationState(VtbVerificationState.Finished.getCode());
             verification.setFinishedTime(LocalDateTime.now());
             super.updateById(verification);
-
-            //更新释放的核销(单个核销外层有释放，批量没有在这里补充)
-            if(verification.getBatchId()!=null
-                    &&verification.getRegReleaseFlag()!=null
-                    &&verification.getRegReleaseFlag().equals(1)){
-                //更新活动状态
-                SysUser sysUser = sysUserService.getById(verification.getRegReleaseUserId());
-                if(sysUser==null){
-                    sysUser = new SysUser();
-                    sysUser.setCode("0");
-                    sysUser.setName("系统执行");
-                }
-                this.release(verification.getActivityId(),sysUser.getCode(),true,false);
-            }
-            
             return;
         }
         TbsActivity activity = activityService.getById(verification.getActivityId());