debug

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;

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<BmsSubjectRegion> 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());
+        }
     }
 
     /**

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;

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<String> saleRegionIds;

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

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

src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java

@@ -17,5 +17,9 @@ public interface BmsSubjectMapper extends BaseMapper<BmsSubject> {
     @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);
+
 }
 

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

@@ -277,8 +277,7 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl<BmsCenterExtendMappe
         //移除
         LambdaQueryWrapper<BmsCenterExtend> 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);
         //新增

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

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<Long> countOverdue(){
+        long data = tbsCostApplyService.selectCountOverdueState(AuthContextUtils.getSysUserId());
+        return R.ok(data);
+    }
+
     /**
      * 预览
      * @param id

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")

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java

@@ -49,6 +49,9 @@ public class TbsActivitySubjectBo implements Serializable {
     /** 成本中心列表 */
     private List<ActivityCenterBo> centerList;
 
+    /** 科目表单值 */
+    private String subjectFormValue;
+
     @Data
     public static class ActivityCenterBo{
 

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<TbsCostApply> {
 
+    /**
+     * 统计即将逾期
+     * @param userId
+     * @param startNowDate
+     * @param nowDate
+     * @return
+     */
+    Long selectCountOverdueState(@Param("userId")String userId,
+                                 @Param("startNowDate") LocalDate startNowDate,
+                                 @Param("nowDate")LocalDate nowDate);
+
     /**
      * 查询列表
      * @param page

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<TbsCostApply> {
 
+    /**
+     * 统计即将逾期
+     * @param userId
+     * @return
+     */
+    Long selectCountOverdueState(String userId);
+
     IPage<TbsCostApply> selectPage(TbsCostApply costApply) ;
 
     /**

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<TbsActivityMapper,TbsAct
     private final TbsCostApplyService costApplyService;
     private final TbsCenterDtoService tbsCenterDtoService;
 
+    private final BmsSubjectFormMapper subjectFormMapper;
     private final BmsSupplierService supplierService;
     private final BmsSubjectService subjectService;
     private final BmsChannelService channelService;
@@ -383,6 +385,15 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
             activitySubject.setCountSession(subjectBo.getCountSession());
             activitySubject.setCountPerson(subjectBo.getCountPerson());
             activitySubject.setRemark(subjectBo.getRemark());
+            if(subject.getFormIdForCostApply()!=null&&!subject.getFormIdForCostApply().equals(0L)){
+                BmsSubjectForm subjectForm = subjectFormMapper.selectById(subject.getFormIdForCostApply());
+                if(subjectForm==null){
+                    Assert.throwEx("科目"+subject.getSubjectName()+"["+subject.getSubjectCode()+"]的缺失申请表单，请检查科目的信息");
+                }
+                activitySubject.setSubjectFormId(subjectForm.getId());
+                activitySubject.setSubjectFormContext(subjectForm.getFormContext());
+            }
+            activitySubject.setSubjectFormValue(subjectBo.getSubjectFormValue());
             activitySubjects.add(activitySubject);
             BigDecimal totalAmount = BigDecimal.ZERO;
             BigDecimal totalRate = BigDecimal.ZERO;

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

@@ -72,6 +72,22 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private TbsActivityMapper tbsActivityMapper;
     private ProjectProperties projectProperties;
 
+    @Override
+    public Long selectCountOverdueState(String userId) {
+        int sysConfOfWarningDays = 0;
+        try {
+            SysConfigService configService = SpringUtils.getBean(SysConfigService.class);
+            SysConfig config = configService.getByKey("ExpenseApplicationActivityWriteOffOverdueWarningDays");
+            String val = config.getConfigValue();
+            sysConfOfWarningDays = Integer.parseInt(val);
+        } catch (BeansException | NumberFormatException e) {
+            e.printStackTrace();
+        }
+        LocalDate now = LocalDate.now();
+        LocalDate startNow = now.plusDays( - sysConfOfWarningDays );
+        return baseMapper.selectCountOverdueState(userId,startNow,now);
+    }
+
     @Override
     public IPage<TbsCostApply> selectPage(TbsCostApply costApply) {
         int sysConfOfWarningDays = 0;

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<String> userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId());

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;

src/main/resources/mapper/tbs/TbsCostApplyMapper.xml

@@ -105,11 +105,26 @@
                 #{selectId}
             </foreach>
         </if>
-
         order by tbs_cost_apply.`create_time` DESC
 
     </select>
 
+    <select id="selectCountOverdueState" resultType="java.lang.Long">
+        SELECT
+            count(*)
+        FROM `tbs_cost_apply` `tbs_cost_apply`
+            left JOIN `tbs_activity`
+                on `tbs_cost_apply`.id = `tbs_activity`.cost_apply_id
+        WHERE
+              `tbs_cost_apply`.`del_flag` = 0
+                and `tbs_activity`.`del_flag` = 0
+                and `tbs_activity`.`activity_state` = 0
+                and `tbs_cost_apply`.`charge_state` = 2
+                and `tbs_activity`.pre_check_date &gt;= #{startNowDate}
+                and `tbs_activity`.pre_check_date &lt; #{nowDate}
+                and `tbs_cost_apply`.`user_id` = #{userId}
+    </select>
+
 
     <sql id="baseWhere4CostApply">
         <if test="query.id != null"> and `tbs_cost_apply`.`id` = #{query.id}</if>