diff --git a/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java b/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java index a38ede1a..1a22a66e 100644 --- a/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java +++ b/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java @@ -47,7 +47,7 @@ public class BazVisitInstanceController { public R> 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)); 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 80282670..febfbe9c 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 @@ -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; } diff --git a/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java b/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java index ec3854b7..72264049 100644 --- a/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java +++ b/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java @@ -163,12 +163,6 @@ public class TagDataController { Integer saveType = param.getSaveType(); List tagInfoList = new ArrayList<>(); if(CollUtil.isNotEmpty(param.getTagIds())){ - long count = tagInfoService.count(new LambdaQueryWrapper() - .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 lqw = new LambdaQueryWrapper<>(); lqw.eq(TagData::getTargetId,objectDTO.getTargetId()); lqw.eq(TagData::getTargetType,objectDTO.getTargetType()); - //移除历史记录时,加载所有业务标签,并排除在外 - List tagInfos = tagInfoService.list(new LambdaQueryWrapper() - .eq(TagInfo::getBusinessFlag,1)); - List 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(); diff --git a/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java b/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java index 1bee5821..94fd8c8f 100644 --- a/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java +++ b/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; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java index ddba49c6..6df2e64e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java +++ b/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(); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index 9c29533f..b1308af1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/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 affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream() - .filter(Objects::nonNull).map(CtpAffair::getAffairId).collect(Collectors.toList())); + .map(CtpAffair::getAffairId).collect(Collectors.toList())); List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); List userList = getSysUserService().listByOaMemberIds(oaUserIds); SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class); 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 ef1f644b..b1a531cf 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 @@ -1356,21 +1356,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl