Browse Source

需求调整

contract
Yen 2 years ago
parent
commit
35b207f958
  1. 1
      src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java
  2. 2
      src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java
  3. 1
      src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java
  4. 1
      src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java
  5. 44
      src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java
  6. 2
      src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java
  7. 4
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
  8. 8
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
  9. 24
      src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
  10. 7
      src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
  11. 3
      src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java
  12. 3
      src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivitySo.java
  13. 30
      src/main/java/com/qs/serve/modules/tbs/entity/so/TbsCostApplySo.java
  14. 7
      src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java
  15. 13
      src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java
  16. 6
      src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java
  17. 31
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
  18. 2
      src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java
  19. 14
      src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
  20. 24
      src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java
  21. 23
      src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java
  22. 3
      src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java
  23. 1
      src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
  24. 2
      src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationYard.java
  25. 1
      src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
  26. 3
      src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
  27. 96
      src/main/resources/mapper/tbs/TbsCostApplyMapper.xml

1
src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java

@ -50,7 +50,6 @@ public class HisUserSupplierTempServiceImpl extends ServiceImpl<HisUserSupplierT
@Override @Override
public void selectInfoHis() { public void selectInfoHis() {
hisUserSupplierMapper.delete(new QueryWrapper<>());
baseMapper.selectIntoHis(); baseMapper.selectIntoHis();
} }

2
src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java

@ -49,4 +49,6 @@ public class CtpAffairQo {
String userName; String userName;
String dataKey; String dataKey;
String queryBizRegion;
} }

1
src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java

@ -14,4 +14,5 @@ public class CtpAffairPageSo {
Integer state; Integer state;
Integer pageNum; Integer pageNum;
Integer pageSize; Integer pageSize;
Integer queryBizRegion;
} }

1
src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@ -165,6 +165,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){ if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){
Assert.throwEx("当前账号未绑定致远用户信息"); Assert.throwEx("当前账号未绑定致远用户信息");
} }
param.setQueryBizRegion(param.getQueryBizRegion());
param.setMemberId(sysUser.getSyUserId()); param.setMemberId(sysUser.getSyUserId());
param.setTemplateCode(getTemplateCode()); param.setTemplateCode(getTemplateCode());
R<PageVo<CtpAffair>> syResult = getRequestService().pageMemberAffair(param); R<PageVo<CtpAffair>> syResult = getRequestService().pageMemberAffair(param);

44
src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java

@ -0,0 +1,44 @@
package com.qs.serve.modules.tbs.common.util;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.util.SpringUtils;
import com.qs.serve.modules.sys.entity.SysConfig;
import com.qs.serve.modules.sys.service.SysConfigService;
import com.qs.serve.modules.tbs.entity.TbsActivity;
import org.springframework.beans.BeansException;
import javax.swing.*;
import java.time.LocalDate;
/**
* @author YenHex
* @since 2023/6/19
*/
public class TbsActivityUtil {
public static void buildOverdue(LambdaQueryWrapper<TbsActivity> lqw,Integer queryState){
if(queryState!=null){
if(queryState.equals(0)){
lqw.gt(TbsActivity::getActEndDate, LocalDate.now());
}else if(queryState.equals(1)){
lqw.le(TbsActivity::getActEndDate, LocalDate.now());
}else if(queryState.equals(2)){
LocalDate now = LocalDate.now();
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 startNow = now.plusDays( - sysConfOfWarningDays );
lqw.between(TbsActivity::getActEndDate,startNow , now);
}else {
lqw.eq(TbsActivity::getId,"0");
}
}
}
}

2
src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java

