diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 97d46948..f6faa936 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -15,6 +15,7 @@ import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo; import com.qs.serve.modules.bir.service.BirBaseActivityService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import com.qs.serve.modules.bir.service.BirRoiRateService; @@ -40,6 +41,7 @@ public class BirRoiRateController { * @return */ @GetMapping("/test22") + @Scheduled(cron="0 0 1 * * ?") public R getPage(){ //移除当年所有 int year = 2023; diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java index 96a626bc..9c3bd0d6 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java @@ -133,6 +133,10 @@ public class BmsSubjectController { BmsSubjectForm subjectForm = bmsSubjectFormService.getById(bmsSubject.getFormId()); bmsSubject.setSubjectFormInfo(subjectForm); } + if(bmsSubject.getFormIdForCostApply()!=null){ + BmsSubjectForm subjectForm = bmsSubjectFormService.getById(bmsSubject.getFormIdForCostApply()); + bmsSubject.setSubjectFormInfo4CostApply(subjectForm); + } if(bmsSubject.getSaleRegionFlag().equals(1)){ List subjectRegionList = bmsSubjectRegionService.listBySubjectId(bmsSubject.getId(),0); bmsSubject.setSaleRegionInfos(subjectRegionList); @@ -232,6 +236,9 @@ public class BmsSubjectController { if(subject.getFormId()==null){ bmsSubjectMapper.removeFormId(subject.getId()); } + if(subject.getFormIdForCostApply()==null){ + bmsSubjectMapper.removeFormIdForCost(subject.getId()); + } } /** diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java index 211d993c..05e327a0 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java @@ -46,6 +46,9 @@ public class BmsCostCenter implements Serializable { @NotNull(message = "层级不能为空") private Integer level; + /** 是否所有人可见 */ + private Integer visibleFlag; + /** 父级节点 */ @NotNull(message = "父级节点不能为空") private Long pid; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSubject.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSubject.java index 7f01cd3d..9407e82f 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSubject.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSubject.java @@ -95,9 +95,15 @@ public class BmsSubject implements Serializable { /** 表单ID */ private Long formId; + /** 表单id(费用申请) */ + private Long formIdForCostApply; + @TableField(exist = false) private Object subjectFormInfo; + @TableField(exist = false) + private Object subjectFormInfo4CostApply; + /** 销售区域id */ @TableField(exist = false) private List saleRegionIds; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCostCenterBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCostCenterBo.java index efde5b84..9c5ec056 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCostCenterBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCostCenterBo.java @@ -41,4 +41,6 @@ public class BmsCostCenterBo { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 是否所有人可见 */ + private Integer visibleFlag; } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java index 8fb608bc..87a45828 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java @@ -34,4 +34,6 @@ public class BmsCostCenterTreeVo extends TreeNode { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 是否所有人可见 */ + private Integer visibleFlag; } diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java index 8254a8a2..63c0c12d 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java @@ -17,5 +17,9 @@ public interface BmsSubjectMapper extends BaseMapper { @Update("update bms_subject set form_id = null where id = #{id}") int removeFormId(@Param("id") Long id); + @InterceptorIgnore(tenantLine = "1") + @Update("update bms_subject set form_id_for_cost_apply = null where id = #{id}") + int removeFormIdForCost(@Param("id") Long id); + } 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 0d3c85d9..ab7dc5e0 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 @@ -277,8 +277,7 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl dellqw = new LambdaQueryWrapper<>(); dellqw.eq(BmsCenterExtend::getCenterType,param.getType()); - dellqw.eq(BmsCenterExtend::getCenterId,param.getSourceCenterId()); - dellqw.ne(BmsCenterExtend::getSourceId,0); + dellqw.eq(BmsCenterExtend::getSourceId,param.getId()); dellqw.notIn(BmsCenterExtend::getId,updateIds); this.remove(dellqw); //新增 diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java index 48246f92..9d117c2d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java @@ -125,15 +125,11 @@ public class TbsActivityTemplateController { if(param.getId()==null){ return R.error("id is null"); } - TbsActivityTemplate template = new TbsActivityTemplate(); - template.setId(param.getId()); + TbsActivityTemplate template = tbsActivityTemplateService.getById(param.getId()); template.setTemplateState(param.getTemplateState()); tbsActivityTemplateService.updateById(template); - TbsActivityTemplate tmp = tbsActivityTemplateService.getById(param.getId()); - if(tmp!=null){ - TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(tmp,param.getTemplateState()); - activityTemplateLogService.save(templateLog); - } + TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,param.getTemplateState()); + activityTemplateLogService.save(templateLog); return R.ok(template); } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 9e3bbcf2..7678ed9c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -76,6 +76,16 @@ public class TbsCostApplyController { private TbsCostApplyCompensateServiceImpl tbsCostApplyCompensateService; private TbsCostApplyOperationServiceImpl tbsCostApplyOperationServiceImpl; + /** + * 统计即将逾期 + * @return + */ + @GetMapping("myCountOverdue4Home") + public R countOverdue(){ + long data = tbsCostApplyService.selectCountOverdueState(AuthContextUtils.getSysUserId()); + return R.ok(data); + } + /** * 预览 * @param id diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySubject.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySubject.java index 2b478f88..1792f19e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySubject.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySubject.java @@ -73,6 +73,15 @@ public class TbsActivitySubject implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 科目表单id */ + private Long subjectFormId; + + /** 科目表单内容 */ + private String subjectFormContext; + + /** 科目表单id */ + private String subjectFormValue; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java index fd2fd6ce..e65a2959 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java @@ -49,6 +49,9 @@ public class TbsActivitySubjectBo implements Serializable { /** 成本中心列表 */ private List centerList; + /** 科目表单值 */ + private String subjectFormValue; + @Data public static class ActivityCenterBo{ diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java index 50905684..8553cdcd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.List; /** @@ -18,6 +19,17 @@ import java.util.List; */ public interface TbsCostApplyMapper extends BaseMapper { + /** + * 统计即将逾期 + * @param userId + * @param startNowDate + * @param nowDate + * @return + */ + Long selectCountOverdueState(@Param("userId")String userId, + @Param("startNowDate") LocalDate startNowDate, + @Param("nowDate")LocalDate nowDate); + /** * 查询列表 * @param page diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java index 1a51e667..871aaa1a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.common.model.dto.R; import com.qs.serve.modules.tbs.entity.TbsCostApply; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,6 +16,13 @@ import java.util.List; */ public interface TbsCostApplyService extends IService { + /** + * 统计即将逾期 + * @param userId + * @return + */ + Long selectCountOverdueState(String userId); + IPage selectPage(TbsCostApply costApply) ; /** diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index 5b28ed3b..b0d196be 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.model.consts.SysConfigKey; import com.qs.serve.common.util.*; import com.qs.serve.modules.bms.entity.*; +import com.qs.serve.modules.bms.mapper.BmsSubjectFormMapper; import com.qs.serve.modules.bms.service.*; import com.qs.serve.modules.goods.entity.GoodsCategory; import com.qs.serve.modules.goods.entity.GoodsSku; @@ -59,6 +60,7 @@ public class TbsActivityServiceImpl extends ServiceImpl selectPage(TbsCostApply costApply) { int sysConfOfWarningDays = 0; diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index f5f12869..78494740 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -87,10 +87,10 @@ public class VtbVerificationController { //减少mysql limit 产生的 IO lqw.select(VtbVerification::getId); if(param.getQueryStartTime()!=null){ - lqw.ge(VtbVerification::getFinishedTime,param.getQueryStartTime()); + lqw.ge(VtbVerification::getCreateTime,param.getQueryStartTime()); } if(param.getQueryEndTime()!=null){ - lqw.le(VtbVerification::getFinishedTime,param.getQueryEndTime()); + lqw.le(VtbVerification::getCreateTime,param.getQueryEndTime()); } if(loadChild!=null&&loadChild.equals(1)){ List userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId()); diff --git a/src/main/java/com/qs/serve/task/HisTask.java b/src/main/java/com/qs/serve/task/HisTask.java index a1c40427..5a89c223 100644 --- a/src/main/java/com/qs/serve/task/HisTask.java +++ b/src/main/java/com/qs/serve/task/HisTask.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component @AllArgsConstructor -//@ConditionalOnProperty(value = "project.task", havingValue = "true") +@ConditionalOnProperty(value = "project.task", havingValue = "true") public class HisTask { RedisService redisService; diff --git a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml index 81fe9dca..f5a72b32 100644 --- a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml +++ b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml @@ -105,11 +105,26 @@ #{selectId} - order by tbs_cost_apply.`create_time` DESC + + and `tbs_cost_apply`.`id` = #{query.id}