diff --git a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java index fbae21ea..b9de617e 100644 --- a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java +++ b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java @@ -53,9 +53,9 @@ public class AsyncFactory { @Override public void run() { try { + log.debug("--------------------------SubmitPolicy CallbackTimer Sleep Start------------------------------"); AuthContextUtils.setTenant("001"); - Thread.sleep(20*1000); - log.debug("submitPolicy"); + Thread.sleep(7*1000); TzcPolicyOperationServiceImpl operationService = SpringUtils.getBean(TzcPolicyOperationServiceImpl.class); String summeryResult = operationService.checkAffairSummery(policyId.toString()); if(summeryResult.equals(TzcPolicyOperationServiceImpl.SummeryState_Success)){ @@ -64,6 +64,7 @@ public class AsyncFactory { finishedParam.setPolicyId(policyId); operationService.doFinished(finishedParam); } + log.debug("--------------------------SubmitPolicy CallbackTimer summeryResult:{}------------------------------",summeryResult); } catch (Exception e) { e.printStackTrace(); } @@ -82,8 +83,8 @@ public class AsyncFactory { public void run() { try { AuthContextUtils.setTenant("001"); - Thread.sleep(20*1000); - log.debug("submitCostApply"); + log.debug("--------------------------SubmitCostApply CallbackTimer Sleep Start------------------------------"); + Thread.sleep(7*1000); TbsCostApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsCostApplyOperationServiceImpl.class); String summeryResult = applyOperationService.checkAffairSummery(costApply.getId().toString()); if(summeryResult.equals(TbsCostApplyOperationServiceImpl.SummeryState_Success)){ @@ -92,6 +93,7 @@ public class AsyncFactory { finishedParam.setCostApplyId(costApply.getId()); applyOperationService.doFinished(finishedParam); } + log.debug("--------------------------SubmitCostApply CallbackTimer summeryResult:{} ------------------------------",summeryResult); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index 7ba00d4d..f710fa2d 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -17,6 +17,7 @@ import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsSeeYonConst; +import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; import com.qs.serve.task.SysTask; @@ -240,9 +241,12 @@ public interface SeeYonOperationService extends SeeYonBaseService{ * @return */ default String checkAffairSummery(String targetId){ + testConnection(); R result = getRequestService().checkAffairSummery(getTemplateCode(),targetId); if(result.getData()==null){ - return "next"; + String templateCode = getTemplateCode(); + SyAffairStateResult stateResult =checkAffairState(targetId,templateCode); + return stateResult.getState().name(); } return result.getData(); } diff --git a/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java b/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java index e309d007..188922a4 100644 --- a/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java +++ b/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java @@ -56,6 +56,7 @@ public class TagCategoryController { treeVo.setParentId(cate.getPid()); treeVo.setSort(0); treeVo.setCategoryName(cate.getCategoryName()); + treeVo.setRemark(cate.getRemark()); return treeVo; }).collect(Collectors.toList()); treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING); @@ -83,6 +84,10 @@ public class TagCategoryController { @GetMapping("/getById/{id}") public R getById(@PathVariable("id") String id){ TagCategory tagCategory = tagCategoryService.getById(id); + if(tagCategory.getPid()!=null&&!tagCategory.getPid().equals("0")){ + TagCategory p = tagCategoryService.getById(tagCategory.getPid()); + tagCategory.setParentInfo(p); + } return R.ok(tagCategory); } diff --git a/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java b/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java index 89713c3e..fc17e1a3 100644 --- a/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java +++ b/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java @@ -1,15 +1,13 @@ package com.qs.serve.modules.tag.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageHelper; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; -import com.qs.serve.common.util.CodeGenUtil; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.CopierUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.tag.entity.TagCategory; import com.qs.serve.modules.tag.service.TagCategoryService; import lombok.AllArgsConstructor; @@ -44,10 +42,13 @@ public class TagInfoController { * @param param * @return */ - @GetMapping("/list") - public R> getList(TagInfoSo param){ + @PostMapping("/list") + public R> getList(@RequestBody TagInfoSo param){ TagInfo entity = CopierUtil.copy(param,new TagInfo()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + if(CollectionUtil.isNotEmpty(param.getTagCategoryIds())){ + lqw.in(TagInfo::getTagCategoryId,param.getTagCategoryIds()); + } List list = tagInfoService.list(lqw); return R.ok(list); } @@ -57,11 +58,14 @@ public class TagInfoController { * @param param * @return */ - @GetMapping("/page") - public R> getPage(TagInfoSo param){ + @PostMapping("/page") + public R> getPage(@RequestBody TagInfoSo param){ TagInfo entity = CopierUtil.copy(param,new TagInfo()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); - PageUtil.startPage(); + if(CollectionUtil.isNotEmpty(param.getTagCategoryIds())){ + lqw.in(TagInfo::getTagCategoryId,param.getTagCategoryIds()); + } + PageHelper.startPage(param.getPageNum(),param.getPageSize()); List list = tagInfoService.list(lqw); return R.byPageHelperList(list); } @@ -88,7 +92,9 @@ public class TagInfoController { public R updateById(@RequestBody @Valid TagInfoBo param){ TagInfo entity = CopierUtil.copy(param,new TagInfo()); TagCategory tagCategory = tagCategoryService.getById(param.getTagCategoryId()); + entity.setTagCategoryId(param.getTagCategoryId()); entity.setTagCategoryName(tagCategory.getCategoryName()); + entity.setRemark(param.getRemark()); boolean result = tagInfoService.updateById(entity); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/tag/entity/TagCategory.java b/src/main/java/com/qs/serve/modules/tag/entity/TagCategory.java index bede0084..9b75cb01 100644 --- a/src/main/java/com/qs/serve/modules/tag/entity/TagCategory.java +++ b/src/main/java/com/qs/serve/modules/tag/entity/TagCategory.java @@ -77,6 +77,10 @@ public class TagCategory implements Serializable { @JsonProperty private Boolean delFlag; + /** 父级信息 */ + @TableField(exist = false) + private Object parentInfo; + public static TagCategory toNewObject(TagCategory source){ TagCategory category = new TagCategory(); diff --git a/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java b/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java index 5ef21bef..d7f981f1 100644 --- a/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java +++ b/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java @@ -39,7 +39,7 @@ public class TagInfo implements Serializable { private String tagName; /** 标签类目id */ - private Long tagCategoryId; + private String tagCategoryId; /** 标签类目名称 */ @Length(max = 255,message = "标签类目名称长度不能超过255字") diff --git a/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java b/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java index c6c88dd2..34f69123 100644 --- a/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java +++ b/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java @@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; +import java.util.List; /** * 标签信息 查询参数 @@ -32,7 +33,10 @@ public class TagInfoSo implements Serializable { private String tagName; /** 标签类目id */ - private Long tagCategroyId; + private String tagCategoryId; + + /** 标签类目id */ + private List tagCategoryIds; /** 标签类目名称 */ private String tagCategoryName; @@ -64,5 +68,9 @@ public class TagInfoSo implements Serializable { @JsonProperty private Boolean delFlag; + private Integer pageNum; + + private Integer pageSize; + } diff --git a/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java b/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java index 4c9bc9fb..4fa77b6e 100644 --- a/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java +++ b/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java @@ -11,5 +11,6 @@ import lombok.Data; public class TagCategoryTreeVo extends TreeNode { private String categoryName; + private String remark; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index a12e634c..41bc3c9c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -93,11 +93,14 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService if(tbsCostApply.getContractFlag()!=null&&tbsCostApply.getContractFlag().equals(1)){ templateCode = TbsSeeYonConst.CostApplyContractConf.Code(); } - R result = getRequestService().checkAffairSummery(templateCode,targetId); - if(result.getData()==null){ - return "next"; - } - return result.getData(); + SyAffairStateResult stateResult =checkAffairState(targetId,templateCode); + return stateResult.getState().name(); + /* R result = getRequestService().checkAffairSummery(templateCode,targetId); + if(result.getData()==null||result.getData().equals(SyAffairState.next.name())){ + SyAffairStateResult stateResult =checkAffairState(targetId,templateCode); + return stateResult.getState().name(); + }*/ + //return result.getData(); } @Override @@ -337,11 +340,11 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService } public BigDecimal checkToChangeAmount(TbsAffairCommitBo param) { - SysUser sysUser = sysUserService.getById( AuthContextUtils.getSysUserId()); Long targetId = Long.parseLong(this.getTargetId(param)); TbsCostApply costApply = costApplyService.getById(targetId); boolean noChanged = costApply.getEditAmountFlag().equals(0); if(CollectionUtil.isNotEmpty(param.getAffairSubjectLines())){ + SysUser sysUser = sysUserService.getById( AuthContextUtils.getSysUserId()); QueryWrapper comm_qw = new QueryWrapper(); comm_qw.eq("cost_apply_id", targetId); List activityList = tbsActivityMapper.selectList(comm_qw); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index cc484c76..e0d98767 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -136,6 +136,10 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { contracts.forEach(con->{ con.setId(null); con.setCostApplyId(newCostApplyId); + con.setCreateBy(null); + con.setCreateTime(null); + con.setUpdateBy(null); + con.setUpdateTime(null); }); if(contracts.size()>0){ for (TbsCostContract contract : contracts) {