@ -72,7 +72,7 @@ public class TbsBudgetLogBuildUtil {
budgetLog.setAmount(buildAmount(amount,optType)); budgetLog.setAmount(buildAmount(amount,optType));
budgetLog.setScheduleId(item.getScheduleId()); budgetLog.setScheduleId(item.getScheduleId());
budgetLog.setScheduleItemId(item.getScheduleItemId()); budgetLog.setScheduleItemId(item.getScheduleItemId());
budgetLog.setScheduleItemBudgetId(item.getId()); budgetLog.setScheduleItemBudgetId(item.getScheduleItemBudgetId());
budgetLog.setItemName(item.getScheduleItemName()); budgetLog.setItemName(item.getScheduleItemName());
budgetLog.setStartDate(item.getActStartDate().atStartOfDay()); budgetLog.setStartDate(item.getActStartDate().atStartOfDay());
budgetLog.setEndDate(item.getActEndDate().atStartOfDay()); budgetLog.setEndDate(item.getActEndDate().atStartOfDay());

4
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@ -19,10 +19,12 @@ import com.qs.serve.modules.goods.service.GoodsCategoryService;
import com.qs.serve.modules.goods.service.GoodsSkuService; import com.qs.serve.modules.goods.service.GoodsSkuService;
import com.qs.serve.modules.goods.service.GoodsSpuService; import com.qs.serve.modules.goods.service.GoodsSpuService;
import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.entity.SysUser;
import com.qs.serve.modules.sys.service.SysConfigService;
import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsCenterType; import com.qs.serve.modules.tbs.common.TbsCenterType;
import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.common.TbsCostApplyState;
import com.qs.serve.modules.tbs.common.TbsGoodsType; import com.qs.serve.modules.tbs.common.TbsGoodsType;
import com.qs.serve.modules.tbs.common.util.TbsActivityUtil;
import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.*;
import com.qs.serve.modules.tbs.entity.bo.TbsActivityDefaultCenterBo; import com.qs.serve.modules.tbs.entity.bo.TbsActivityDefaultCenterBo;
import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo; import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo;
@ -40,6 +42,7 @@ import com.qs.serve.modules.tbs.entity.so.TbsActivitySo;
import com.qs.serve.modules.tbs.entity.bo.TbsActivityBo; import com.qs.serve.modules.tbs.entity.bo.TbsActivityBo;
import javax.validation.Valid; import javax.validation.Valid;
import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -94,6 +97,7 @@ public class TbsActivityController {
public R<List<TbsActivity>> getList(TbsActivitySo param){ public R<List<TbsActivity>> getList(TbsActivitySo param){
TbsActivity entity = CopierUtil.copy(param,new TbsActivity()); TbsActivity entity = CopierUtil.copy(param,new TbsActivity());
LambdaQueryWrapper<TbsActivity> lqw = new LambdaQueryWrapper<>(entity); LambdaQueryWrapper<TbsActivity> lqw = new LambdaQueryWrapper<>(entity);
TbsActivityUtil.buildOverdue(lqw,param.getOverdueState());
List<TbsActivity> list = tbsActivityService.list(lqw); List<TbsActivity> list = tbsActivityService.list(lqw);
for (TbsActivity activity : list) { for (TbsActivity activity : list) {
QueryWrapper qw = new QueryWrapper<>(); QueryWrapper qw = new QueryWrapper<>();

8
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@ -28,6 +28,7 @@ import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyActivityBo; import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyActivityBo;
import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyBo; import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyBo;
import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult; import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
import com.qs.serve.modules.tbs.entity.so.TbsCostApplySo;
import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo; import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo;
import com.qs.serve.modules.tbs.entity.vo.TbsCostApplyVo; import com.qs.serve.modules.tbs.entity.vo.TbsCostApplyVo;
@ -109,7 +110,8 @@ public class TbsCostApplyController {
TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply());
LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>(entity); LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>(entity);
lqw.orderByDesc(TbsCostApply::getId); lqw.orderByDesc(TbsCostApply::getId);
PageUtil.startPage(); TbsCostApplySo query = new TbsCostApplySo();
query.setOverdueState(param.getOverdueState());
List<TbsCostApply> list = tbsCostApplyService.list(lqw); List<TbsCostApply> list = tbsCostApplyService.list(lqw);
return R.ok(list); return R.ok(list);
} }
@ -132,6 +134,8 @@ public class TbsCostApplyController {
lqw.in(TbsCostApply::getCreateBy,userIds); lqw.in(TbsCostApply::getCreateBy,userIds);
lqw.orderByDesc(TbsCostApply::getId); lqw.orderByDesc(TbsCostApply::getId);
PageUtil.startPage(); PageUtil.startPage();
TbsCostApplySo query = new TbsCostApplySo();
query.setOverdueState(param.getOverdueState());
List<TbsCostApply> list = tbsCostApplyService.list(lqw); List<TbsCostApply> list = tbsCostApplyService.list(lqw);
return R.ok(list); return R.ok(list);
} }
@ -170,6 +174,8 @@ public class TbsCostApplyController {
LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>(entity); LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>(entity);
lqw.orderByDesc(TbsCostApply::getId); lqw.orderByDesc(TbsCostApply::getId);
PageUtil.startPage(); PageUtil.startPage();
TbsCostApplySo query = new TbsCostApplySo();
query.setOverdueState(param.getOverdueState());
List<TbsCostApply> list = tbsCostApplyService.list(lqw); List<TbsCostApply> list = tbsCostApplyService.list(lqw);
return R.byPageHelperList(list); return R.byPageHelperList(list);
} }

24
src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java

@ -1,6 +1,7 @@
package com.qs.serve.modules.tbs.entity; package com.qs.serve.modules.tbs.entity;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.Duration;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
@ -215,5 +216,28 @@ public class TbsActivity implements Serializable {
@TableField(exist = false) @TableField(exist = false)
Object applyUser; Object applyUser;
/**
* 逾期值
*/
@TableField(exist = false)
private Long overdueWarningDays;
/**
* 系统参数
*/
@TableField(exist = false)
private Integer expenseApplicationActivityWriteOffOverdueWarningDays;
/**
* 处理预警时间
* @param preDays
*/
public void initWarningDay(int preDays){
if(this.getActivityState().equals(1)){
Duration duration = Duration.between(this.getActEndDate(),LocalDate.now());
overdueWarningDays = duration.toDays();
}
}
} }

7
src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java

@ -67,6 +67,12 @@ public class TbsCostApply implements Serializable {
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private LocalDateTime submitTime; private LocalDateTime submitTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime passTime;
/** 申请人 */ /** 申请人 */
@NotBlank(message = "申请人不能为空") @NotBlank(message = "申请人不能为空")
@Length(max = 32,message = "申请人长度不能超过32字") @Length(max = 32,message = "申请人长度不能超过32字")
@ -138,5 +144,6 @@ public class TbsCostApply implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Object contractInfo; private Object contractInfo;
} }

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

