Browse Source

协议条款审批调整;退回的案设置三天内可核销;

v1.0
Yen 2 years ago
parent
commit
d5b3d397a5
  1. 5
      src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java
  2. 17
      src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java
  3. 27
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java
  4. 54
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java
  5. 6
      src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
  6. 10
      src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java
  7. 23
      src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsSubmitToDoBo.java
  8. 4
      src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostTodoMapper.java
  9. 5
      src/main/java/com/qs/serve/modules/tbs/service/TbsCostTodoService.java
  10. 12
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java
  11. 8
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoServiceImpl.java
  12. 3
      src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
  13. 8
      src/main/java/com/qs/serve/task/TbsTask.java
  14. 79
      src/main/resources/mapper/tbs/TbsCostTodoMapper.xml

5
src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java

@ -18,8 +18,10 @@ import com.qs.serve.modules.sys.entity.SysUser;
import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsSeeYonConst; import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.entity.TbsActivity;
import com.qs.serve.modules.tbs.entity.TbsCostTodo;
import com.qs.serve.modules.tbs.service.TbsActivityService; import com.qs.serve.modules.tbs.service.TbsActivityService;
import com.qs.serve.modules.tbs.service.TbsCostApplyService; import com.qs.serve.modules.tbs.service.TbsCostApplyService;
import com.qs.serve.modules.tbs.service.TbsCostTodoService;
import com.qs.serve.modules.tzc.entity.TzcPolicy; import com.qs.serve.modules.tzc.entity.TzcPolicy;
import com.qs.serve.modules.tzc.service.TzcPolicyService; import com.qs.serve.modules.tzc.service.TzcPolicyService;
import com.qs.serve.modules.vtb.entity.VtbVerification; import com.qs.serve.modules.vtb.entity.VtbVerification;
@ -52,6 +54,7 @@ public class SeeYonController {
private ProjectProperties projectProperties; private ProjectProperties projectProperties;
private TbsActivityService activityService; private TbsActivityService activityService;
private CommonCheckService commonCheckService; private CommonCheckService commonCheckService;
private TbsCostTodoService tbsCostTodoService;
/** /**
* 我的审批列表 * 我的审批列表
@ -220,6 +223,8 @@ public class SeeYonController {
info = costApplyService.getById(obj.getTargetId()); info = costApplyService.getById(obj.getTargetId());
}else if (tempCode.equals("ReleasePolicy")){ }else if (tempCode.equals("ReleasePolicy")){
info = policyService.getById(obj.getTargetId()); info = policyService.getById(obj.getTargetId());
}else if (tempCode.equals("CheckCostAgree")){
info = tbsCostTodoService.getById(obj.getTargetId());
} }
obj.setValueInfo(info); obj.setValueInfo(info);
affairList.add(obj); affairList.add(obj);

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

@ -29,17 +29,30 @@ public class TbsActivityUtil {
return sysConfOfWarningDays; return sysConfOfWarningDays;
} }
/**
* 建立预期条件
* @param lqw
* @param queryState 0=>未逾期1=>已逾期2=>即将逾期
*/
public static void buildOverdue(LambdaQueryWrapper<TbsActivity> lqw,Integer queryState){ public static void buildOverdue(LambdaQueryWrapper<TbsActivity> lqw,Integer queryState){
if(queryState!=null){ if(queryState!=null){
if(queryState.equals(0)){ if(queryState.equals(0)){
lqw.gt(TbsActivity::getPreCheckDate, LocalDate.now()); lqw.gt(TbsActivity::getPreCheckDate, LocalDate.now());
}else if(queryState.equals(1)){ }else if(queryState.equals(1)){
lqw.le(TbsActivity::getPreCheckDate, LocalDate.now()); lqw.and(qw->{
qw.le(TbsActivity::getPreCheckDate, LocalDate.now())
.or()
.le(TbsActivity::getPreEndDateBack, LocalDate.now());
});
}else if(queryState.equals(2)){ }else if(queryState.equals(2)){
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
int sysConfOfWarningDays = getSysConfOfWarningDays(); int sysConfOfWarningDays = getSysConfOfWarningDays();
LocalDate startNow = now.plusDays( - sysConfOfWarningDays ); LocalDate startNow = now.plusDays( - sysConfOfWarningDays );
lqw.between(TbsActivity::getPreCheckDate,startNow , now); lqw.and(qw->{
qw.between(TbsActivity::getPreCheckDate,startNow , now)
.or()
.between(TbsActivity::getPreEndDateBack,startNow , now);
});
}else { }else {
lqw.eq(TbsActivity::getId,"0"); lqw.eq(TbsActivity::getId,"0");
} }

27
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java

@ -14,7 +14,9 @@ import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam; import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
import com.qs.serve.modules.tbs.entity.TbsCostTodo; import com.qs.serve.modules.tbs.entity.TbsCostTodo;
import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
import com.qs.serve.modules.tbs.entity.bo.TbsSubmitToDoBo;
import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
import com.qs.serve.modules.tbs.service.TbsCostApplyService;
import com.qs.serve.modules.tbs.service.TbsCostTodoService; import com.qs.serve.modules.tbs.service.TbsCostTodoService;
import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl; import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl;
import com.qs.serve.modules.tbs.service.impl.TbsCostTodoOperationServiceImpl; import com.qs.serve.modules.tbs.service.impl.TbsCostTodoOperationServiceImpl;
@ -37,8 +39,18 @@ import java.util.List;
@RequestMapping("tbs/costTodo") @RequestMapping("tbs/costTodo")
public class TbsCostTodoCheckController { public class TbsCostTodoCheckController {
private TbsCostApplyOperationServiceImpl tbsCostApplyOperationServiceImpl; private TbsCostTodoOperationServiceImpl costTodoOperationService;
/**
* 提交审批
* @param param
* @return
*/
@PostMapping("/submit")
public R<?> save(@RequestBody TbsSubmitToDoBo param){
costTodoOperationService.submit(param);
return R.ok();
}
/** /**
* 审批列表(用于详情页) * 审批列表(用于详情页)
@ -47,7 +59,7 @@ public class TbsCostTodoCheckController {
*/ */
@GetMapping("/ListAffairs") @GetMapping("/ListAffairs")
public R<List<CtpAffairVo>> pageAffair(String costApplyId){ public R<List<CtpAffairVo>> pageAffair(String costApplyId){
return tbsCostApplyOperationServiceImpl.pageAffair(costApplyId); return costTodoOperationService.pageAffair(costApplyId);
} }
/** /**
@ -57,8 +69,9 @@ public class TbsCostTodoCheckController {
*/ */
@GetMapping("/pageMemberAffair") @GetMapping("/pageMemberAffair")
public R<PageVo<CtpAffairVo>> pageMemberAffair(CtpAffairQo param){ public R<PageVo<CtpAffairVo>> pageMemberAffair(CtpAffairQo param){
return tbsCostApplyOperationServiceImpl.pageMemberAffair(param); return costTodoOperationService.pageMemberAffair(param);
} }
/** /**
* 提交审批节点 * 提交审批节点
* @return * @return
@ -68,7 +81,7 @@ public class TbsCostTodoCheckController {
@SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE) @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
@PreAuthorize("hasRole('tbs:costApply:commit')") @PreAuthorize("hasRole('tbs:costApply:commit')")
public R<?> commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ public R<?> commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){
return tbsCostApplyOperationServiceImpl.commitAffair(affairCommit); return costTodoOperationService.commitAffair(affairCommit);
} }
/** /**
@ -80,7 +93,7 @@ public class TbsCostTodoCheckController {
@PostMapping("/compensate/{id}") @PostMapping("/compensate/{id}")
@SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE) @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE)
public R<?> compensate(@PathVariable("id") String id){ public R<?> compensate(@PathVariable("id") String id){
return tbsCostApplyOperationServiceImpl.runCompensate(id); return costTodoOperationService.runCompensate(id);
} }
/** /**
@ -92,7 +105,7 @@ public class TbsCostTodoCheckController {
@PostMapping("/addNode") @PostMapping("/addNode")
@SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE) @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
public R<String> addNode(@RequestBody CtpAddNodeParam param){ public R<String> addNode(@RequestBody CtpAddNodeParam param){
return tbsCostApplyOperationServiceImpl.addNode(param); return costTodoOperationService.addNode(param);
} }
/** /**
@ -101,7 +114,7 @@ public class TbsCostTodoCheckController {
*/ */
@PostMapping("/getAffairUnfinished") @PostMapping("/getAffairUnfinished")
public R<Long> getUnfinished(){ public R<Long> getUnfinished(){
return tbsCostApplyOperationServiceImpl.getUnfinished(); return costTodoOperationService.getUnfinished();
} }
} }

54
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java

@ -6,11 +6,10 @@ 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.AuthContextUtils; import com.qs.serve.common.util.*;
import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.sys.service.SysAttachService;
import com.qs.serve.common.util.CopierUtil;
import com.qs.serve.common.util.StringUtils;
import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsCommonCheckState;
import com.qs.serve.modules.tbs.service.impl.TbsCostTodoOperationServiceImpl; import com.qs.serve.modules.tbs.service.impl.TbsCostTodoOperationServiceImpl;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -21,6 +20,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostTodo;
import com.qs.serve.modules.tbs.service.TbsCostTodoService; import com.qs.serve.modules.tbs.service.TbsCostTodoService;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
@ -36,15 +36,20 @@ public class TbsCostTodoController {
private TbsCostTodoService tbsCostTodoService; private TbsCostTodoService tbsCostTodoService;
private TbsCostTodoOperationServiceImpl costTodoOperationService; private TbsCostTodoOperationServiceImpl costTodoOperationService;
private SysAttachService attachService;
/** /**
* 新增提交审批 * 新增
* @param param * @param param
* @return * @return
*/ */
@PostMapping("/save") @PostMapping("/save")
public R<?> save(@RequestBody @Valid TbsCostTodo param){ public R<?> save(@RequestBody @Valid TbsCostTodo param){
costTodoOperationService.submit(param); String todoCode = "XY"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.AgreeCheck);
param.setTodoCode(todoCode);
param.setFinishedFlag(null);
param.setCheckStatus(0);
tbsCostTodoService.save(param);
return R.ok(); return R.ok();
} }
@ -60,6 +65,19 @@ public class TbsCostTodoController {
return R.ok(list); return R.ok(list);
} }
/**
* 我的翻页
* @param param
* @return
*/
@GetMapping("/myPage")
public R<PageVo<TbsCostTodo>> myPage(TbsCostTodo param){
param.setCreateBy(AuthContextUtils.getSysUserId());
PageUtil.startPage();
List<TbsCostTodo> list = tbsCostTodoService.selectTbsCostTodoList(param);
return R.byPageHelperList(list);
}
/** /**
* 翻页 * 翻页
* @param param * @param param
@ -81,21 +99,32 @@ public class TbsCostTodoController {
@GetMapping("/getById/{id}") @GetMapping("/getById/{id}")
public R<TbsCostTodo> getById(@PathVariable("id") String id){ public R<TbsCostTodo> getById(@PathVariable("id") String id){
TbsCostTodo tbsCostTodo = tbsCostTodoService.getById(id); TbsCostTodo tbsCostTodo = tbsCostTodoService.getById(id);
if(tbsCostTodo.getAttachIds()!=null&&tbsCostTodo.getAttachIds().length>0){
List list = attachService.listByIds(Arrays.asList(tbsCostTodo.getAttachIds()));
tbsCostTodo.setAttachList(list);
}
if(tbsCostTodo.getAttachIds2()!=null&&tbsCostTodo.getAttachIds2().length>0){
List list = attachService.listByIds(Arrays.asList(tbsCostTodo.getAttachIds2()));
tbsCostTodo.setAttachList2(list);
}
return R.ok(tbsCostTodo); return R.ok(tbsCostTodo);
} }
/** /**
* 更新已取消 * 更新
* @param param * @param param
* @return * @return
*/ */
@PostMapping("/updateById") @PostMapping("/updateById")
public R<?> updateById(@RequestBody @Valid TbsCostTodo param){ public R<?> updateById(@RequestBody @Valid TbsCostTodo param){
if(1==1){return R.error();}
String userId = AuthContextUtils.getSysUserId(); String userId = AuthContextUtils.getSysUserId();
TbsCostTodo tbsCostTodo = tbsCostTodoService.getById(param.getId()); TbsCostTodo tbsCostTodo = tbsCostTodoService.getById(param.getId());
if(!tbsCostTodo.getCreateBy().equals(userId)){ // if(!tbsCostTodo.getCreateBy().equals(userId)){
return R.ok(); // return R.ok();
// }
Integer state = tbsCostTodo.getCheckStatus();
if(!state.equals(TbsCommonCheckState.State_1_apply)&&!state.equals(TbsCommonCheckState.State_2_finished)){
return R.error("审批中或已完成的无法编辑");
} }
boolean result = tbsCostTodoService.updateById(param); boolean result = tbsCostTodoService.updateById(param);
return R.isTrue(result); return R.isTrue(result);
@ -103,18 +132,17 @@ public class TbsCostTodoController {
/** /**
* 删除已取消 * 删除
* @param ids * @param ids
* @return * @return
*/ */
@DeleteMapping("/deleteById/{ids}") @DeleteMapping("/deleteById/{ids}")
public R<?> deleteById(@PathVariable("ids") String ids){ public R<?> deleteById(@PathVariable("ids") String ids){
if(1==1){return R.error();}
List<Long> idsLong = StringUtils.splitIdLong(ids); List<Long> idsLong = StringUtils.splitIdLong(ids);
String userId = AuthContextUtils.getSysUserId(); String userId = AuthContextUtils.getSysUserId();
LambdaQueryWrapper<TbsCostTodo> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TbsCostTodo> lqw = new LambdaQueryWrapper<>();
lqw.in(TbsCostTodo::getId,idsLong); lqw.in(TbsCostTodo::getId,idsLong);
lqw.eq(TbsCostTodo::getCreateBy,userId); //lqw.eq(TbsCostTodo::getCreateBy,userId);
boolean result = tbsCostTodoService.remove(lqw); boolean result = tbsCostTodoService.remove(lqw);
return R.isTrue(result); return R.isTrue(result);
} }

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

@ -93,6 +93,12 @@ public class TbsActivity implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private LocalDate actEndDate; private LocalDate actEndDate;
/** 预算结束时间(用于回退后设置) */
@NotNull(message = "活动结束时间不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private LocalDate preEndDateBack;
/** 预算开始时间 */ /** 预算开始时间 */
@NotNull(message = "活动开始时间不能为空") @NotNull(message = "活动开始时间不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")

10
src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java

@ -66,7 +66,6 @@ public class TbsCostTodo implements Serializable {
private BigDecimal amount; private BigDecimal amount;
/** 完成状态 */ /** 完成状态 */
@NotNull(message = "完成状态不能为空")
private Integer finishedFlag; private Integer finishedFlag;
/** 完成时间 */ /** 完成时间 */
@ -119,8 +118,17 @@ public class TbsCostTodo implements Serializable {
@TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
private String[] attachIds; private String[] attachIds;
/** 附件id */
@TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
private String[] attachIds2;
/** 附件说明 */
private String attachDesc;
@TableField(exist = false) @TableField(exist = false)
private List<?> attachList; private List<?> attachList;
@TableField(exist = false)
private List<?> attachList2;
} }

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

@ -0,0 +1,23 @@
package com.qs.serve.modules.tbs.entity.bo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
import lombok.Data;
import org.apache.ibatis.type.JdbcType;
/**
* @author YenHex
* @since 2023/11/1
*/
@Data
public class TbsSubmitToDoBo {
private Long id;
/** 附件id */
private String[] attachIds2;
/** 附件说明 */
private String attachDesc;
}

4
src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostTodoMapper.java

@ -2,6 +2,8 @@ package com.qs.serve.modules.tbs.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qs.serve.modules.tbs.entity.TbsCostTodo; import com.qs.serve.modules.tbs.entity.TbsCostTodo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 费用申请代办 Mapper * 费用申请代办 Mapper
@ -10,5 +12,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostTodo;
*/ */
public interface TbsCostTodoMapper extends BaseMapper<TbsCostTodo> { public interface TbsCostTodoMapper extends BaseMapper<TbsCostTodo> {
List<TbsCostTodo> selectTbsCostTodoList(@Param("param") TbsCostTodo query);
} }

5
src/main/java/com/qs/serve/modules/tbs/service/TbsCostTodoService.java

@ -2,6 +2,9 @@ package com.qs.serve.modules.tbs.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.qs.serve.modules.tbs.entity.TbsCostTodo; import com.qs.serve.modules.tbs.entity.TbsCostTodo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 费用申请代办 服务接口 * 费用申请代办 服务接口
@ -10,5 +13,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostTodo;
*/ */
public interface TbsCostTodoService extends IService<TbsCostTodo> { public interface TbsCostTodoService extends IService<TbsCostTodo> {
List<TbsCostTodo> selectTbsCostTodoList(TbsCostTodo query);
} }

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

@ -16,6 +16,7 @@ import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
import com.qs.serve.modules.tbs.entity.TbsBudget; import com.qs.serve.modules.tbs.entity.TbsBudget;
import com.qs.serve.modules.tbs.entity.TbsCostTodo; import com.qs.serve.modules.tbs.entity.TbsCostTodo;
import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
import com.qs.serve.modules.tbs.entity.bo.TbsSubmitToDoBo;
import com.qs.serve.modules.tbs.mapper.TbsCostTodoMapper; import com.qs.serve.modules.tbs.mapper.TbsCostTodoMapper;
import com.qs.serve.modules.tbs.service.TbsCostTodoService; import com.qs.serve.modules.tbs.service.TbsCostTodoService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -44,16 +45,15 @@ public class TbsCostTodoOperationServiceImpl implements SeeYonOperationService {
/** /**
* 提交 * 提交
* @param costTodo * @param param
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void submit(TbsCostTodo costTodo){ public void submit(TbsSubmitToDoBo param){
TbsCostTodo costTodo = tbsCostTodoMapper.selectById(param.getId());
String todoCode = costTodo.getTodoCode();
String templateCode = this.getTemplateCode(); String templateCode = this.getTemplateCode();
SysUser sysUser = sysUserMapper.selectById(AuthContextUtils.getSysUserId()); SysUser sysUser = sysUserMapper.selectById(AuthContextUtils.getSysUserId());
Map<String,Object> data = new HashMap<>(); Map<String,Object> data = new HashMap<>();
String todoCode = "XY"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.AgreeCheck);
costTodo.setTodoCode(todoCode);
tbsCostTodoMapper.insert(costTodo);
Long todoId = costTodo.getId(); Long todoId = costTodo.getId();
data.put("exsp5", todoCode); data.put("exsp5", todoCode);
data.put("orgId", todoId); data.put("orgId", todoId);
@ -86,6 +86,8 @@ public class TbsCostTodoOperationServiceImpl implements SeeYonOperationService {
} }
costTodo.setSubmitTime(LocalDateTime.now()); costTodo.setSubmitTime(LocalDateTime.now());
costTodo.setSyFormId(formId); costTodo.setSyFormId(formId);
costTodo.setAttachIds2(param.getAttachIds2());
costTodo.setAttachDesc(param.getAttachDesc());
tbsCostTodoMapper.updateById(costTodo); tbsCostTodoMapper.updateById(costTodo);
} }

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

@ -3,11 +3,14 @@ package com.qs.serve.modules.tbs.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.qs.serve.modules.tbs.entity.TbsCostTodo; import com.qs.serve.modules.tbs.entity.TbsCostTodo;
import com.qs.serve.modules.tbs.service.TbsCostTodoService; import com.qs.serve.modules.tbs.service.TbsCostTodoService;
import com.qs.serve.modules.tbs.mapper.TbsCostTodoMapper; import com.qs.serve.modules.tbs.mapper.TbsCostTodoMapper;
import java.util.List;
/** /**
* 费用申请代办 服务实现类 * 费用申请代办 服务实现类
* @author YenHex * @author YenHex
@ -18,5 +21,10 @@ import com.qs.serve.modules.tbs.mapper.TbsCostTodoMapper;
@AllArgsConstructor @AllArgsConstructor
public class TbsCostTodoServiceImpl extends ServiceImpl<TbsCostTodoMapper,TbsCostTodo> implements TbsCostTodoService { public class TbsCostTodoServiceImpl extends ServiceImpl<TbsCostTodoMapper,TbsCostTodo> implements TbsCostTodoService {
@Override
public List<TbsCostTodo> selectTbsCostTodoList(TbsCostTodo query) {
return baseMapper.selectTbsCostTodoList(query);
}
} }

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

@ -44,7 +44,9 @@ import org.springframework.web.bind.annotation.RequestBody;
import javax.validation.Valid; import javax.validation.Valid;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.temporal.TemporalUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -359,6 +361,7 @@ public class VtbVerificationApplication {
TbsActivity activity = new TbsActivity(); TbsActivity activity = new TbsActivity();
activity.setId(verification.getActivityId()); activity.setId(verification.getActivityId());
activity.setActivityState(TbsActivityState.STATE_0_Todo); activity.setActivityState(TbsActivityState.STATE_0_Todo);
activity.setPreEndDateBack(LocalDate.now().plusDays(3));
tbsActivityService.updateById(activity); tbsActivityService.updateById(activity);
} }

8
src/main/java/com/qs/serve/task/TbsTask.java

@ -49,7 +49,13 @@ public class TbsTask {
LocalDate lastDay = now.plusDays(-1); LocalDate lastDay = now.plusDays(-1);
LambdaQueryWrapper<TbsActivity> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TbsActivity> lqw = new LambdaQueryWrapper<>();
lqw.in(TbsActivity::getCostApplyId,costApplyIds); lqw.in(TbsActivity::getCostApplyId,costApplyIds);
lqw.le(TbsActivity::getPreCheckDate, lastDay); lqw.and(qw->{
qw.and(
qw1->qw1.le(TbsActivity::getPreCheckDate, lastDay)
.isNull(TbsActivity::getPreEndDateBack)
).or()
.le(TbsActivity::getPreEndDateBack, lastDay);
});
lqw.eq(TbsActivity::getReopenFlag,0); lqw.eq(TbsActivity::getReopenFlag,0);
// 2-完成;4-已释放;5-已关闭 表流程已完结,冻结无意义 // 2-完成;4-已释放;5-已关闭 表流程已完结,冻结无意义
lqw.eq(TbsActivity::getActivityState,TbsActivityState.STATE_0_Todo); lqw.eq(TbsActivity::getActivityState,TbsActivityState.STATE_0_Todo);

79
src/main/resources/mapper/tbs/TbsCostTodoMapper.xml

@ -0,0 +1,79 @@
<?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.TbsCostTodoMapper">
<resultMap id="tbsCostTodoMap" type="com.qs.serve.modules.tbs.entity.TbsCostTodo" >
<result property="id" column="id"/>
<result property="todoCode" column="todo_code"/>
<result property="costApplyId" column="cost_apply_id"/>
<result property="checkStatus" column="check_status"/>
<result property="syFormId" column="sy_from_id"/>
<result property="submitTime" column="submit_time"/>
<result property="brands" column="brands"/>
<result property="descr" column="descr"/>
<result property="amount" column="amount"/>
<result property="finishedFlag" column="finished_flag"/>
<result property="finishedTime" column="finished_time"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<result property="tenantId" column="tenant_id"/>
<result property="payMsg" column="pay_msg"/>
<result property="prePayDate" column="pre_pay_date"/>
</resultMap>
<sql id="tbsCostTodoSql">
tbs_cost_todo.`id`,
tbs_cost_todo.`todo_code`,
tbs_cost_todo.`cost_apply_id`,
tbs_cost_todo.`check_status`,
tbs_cost_todo.`sy_from_id`,
tbs_cost_todo.`submit_time`,
tbs_cost_todo.`brands`,
tbs_cost_todo.`descr`,
tbs_cost_todo.`amount`,
tbs_cost_todo.`finished_flag`,
tbs_cost_todo.`finished_time`,
tbs_cost_todo.`remark`,
tbs_cost_todo.`create_time`,
tbs_cost_todo.`create_by`,
tbs_cost_todo.`update_time`,
tbs_cost_todo.`update_by`,
tbs_cost_todo.`del_flag`,
tbs_cost_todo.`tenant_id`,
tbs_cost_todo.`pay_msg`,
tbs_cost_todo.`pre_pay_date` </sql>
<select id="selectTbsCostTodoList" parameterType="com.qs.serve.modules.tbs.entity.TbsCostTodo" resultMap="tbsCostTodoMap">
SELECT
<include refid="tbsCostTodoSql"/> left join tbs_cost_apply on tbs_cost_apply.id = tbs_cost_todo.cost_apply_id
FROM `tbs_cost_todo` `tbs_cost_todo`
<where>
<if test="query.id != null"> and `tbs_cost_todo`.`id` = #{query.id}</if>
<if test="query.todoCode != null and query.todoCode != ''"> and `tbs_cost_todo`.`todo_code` = #{query.todoCode}</if>
<if test="query.costApplyId != null"> and `tbs_cost_todo`.`cost_apply_id` = #{query.costApplyId}</if>
<if test="query.checkStatus != null"> and `tbs_cost_todo`.`check_status` = #{query.checkStatus}</if>
<if test="query.syFromId != null and query.syFromId != ''"> and `tbs_cost_todo`.`sy_from_id` = #{query.syFromId}</if>
<if test="query.submitTime != null"> and `tbs_cost_todo`.`submit_time` = #{query.submitTime}</if>
<if test="query.brands != null and query.brands != ''"> and `tbs_cost_todo`.`brands` = #{query.brands}</if>
<if test="query.descr != null and query.descr != ''"> and `tbs_cost_todo`.`descr` = #{query.descr}</if>
<if test="query.amount != null"> and `tbs_cost_todo`.`amount` = #{query.amount}</if>
<if test="query.finishedFlag != null"> and `tbs_cost_todo`.`finished_flag` = #{query.finishedFlag}</if>
<if test="query.finishedTime != null"> and `tbs_cost_todo`.`finished_time` = #{query.finishedTime}</if>
<if test="query.remark != null and query.remark != ''"> and `tbs_cost_todo`.`remark` = #{query.remark}</if>
<if test="query.createTime != null"> and `tbs_cost_todo`.`create_time` = #{query.createTime}</if>
<if test="query.createBy != null and query.createBy != ''"> and `tbs_cost_todo`.`create_by` = #{query.createBy}</if>
<if test="query.updateTime != null"> and `tbs_cost_todo`.`update_time` = #{query.updateTime}</if>
<if test="query.updateBy != null and query.updateBy != ''"> and `tbs_cost_todo`.`update_by` = #{query.updateBy}</if>
<if test="query.delFlag != null"> and `tbs_cost_todo`.`del_flag` = #{query.delFlag}</if>
<if test="query.tenantId != null and query.tenantId != ''"> and `tbs_cost_todo`.`tenant_id` = #{query.tenantId}</if>
<if test="query.prePayDate != null"> and `tbs_cost_todo`.`pre_pay_date` = #{query.prePayDate}</if>
</where>
</select>
</mapper>
Loading…
Cancel
Save