From 1fa85a913eec7d3ab2341f9810da710fba359ebe Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 1 Jun 2023 10:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsSupplierController.java | 6 ++++-- .../modules/bms/entity/bo/BmsCenterExtendBo.java | 8 ++++++++ .../service/impl/BmsCenterExtendServiceImpl.java | 16 +++++++++++++--- .../his/controller/HistTestController.java | 2 ++ .../com/qs/serve/modules/pay/entity/PayWay.java | 1 + .../seeyon/service/SeeYonOperationService.java | 4 ++++ .../modules/tbs/entity/vo/TbsCostApplyVo.java | 1 + .../impl/TbsActivityTemplateServiceImpl.java | 6 ++++++ .../qs/serve/modules/wx/entity/WxFormPush.java | 1 + .../serve/modules/wx/entity/WxFormPushType.java | 2 ++ src/main/java/com/qs/serve/task/TbsTask.java | 4 ++-- .../resources/mapper/wx/WxFormPushMapper.xml | 15 ++++++++++++--- 12 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 49da0c3a..e2044434 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -375,11 +375,13 @@ public class BmsSupplierController { if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){ userIds = Arrays.asList(supplier.getOtherUserIds()); } + Set otherUserIdSet = new HashSet<>(userIds); if(supplier.getUserId()==null){ + otherUserIdSet.add(supplier.getUserId()); + } + if(otherUserIdSet.size()<1){ return R.ok(); } - Set otherUserIdSet = new HashSet<>(userIds); - otherUserIdSet.add(supplier.getUserId()); List userList = sysUserService.listByIds(otherUserIdSet); List sysUsers = userList.stream().map(SysUser::toSysUserVo).collect(Collectors.toList()); return R.ok(sysUsers); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCenterExtendBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCenterExtendBo.java index 89df407f..9063f169 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCenterExtendBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCenterExtendBo.java @@ -1,8 +1,10 @@ package com.qs.serve.modules.bms.entity.bo; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.List; /** @@ -29,6 +31,12 @@ public class BmsCenterExtendBo { List targetCenters; + /** + * 继承时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + LocalDate extendDate; + @Data public static class Item{ diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java index 4bbd03bf..a7a3d406 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java @@ -70,7 +70,8 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl updExtendBo = targetCenters.stream().filter(a->a.getId()!=null).collect(Collectors.toList()); List updateIds = targetCenters.stream().filter(a->a.getId()!=null ).map(a->a.getId()).collect(Collectors.toList()); - //新增 + + LocalDateTime nowTime = param.getExtendDate().atStartOfDay(); + //更新被继承成本 BmsCenterExtend currentCenter = this.getById(param.getId()); + currentCenter.setStopTime(nowTime); + this.updateById(currentCenter); + //新增 for (BmsCenterExtendBo.Item item : saveExtendBo) { //校验是否可添加 if (this.checkIsStop(currentCenter.getCenterType(),item.getTargetCenterId())){ @@ -288,7 +294,11 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl delUsrLqw = new LambdaQueryWrapper<>(); delUsrLqw.eq(BmsCenterExtendUser::getChildExtId,centerExtend.getId()); centerExtendUserService.remove(delUsrLqw); diff --git a/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java b/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java index feaa9636..504a68b9 100644 --- a/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java +++ b/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java @@ -10,6 +10,7 @@ import com.qs.serve.modules.oms.entity.OmsOrder; import com.qs.serve.task.HisTask; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,6 +26,7 @@ import java.util.List; @AllArgsConstructor @RestController @RequestMapping("his/dev") +@ConditionalOnBean(HisTask.class) public class HistTestController { HisUserChannelPointService hisUserChannelPointService; diff --git a/src/main/java/com/qs/serve/modules/pay/entity/PayWay.java b/src/main/java/com/qs/serve/modules/pay/entity/PayWay.java index 4899c1e8..a355421c 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/PayWay.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/PayWay.java @@ -34,6 +34,7 @@ public class PayWay implements Serializable { /** 支付方式 */ @NotBlank(message = "支付方式不能为空") @Length(max = 250,message = "支付方式长度不能超过250字") + @TableField(condition = SqlCondition.LIKE) private String title; /** 停用:0->启用；1->停用 */ diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index 9f72df48..34fa07ee 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -84,8 +84,12 @@ public interface SeeYonOperationService extends SeeYonBaseService{ addNodeDTO.setBackToMe(param.getBackToMe()); addNodeDTO.setTargetId(param.getTargetId()); List selectUserIds = new ArrayList<>(); + SysUser loginUser = getUserMapper().selectById(AuthContextUtils.getSysUserId()); for (String userId : param.getUserIds()) { SysUser user = getUserMapper().selectById(userId); + if(loginUser.getSyUserId().equals(user.getSyUserId())){ + return R.error("不能选择相同的OA账号的员工"); + } if(StringUtils.hasText(user.getSyUserId())&&!user.getSyUserId().equals("0")){ selectUserIds.add(user.getSyUserId()); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java index dcdd7ed0..5c6ad00a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java @@ -82,5 +82,6 @@ public class TbsCostApplyVo implements Serializable { /** 加载下属标识 1 是，0否 */ private Integer loadChild; + private Integer contractFlag; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java index 01f21f0f..f8be33ca 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.modules.bms.entity.BmsRegion; @@ -43,6 +44,11 @@ public class TbsActivityTemplateServiceImpl extends ServiceImpl wxFormPushUserList; diff --git a/src/main/java/com/qs/serve/modules/wx/entity/WxFormPushType.java b/src/main/java/com/qs/serve/modules/wx/entity/WxFormPushType.java index 45aadcd2..208ecaa4 100644 --- a/src/main/java/com/qs/serve/modules/wx/entity/WxFormPushType.java +++ b/src/main/java/com/qs/serve/modules/wx/entity/WxFormPushType.java @@ -33,10 +33,12 @@ public class WxFormPushType implements Serializable { /** 编码 */ @Length(max = 255,message = "编码长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String code; /** 标题 */ @Length(max = 255,message = "标题长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String title; /** 备注 */ diff --git a/src/main/java/com/qs/serve/task/TbsTask.java b/src/main/java/com/qs/serve/task/TbsTask.java index a0052cd8..3976fa60 100644 --- a/src/main/java/com/qs/serve/task/TbsTask.java +++ b/src/main/java/com/qs/serve/task/TbsTask.java @@ -31,7 +31,7 @@ public class TbsTask { //每日更新过期的活动，过期则进行冻结 - @Scheduled(cron="0 0 9 * * ?") + @Scheduled(cron="0 0 1 * * ?") public void task1(){ AuthContextUtils.setTenant("001"); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); @@ -43,7 +43,7 @@ public class TbsTask { } //启用和停用模板规则 - @Scheduled(cron="0 0 9 * * ?") + @Scheduled(cron="0 0 1 * * ?") public void task2(){ AuthContextUtils.setTenant("001"); LocalDateTime nowTime = LocalDateTime.now(); diff --git a/src/main/resources/mapper/wx/WxFormPushMapper.xml b/src/main/resources/mapper/wx/WxFormPushMapper.xml index 3393db7a..abd832cc 100644 --- a/src/main/resources/mapper/wx/WxFormPushMapper.xml +++ b/src/main/resources/mapper/wx/WxFormPushMapper.xml @@ -62,7 +62,7 @@ and `wx_form_push`.`type_id` = #{query.typeId} and `wx_form_push`.`type_code` = #{query.typeCode} and `wx_form_push`.`type_name` = #{query.typeName} - and `wx_form_push`.`title` = #{query.title} + and `wx_form_push`.`title` like concat('%',#{query.title},'%') and `wx_form_push`.`create_time` = #{query.createTime} and `wx_form_push`.`update_time` = #{query.updateTime} and `wx_form_push`.`tenant_id` = #{query.tenantId} @@ -75,13 +75,22 @@ and `wx_form_push`.`title` like concat('%',#{query.formTitle},'%') - and `wx_form_push_user`.`create_time` >= #{query.queryStartTime} + and `wx_form_push`.`publish_time` >= #{query.queryStartTime} - and `wx_form_push_user`.`create_time` <= #{query.queryEndTime} + and `wx_form_push`.`publish_time` <= #{query.queryEndTime} + + and `wx_form_push`.`effective_start_time` >= #{query.effectiveStartTime} + + + + and `wx_form_push`.`effective_end_time` <= #{query.effectiveEndTime} + + + and `wx_form_push_user`.`user_id` = #{query.queryUserId}