diff --git a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java index 0a547567..14853780 100644 --- a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java +++ b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java @@ -70,7 +70,7 @@ public class HttpServletRequestFilter implements Filter{ if (ServletUtils.isJsonRequest(request)&&requestWrapper!=null) { reqBody = requestWrapper.getBody(); } - StringBuffer buffer = new StringBuffer("["+method+"] "+url); + StringBuffer buffer = new StringBuffer("\n["+method+"] "+url); if(supplierId!=null){ buffer.append(" 供应商ID: "+supplierId); } @@ -91,7 +91,7 @@ public class HttpServletRequestFilter implements Filter{ buffer.append(" 时间:["+ LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)+"]"); } } catch (Exception e) {} - System.out.println(buffer); + log.debug(buffer.toString()); } @Override diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java index 65a1c0a5..2a6dec09 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java @@ -6,6 +6,7 @@ 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.JsonUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.service.BmsSupplierService; @@ -81,8 +82,8 @@ public class BmsSupplierAddressController { if(count>0){ return R.error("tms_sys_id is exist!!"); } - boolean result = bmsSupplierAddressService.updateById(param); - return R.isTrue(result); + bmsSupplierAddressService.updateById(param); + return R.ok(param); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 1d7a58e5..73fd974f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -93,6 +93,18 @@ public class TbsCostApplyController { private TbsCostChangeInfoService tbsCostChangeInfoService; + /** + * 临时接口 + * 重建费用申请的预算占用(用于OA已经生成表单，但是费用申请回调报错后补发) + * @param id + * @return + */ + @PostMapping("/rebuildBudgetInit") + public R bu(Long id){ + tbsCostApplyService.rebuildBudgetInit(id); + return R.ok(); + } + /** * 复制 * @param id diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java index 0327c275..1172f34f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java @@ -36,6 +36,12 @@ public interface TbsCostApplyService extends IService { */ void removeCostById(Long id); + /** + * 重建费用申请的预算占用(用于OA已经生成表单，但是费用申请回调报错后补发) + * @param costId + */ + void rebuildBudgetInit(Long costId); + /** * 统计即将逾期 * @param userId diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index b86aeb72..37d47f08 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -188,6 +188,82 @@ public class TbsCostApplyServiceImpl extends ServiceImpl actLqw = new LambdaQueryWrapper<>(); + actLqw.eq(TbsActivity::getCostApplyId,costId); + List activityList = tbsActivityMapper.selectList(actLqw); + + List allBudgetItem = new ArrayList<>(); + + TbsBudgetTableResultVo result1 = tbsBudgetMatchApplication.getMatchResult(costApply.getId(),false,true); + Map matchItemBudgetsMap = result1.getMatchItemBudgetsMap(); + List budgetLogList = new ArrayList<>(); + for (TbsActivityCenterGoods centerGoods : result1.getActivityCenterGoodsList()) { + TbsBudgetCostItem costItem = new TbsBudgetCostItem(); + costItem.setCenterGoodsCode(centerGoods.getCenterGoodsCode()); + costItem.setCostApplyId(centerGoods.getCostApplyId()); + costItem.setActivityId(centerGoods.getActivityId()); + costItem.setActivityCode(centerGoods.getActivityCode()); + costItem.setSupplierId(centerGoods.getSupplierId()); + costItem.setSupplierCode(centerGoods.getSupplierCode()); + costItem.setSupplierName(centerGoods.getSupplierName()); + costItem.setSubjectId(centerGoods.getSubjectId()); + costItem.setSubjectCode(centerGoods.getSubjectCode()); + costItem.setSubjectName(centerGoods.getSubjectName()); + costItem.setCenterType(centerGoods.getCenterType()); + costItem.setCenterId(centerGoods.getCenterId()); + costItem.setCenterCode(centerGoods.getCenterCode()); + costItem.setCenterName(centerGoods.getCenterName()); + costItem.setCenterAmount(centerGoods.getCenterAmount()); + costItem.setCenterRate(centerGoods.getCenterRate()); + costItem.setCenterGoodsAmount(centerGoods.getCenterGoodsAmount()); + costItem.setCenterGoodsRate(centerGoods.getCenterGoodsRate()); + costItem.setTargetType(centerGoods.getTargetType()); + costItem.setTargetId(centerGoods.getTargetId()); + costItem.setTargetCode(centerGoods.getTargetCode()); + costItem.setTargetName(centerGoods.getTargetName()); + costItem.setTargetLevelPathIds(centerGoods.getTargetLevelPathIds()); + costItem.setTargetLevelPathNames(centerGoods.getTargetLevelPathNames()); + costItem.setActStartDate(centerGoods.getActStartDate()); + costItem.setActEndDate(centerGoods.getActEndDate()); + costItem.setPreStartDate(centerGoods.getPreStartDate()); + costItem.setPreEndDate(centerGoods.getPreEndDate()); + costItem.setPreCheckDate(centerGoods.getPreCheckDate()); + costItem.setCenterGoodItemId(centerGoods.getId()); + + if(centerGoods.getScheduleItemBudgetId()!=null){ + TbsScheduleItemBudget itemBudget = matchItemBudgetsMap.get(centerGoods.getScheduleItemBudgetId()); + TbsActivity currActivity = null; + for (TbsActivity activity : activityList) { + if(centerGoods.getActivityId().equals(activity.getId())){ + currActivity = activity; + } + } + TbsBudgetLog budgetLog = TbsBudgetLogBuildUtil.buildTbsBudgetLog(BudgetLogOptFlag.State_1,sysUser, costApply, itemBudget, centerGoods,centerGoods.getCenterGoodsAmount(),currActivity); + budgetLogList.add(budgetLog); + + costItem.setBudgetId(itemBudget.getBudgetId()); + costItem.setScheduleId(itemBudget.getScheduleId()); + costItem.setScheduleItemId(itemBudget.getScheduleItemId()); + costItem.setScheduleItemName(itemBudget.getItemName()); + costItem.setScheduleItemAmount(itemBudget.getFinalBudgetAmount()); + costItem.setScheduleItemAmountUsed(itemBudget.getUsedBudgetAmount()); + costItem.setScheduleItemAmountApply(itemBudget.getUnUsedBudgetAmount()); + costItem.setScheduleItemBudgetId(itemBudget.getId()); + } + allBudgetItem.add(costItem); + } +// budgetCostItemService.saveBatch(allBudgetItem); +// if(CollectionUtil.isNotEmpty(budgetLogList)){ +// budgetLogService.saveBatch(budgetLogList); +// } + } + @Override public Long selectCountOverdueState(String userId) { int sysConfOfWarningDays = 0; @@ -452,7 +528,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl45){ + if(flowId!=null&&flowId.length()>45){ flowId = flowId.substring(0,40); } String formId = null; diff --git a/src/main/java/com/qs/serve/modules/third/PortalSupplierController.java b/src/main/java/com/qs/serve/modules/third/PortalSupplierController.java index da40de29..853a872b 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalSupplierController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalSupplierController.java @@ -107,10 +107,10 @@ public class PortalSupplierController { /** - * 新增 - * @param param - * @return - */ + * 新增 + * @param param + * @return + */ @PostMapping("/save") @PreAuthorize("hasRole('bms:supplier:insert')") public R save(@RequestBody @Valid BmsSupplierBo param, HttpServletRequest request){ diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index 81f4bf55..e2a50eff 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -628,7 +628,7 @@ public class PortalOfCostApplication { missCodes.add(code); } } - Assert.throwEx("品类缺失:"+missCodes.stream().collect(Collectors.joining(","))); + Assert.throwEx("品类缺失("+skuList.size()+"-"+invCodeList.size()+"-"+missCodes.size()+"):"+missCodes.stream().collect(Collectors.joining(","))); } if(skuList.size()<1){ Assert.throwEx("请选择品类再提交"); diff --git a/src/main/java/com/qs/serve/modules/tzc/entity/dto/PolicyItemDto.java b/src/main/java/com/qs/serve/modules/tzc/entity/dto/PolicyItemDto.java index f65119e5..02d872b9 100644 --- a/src/main/java/com/qs/serve/modules/tzc/entity/dto/PolicyItemDto.java +++ b/src/main/java/com/qs/serve/modules/tzc/entity/dto/PolicyItemDto.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.tzc.entity.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -24,8 +25,10 @@ public class PolicyItemDto { private String cusCode; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date startDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date endDate; /** 满减金额 */ diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index be111ce5..1940656c 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -184,9 +184,8 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ String policySyncUrl = projectApisProperties.getPolicySync(); - //String rs = HttpUtil.doPost(policySyncUrl, JsonUtil.objectToJson(policyItemDto), null); - - //log.debug("PolicySync() ==>{} \n{}",JsonUtil.objectToJson(policyItemDto),rs); +// String rs = HttpUtil.doPost(policySyncUrl, JsonUtil.objectToJson(policyItemDto), null); +// log.debug("PolicySync() ==>{} \n{}",JsonUtil.objectToJson(policyItemDto),rs); //TODO 测试临时注释 //保存异步处理的 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 8fcdef07..98c67f1d 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -7,28 +7,37 @@ - - - + - + + - + + + + + + + + + + + - + @@ -37,9 +46,8 @@ - - + @@ -49,7 +57,7 @@ - + @@ -58,19 +66,14 @@ + - - - - - - - - + - + +