@ -37,6 +37,9 @@ public class TbsAffairCommitBo {
@NotNull @NotNull
private String comment; private String comment;
private String caseRemark;
/** /**
* 修改金额列表核销接口专用 * 修改金额列表核销接口专用
*/ */

3
src/main/java/com/qs/serve/modules/tbs/entity/so/TbsActivitySo.java

@ -79,5 +79,8 @@ public class TbsActivitySo implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime passEndTime; private LocalDateTime passEndTime;
/** 0=>未逾期、1=>已逾期、2=>即将逾期 */
private Integer overdueState;
} }

30
src/main/java/com/qs/serve/modules/tbs/entity/so/TbsCostApplySo.java

@ -0,0 +1,30 @@
package com.qs.serve.modules.tbs.entity.so;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 费用申请 VO
* @author YenHex
* @since 2022-11-09
*/
@Data
public class TbsCostApplySo implements Serializable {
/**
* 0=>未逾期1=>已逾期2=>即将逾期
*/
Integer overdueState;
LocalDate nowDate;
LocalDate startNowDate;
}

7
src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java

@ -83,5 +83,12 @@ public class TbsCostApplyVo implements Serializable {
private Integer loadChild; private Integer loadChild;
private Integer contractFlag; private Integer contractFlag;
/**
* 0=>未逾期1=>已逾期2=>即将逾期
*/
Integer overdueState;
} }

13
src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplyMapper.java

