修复异常

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<String> otherUserIdSet = new HashSet<>(userIds);
         if(supplier.getUserId()==null){
+            otherUserIdSet.add(supplier.getUserId());
+        }
+        if(otherUserIdSet.size()<1){
             return R.ok();
         }
-        Set<String> otherUserIdSet = new HashSet<>(userIds);
-        otherUserIdSet.add(supplier.getUserId());
         List<SysUser> userList = sysUserService.listByIds(otherUserIdSet);
         List<SysUserVo> sysUsers = userList.stream().map(SysUser::toSysUserVo).collect(Collectors.toList());
         return R.ok(sysUsers);

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<Item> targetCenters;
 
+    /**
+     * 继承时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    LocalDate extendDate;
+
     @Data
     public static class Item{
 

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

@@ -70,7 +70,8 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl<BmsCenterExtendMappe
         }
         TbsCenterDto centerDto = centerDtoService.getCenterDto(type,centerId);
         //停止时间
-        LocalDateTime nowTime = LocalDateTime.now();
+        //LocalDateTime nowTime = LocalDateTime.now();
+        LocalDateTime nowTime = param.getExtendDate().atStartOfDay();
         //当前节点
         BmsCenterExtend currentCenter = new BmsCenterExtend();
         currentCenter.setSourceId(0L);
@@ -250,8 +251,13 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl<BmsCenterExtendMappe
         List<BmsCenterExtendBo.Item> updExtendBo = targetCenters.stream().filter(a->a.getId()!=null).collect(Collectors.toList());
         List<Long> 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<BmsCenterExtendMappe
                 if(centerExtend.getId().equals(item.getId())){
                     //匹配更新
                     centerExtend.setWeightRate(item.getWeightRate());
-                    if(item.getUpdateUserListFlag()!=null&&item.getUpdateUserListFlag().equals(1)){
+                    centerExtend.setStartTime(nowTime);
+                    this.updateById(centerExtend);
+
+                    boolean noUpdUserList = item.getUpdateUserListFlag()!=null&&item.getUpdateUserListFlag().equals(0);
+                    if(!noUpdUserList){
                         LambdaQueryWrapper<BmsCenterExtendUser> delUsrLqw = new LambdaQueryWrapper<>();
                         delUsrLqw.eq(BmsCenterExtendUser::getChildExtId,centerExtend.getId());
                         centerExtendUserService.remove(delUsrLqw);

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;

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->停用 */

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<String> 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());
             }

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;
 }
 

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<TbsActivityTempl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TbsActivityTemplate modify(TbsActivityTemplateBo templateBo) {
+        if(templateBo.getStartTime()!=null&&templateBo.getEndTime()!=null){
+            if(templateBo.getStartTime().isBefore(templateBo.getEndTime())){
+                Assert.throwEx("启停时间异常");
+            }
+        }
         TbsActivityTemplate template = CopierUtil.copy(templateBo,new TbsActivityTemplate());
         this.saveOrUpdate(template);
         if(templateBo.getId()!=null){

src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java

@@ -147,6 +147,7 @@ public class WxFormPush implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate queryEndTime;
 
+
     @TableField(exist = false)
     private List<WxFormPushUser> wxFormPushUserList;
 

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;
 
     /** 备注 */

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<TbsActivity> 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();

src/main/resources/mapper/wx/WxFormPushMapper.xml

@@ -62,7 +62,7 @@
             <if test="query.typeId != null and query.typeId != ''"> and `wx_form_push`.`type_id` = #{query.typeId}</if>
             <if test="query.typeCode != null and query.typeCode != ''"> and `wx_form_push`.`type_code` = #{query.typeCode}</if>
             <if test="query.typeName != null and query.typeName != ''"> and `wx_form_push`.`type_name` = #{query.typeName}</if>
-            <if test="query.title != null and query.title != ''"> and `wx_form_push`.`title` = #{query.title}</if>
+            <if test="query.title != null and query.title != ''"> and `wx_form_push`.`title` like concat('%',#{query.title},'%') </if>
             <if test="query.createTime != null"> and `wx_form_push`.`create_time` = #{query.createTime}</if>
             <if test="query.updateTime != null"> and `wx_form_push`.`update_time` = #{query.updateTime}</if>
             <if test="query.tenantId != null and query.tenantId != ''"> and `wx_form_push`.`tenant_id` = #{query.tenantId}</if>
@@ -75,13 +75,22 @@
             <if test="query.formTitle != null and query.formTitle != ''"> and `wx_form_push`.`title` like concat('%',#{query.formTitle},'%') </if>
 
             <if test="query.queryStartTime != null">
-                and `wx_form_push_user`.`create_time` &gt;= #{query.queryStartTime}
+                and `wx_form_push`.`publish_time` &gt;= #{query.queryStartTime}
             </if>
 
             <if test="query.queryEndTime != null">
-                and `wx_form_push_user`.`create_time` &lt;= #{query.queryEndTime}
+                and `wx_form_push`.`publish_time` &lt;= #{query.queryEndTime}
             </if>
 
+            <if test="query.effectiveStartTime != null">
+                and `wx_form_push`.`effective_start_time` &gt;=  #{query.effectiveStartTime}
+            </if>
+
+            <if test="query.effectiveEndTime != null">
+                and `wx_form_push`.`effective_end_time` &lt;= #{query.effectiveEndTime}
+            </if>
+
+
             <if test="query.queryUserId != null and query.queryUserId != ''">
                 and `wx_form_push_user`.`user_id` = #{query.queryUserId}
             </if>