@ -1,11 +1,15 @@
package com.qs.serve.modules.tbs.mapper; package com.qs.serve.modules.tbs.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.TbsCostApply;
import com.qs.serve.modules.tbs.entity.so.TbsCostApplySo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
/** /**
* 费用申请 Mapper * 费用申请 Mapper
@ -14,5 +18,14 @@ import java.math.BigDecimal;
*/ */
public interface TbsCostApplyMapper extends BaseMapper<TbsCostApply> { public interface TbsCostApplyMapper extends BaseMapper<TbsCostApply> {
/**
* 查询列表
* @param lqw
* @param param
* @return
*/
List<TbsCostApply> selectCostApplyList(@Param(Constants.WRAPPER)Wrapper<TbsCostApply> lqw,
@Param("query")TbsCostApplySo param);
} }

6
src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java

@ -1,8 +1,12 @@
package com.qs.serve.modules.tbs.service; package com.qs.serve.modules.tbs.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.dto.R;
import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.TbsCostApply;
import com.qs.serve.modules.tbs.entity.so.TbsCostApplySo;
import java.util.List;
/** /**
* 费用申请 服务接口 * 费用申请 服务接口
@ -11,6 +15,8 @@ import com.qs.serve.modules.tbs.entity.TbsCostApply;
*/ */
public interface TbsCostApplyService extends IService<TbsCostApply> { public interface TbsCostApplyService extends IService<TbsCostApply> {
List<TbsCostApply> selectList(LambdaQueryWrapper<TbsCostApply> lqw, TbsCostApplySo costApplySo,boolean isPage);
/** /**
* 提交申请 * 提交申请
* @param id * @param id

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

@ -17,7 +17,9 @@ import com.qs.serve.modules.bms.service.BmsSupplierService;
import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo; import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo;
import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo; import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo;
import com.qs.serve.modules.seeyon.service.SeeYonRequestService; import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
import com.qs.serve.modules.sys.entity.SysConfig;
import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.entity.SysUser;
import com.qs.serve.modules.sys.service.SysConfigService;
import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsActivityState;
import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.common.TbsCostApplyState;
@ -26,16 +28,19 @@ import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.*;
import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult; import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
import com.qs.serve.modules.tbs.entity.so.TbsCostApplySo;
import com.qs.serve.modules.tbs.mapper.TbsActivityMapper; import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
import com.qs.serve.modules.tbs.mapper.TbsActivityPayConditionMapper; import com.qs.serve.modules.tbs.mapper.TbsActivityPayConditionMapper;
import com.qs.serve.modules.tbs.service.*; import com.qs.serve.modules.tbs.service.*;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper; import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -67,6 +72,31 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
private TbsActivityMapper tbsActivityMapper; private TbsActivityMapper tbsActivityMapper;
private ProjectProperties projectProperties; private ProjectProperties projectProperties;
@Override
public List<TbsCostApply> selectList(LambdaQueryWrapper<TbsCostApply> lqw, TbsCostApplySo costApplySo,boolean isPage) {
if(costApplySo!=null){
LocalDate now = LocalDate.now();
if(costApplySo.getOverdueState()!=null){
costApplySo.setNowDate(now);
}
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 startNow = now.plusDays( - sysConfOfWarningDays );
costApplySo.setStartNowDate(startNow);
}
if(isPage){
PageUtil.startPage();
}
return baseMapper.selectCostApplyList(lqw,costApplySo);
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void commitApply(String id) { public void commitApply(String id) {
@ -334,6 +364,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
TbsCostApply costApply = new TbsCostApply(); TbsCostApply costApply = new TbsCostApply();
costApply.setId(costApplyId); costApply.setId(costApplyId);
costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode()); costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode());
costApply.setPassTime(LocalDateTime.now());
this.updateById(costApply); this.updateById(costApply);
} }

2
src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java

@ -41,7 +41,7 @@ public class ThirdTokenUtil {
System.out.println(token); System.out.println(token);
String time = LocalDate.now().toString(); String time = LocalDate.now().toString();
String match = SecureUtil.md5(ThirtyConst.PREFIX_MD5_VALUE + time); String match = cn.hutool.crypto.SecureUtil.md5( "jslApi-" + time);
if(token==null||!token.equalsIgnoreCase(match)){ if(token==null||!token.equalsIgnoreCase(match)){
if(DevEnvironmentConfig.isDev()){ if(DevEnvironmentConfig.isDev()){

14
src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java

@ -6,10 +6,9 @@ import com.qs.serve.common.model.dto.PageVo;
import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.dto.R;
import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.BizType;
import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.model.enums.SystemModule;
import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.*;
import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.sys.entity.SysAttach;
import com.qs.serve.common.util.CopierUtil; import com.qs.serve.modules.sys.service.SysAttachService;
import com.qs.serve.common.util.StringUtils;
import com.qs.serve.modules.tzc.common.TzcPolicyStatus; import com.qs.serve.modules.tzc.common.TzcPolicyStatus;
import com.qs.serve.modules.tzc.entity.TzcPolicy; import com.qs.serve.modules.tzc.entity.TzcPolicy;
import com.qs.serve.modules.tzc.entity.TzcPolicyGoods; import com.qs.serve.modules.tzc.entity.TzcPolicyGoods;
@ -25,6 +24,7 @@ import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
import com.qs.serve.modules.tzc.service.TzcPolicyItemService; import com.qs.serve.modules.tzc.service.TzcPolicyItemService;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -42,6 +42,7 @@ public class TzcPolicyItemController {
private TzcPolicyItemService tzcPolicyItemService; private TzcPolicyItemService tzcPolicyItemService;
private TzcPolicyGoodsService tzcPolicyGoodsService; private TzcPolicyGoodsService tzcPolicyGoodsService;
private TzcPolicyService tzcPolicyService; private TzcPolicyService tzcPolicyService;
private SysAttachService attachService;
/** /**
* 列表 * 列表
@ -94,6 +95,11 @@ public class TzcPolicyItemController {
List<TzcPolicyGoods> goodsList = tzcPolicyGoodsService.listByItemId(tzcPolicyItem.getId()); List<TzcPolicyGoods> goodsList = tzcPolicyGoodsService.listByItemId(tzcPolicyItem.getId());
goodsList.forEach(TzcPolicyGoods::initSpuSkuName); goodsList.forEach(TzcPolicyGoods::initSpuSkuName);
tzcPolicyItem.setPolicyGoodsList(goodsList); tzcPolicyItem.setPolicyGoodsList(goodsList);
if(CollectionUtil.isNotEmpty(tzcPolicyItem.getAttachIds())){
List<String> attachIds = Arrays.asList(tzcPolicyItem.getAttachIds());
List<SysAttach> attachList = attachService.listByIds(attachIds);
tzcPolicyItem.setAttachList(attachList);
}
return R.ok(tzcPolicyItem); return R.ok(tzcPolicyItem);
} }

24
src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java

@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
import com.qs.serve.modules.tbs.entity.TbsBudgetCondition; import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget; import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
import lombok.Data; import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -25,7 +27,7 @@ import java.util.List;
* @since 2023-02-20 * @since 2023-02-20
*/ */
@Data @Data
@TableName("tzc_policy_item") @TableName(value = "tzc_policy_item",autoResultMap = true)
public class TzcPolicyItem implements Serializable { public class TzcPolicyItem implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -145,6 +147,22 @@ public class TzcPolicyItem implements Serializable {
/** 同步状态 */ /** 同步状态 */
private Integer syncStatus; private Integer syncStatus;
/**
* 附件id
*/
@TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
private String[] attachIds;
/**
* 预计销量
*/
private Integer preActQuantity;
/**
* 不做活动预计销量
*/
private Integer preNotActQuantity;
/** 备注 */ /** 备注 */
@Length(max = 255,message = "备注长度不能超过255字") @Length(max = 255,message = "备注长度不能超过255字")
private String remark; private String remark;
@ -190,6 +208,10 @@ public class TzcPolicyItem implements Serializable {
@TableField(exist = false) @TableField(exist = false)
List<TbsBudgetCondition> usedConditionList; List<TbsBudgetCondition> usedConditionList;
/** 附件列表 */
@TableField(exist = false)
private List<?> attachList;
public void initSetNull(){ public void initSetNull(){
this.setId(null); this.setId(null);
this.setCreateBy(null); this.setCreateBy(null);

23
src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java

@ -5,10 +5,13 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
import lombok.Data; import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -77,5 +80,25 @@ public class TzcPolicyItemBo implements Serializable {
@NotNull(message = "商品列表参数不能为空") @NotNull(message = "商品列表参数不能为空")
List<TzcPolicyGoodsBo> policyGoodsList; List<TzcPolicyGoodsBo> policyGoodsList;
/** 备注 */
@Length(max = 255,message = "备注长度不能超过255字")
private String remark;
/**
* 附件
*/
private String[] attachIds;
/**
* 预计销量
*/
private Integer preActQuantity;
/**
* 不做活动预计销量
*/
private Integer preNotActQuantity;
} }

3
src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java

@ -111,6 +111,9 @@ public class TzcPolicyItemServiceImpl extends ServiceImpl<TzcPolicyItemMapper,Tz
tzcPolicyItem.setUserId(tzcPolicy.getUserId()); tzcPolicyItem.setUserId(tzcPolicy.getUserId());
tzcPolicyItem.setUserCode(tzcPolicy.getUserCode()); tzcPolicyItem.setUserCode(tzcPolicy.getUserCode());
tzcPolicyItem.setUserName(tzcPolicy.getUserName()); tzcPolicyItem.setUserName(tzcPolicy.getUserName());
tzcPolicyItem.setAttachIds(param.getAttachIds());
tzcPolicyItem.setPreActQuantity(param.getPreActQuantity());
tzcPolicyItem.setPreNotActQuantity(param.getPreNotActQuantity());
//移除旧记录 //移除旧记录
if(param.getId()!=null){ if(param.getId()!=null){
LambdaQueryWrapper<TzcPolicyGoods> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TzcPolicyGoods> lqw = new LambdaQueryWrapper<>();

1
src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@ -263,6 +263,7 @@ public class VtbVerificationController {
param.setSupplierName(costApply.getSupplierName()); param.setSupplierName(costApply.getSupplierName());
param.setSupplierCode(costApply.getSupplierCode()); param.setSupplierCode(costApply.getSupplierCode());
param.setApplyUserName(costApply.getUserName()); param.setApplyUserName(costApply.getUserName());
param.setQueryBizRegion(param.getQueryBizRegion());
param.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code()); param.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code());
R<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param); R<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param);
PageVo<CtpAffair> pageVo = syResult.getData(); PageVo<CtpAffair> pageVo = syResult.getData();

2
src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationYard.java

@ -59,6 +59,8 @@ public class VtbVerificationYard implements Serializable {
@Length(max = 255,message = "备注长度不能超过255字") @Length(max = 255,message = "备注长度不能超过255字")
private String remark; private String remark;
private String caseRemark;
/** 创建时间 */ /** 创建时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

1
src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@ -112,6 +112,7 @@ public class VtbVerificationApplication {
yard.setState(affairCommit.getState()); yard.setState(affairCommit.getState());
yard.setAffairId(affairCommit.getAffairId()); yard.setAffairId(affairCommit.getAffairId());
yard.setComment(affairCommit.getComment()); yard.setComment(affairCommit.getComment());
yard.setCaseRemark(affairCommit.getCaseRemark());
//审批中(next)、完成(finish)、拒绝(refused) //审批中(next)、完成(finish)、拒绝(refused)
boolean isFinish = "finish".equals(flag); boolean isFinish = "finish".equals(flag);
boolean isNext = "next".equals(flag); boolean isNext = "next".equals(flag);

3
src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@ -603,6 +603,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
if(costApply.getTotalActivityAmount().compareTo(totalCostApplyUsed)<=0){ if(costApply.getTotalActivityAmount().compareTo(totalCostApplyUsed)<=0){
//金额是否用完 //金额是否用完
updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode()); updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode());
updCost.setPassTime(LocalDateTime.now());
}else if (costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){ }else if (costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){
//协议类 //协议类
LambdaQueryWrapper<TbsActivityPayCondition> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TbsActivityPayCondition> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@ -611,6 +612,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
long count = activityPayConditionService.count(lambdaQueryWrapper); long count = activityPayConditionService.count(lambdaQueryWrapper);
if(count<1){ if(count<1){
updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode()); updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode());
updCost.setPassTime(LocalDateTime.now());
} }
}else { }else {
//所有活动完成 //所有活动完成
@ -625,6 +627,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
} }
if(updateChargeState){ if(updateChargeState){
updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode()); updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode());
updCost.setPassTime(LocalDateTime.now());
} }
} }
costApplyService.updateById(updCost); costApplyService.updateById(updCost);

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

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper">
<resultMap id="tbsCostApplyMap" type="com.qs.serve.modules.tbs.entity.TbsCostApply" >
<result property="id" column="id"/>
<result property="code" column="code"/>
<result property="chargeTheme" column="charge_theme"/>
<result property="supplierId" column="supplier_id"/>
<result property="supplierCode" column="supplier_code"/>
<result property="supplierName" column="supplier_name"/>
<result property="chargeState" column="charge_state"/>
<result property="submitTime" column="submit_time"/>
<result property="passTime" column="pass_time"/>
<result property="remark" column="remark"/>
<result property="userId" column="user_id"/>
<result property="userCode" column="user_code"/>
<result property="userName" column="user_name"/>
<result property="syFormId" column="sy_form_id"/>
<result property="syFlowId" column="sy_flow_id"/>
<result property="totalActivity" column="total_activity"/>
<result property="totalActivityAmount" column="total_activity_amount"/>
<result property="totalActivityUsedAmount" column="total_activity_used_amount"/>
<result property="contractFlag" column="contract_flag"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="tenantId" column="tenant_id"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<result property="templateId" column="template_id"/>
</resultMap>
<sql id="tbsCostApplySql">
tbs_cost_apply.`id`,
tbs_cost_apply.`code`,
tbs_cost_apply.`charge_theme`,
tbs_cost_apply.`supplier_id`,
tbs_cost_apply.`supplier_code`,
tbs_cost_apply.`supplier_name`,
tbs_cost_apply.`charge_state`,
tbs_cost_apply.`submit_time`,
tbs_cost_apply.`pass_time`,
tbs_cost_apply.`remark`,
tbs_cost_apply.`user_id`,
tbs_cost_apply.`user_code`,
tbs_cost_apply.`user_name`,
tbs_cost_apply.`sy_form_id`,
tbs_cost_apply.`sy_flow_id`,
tbs_cost_apply.`total_activity`,
tbs_cost_apply.`total_activity_amount`,
tbs_cost_apply.`total_activity_used_amount`,
tbs_cost_apply.`contract_flag`,
tbs_cost_apply.`create_time`,
tbs_cost_apply.`update_time`,
tbs_cost_apply.`tenant_id`,
tbs_cost_apply.`create_by`,
tbs_cost_apply.`update_by`,
tbs_cost_apply.`del_flag`,
tbs_cost_apply.`template_id` </sql>
<select id="selectCostApplyList" parameterType="com.qs.serve.modules.tbs.entity.TbsCostApply" resultMap="tbsCostApplyMap">
SELECT ${ew.sqlSelect}
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
<if test="query!=null">
<if test="query.overdueState!=null and query.overdueState==0">
and `tbs_activity`.`activity_state` = 0
and `tbs_cost_apply`.`charge_state` = 1
and `tbs_activity`.act_end_date &gt; #{query.nowDate}
</if>
<if test="query.overdueState!=null and query.overdueState==1">
and `tbs_activity`.`activity_state` = 0
and `tbs_cost_apply`.`charge_state` = 1
and `tbs_activity`.act_end_date &lt;= #{query.nowDate}
</if>
<if test="query.overdueState!=null and query.overdueState==2">
and `tbs_activity`.`activity_state` = 0
and `tbs_cost_apply`.`charge_state` = 1
and `tbs_activity`.act_end_date &gt;= #{query.startNowDate}
and `tbs_activity`.act_end_date &lt; #{query.nowDate}
</if>
</if>
<if test="ew != null">
<if test="ew.nonEmptyOfWhere">
AND ${ew.sqlSegment}
</if>
</if>
</select>
</mapper>
Loading…
Cancel
Save