提交 87332563 authored 作者: 000516's avatar 000516

店内执行计划,非当月数据不可修改

...@@ -25,6 +25,9 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object>{ ...@@ -25,6 +25,9 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object>{
*/ */
@Override @Override
public boolean supports(MethodParameter methodParameter, Class converterType) { public boolean supports(MethodParameter methodParameter, Class converterType) {
if (methodParameter.getParameterType().isAssignableFrom(AjaxResult.class)) {
return false;
}
return !methodParameter.getParameterType().isAssignableFrom(R.class); return !methodParameter.getParameterType().isAssignableFrom(R.class);
} }
......
...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl; ...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.utils.DateUtils;
import com.sfa.common.core.utils.StringUtils; import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.domain.PageInfo; import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport; import com.sfa.common.core.web.page.TableSupport;
...@@ -16,10 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,10 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/** /**
* @author : liqiulin * @author : liqiulin
...@@ -42,6 +42,10 @@ public class SalesApDisplayDaoImpl implements ISalesApDisplayDao { ...@@ -42,6 +42,10 @@ public class SalesApDisplayDaoImpl implements ISalesApDisplayDao {
@Override @Override
public void updateDetail(SalesApDisplayDto salesApDisplayDto) { public void updateDetail(SalesApDisplayDto salesApDisplayDto) {
SalesApDisplay salesApDisplay = salesapdisMapper.selectById(salesApDisplayDto.getSadId());
if (!DateUtils.isSameYearMonth(salesApDisplay.getSalesMonth(),new Date())){
throw new CheckedException(ECode.SALES_AP_UPDATE_ERROR);
}
SalesApDisplay updateDo = new SalesApDisplay(); SalesApDisplay updateDo = new SalesApDisplay();
BeanUtils.copyProperties(salesApDisplayDto,updateDo); BeanUtils.copyProperties(salesApDisplayDto,updateDo);
salesapdisMapper.updateById(updateDo); salesapdisMapper.updateById(updateDo);
......
...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl; ...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.utils.DateUtils;
import com.sfa.common.core.utils.StringUtils; import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.domain.PageInfo; import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport; import com.sfa.common.core.web.page.TableSupport;
...@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -38,6 +42,11 @@ public class SalesApDisplayJDaoImpl implements ISalesApDisplayJDao { ...@@ -38,6 +42,11 @@ public class SalesApDisplayJDaoImpl implements ISalesApDisplayJDao {
@Override @Override
public void updateDetail(SalesApDisplayJDto djDto) { public void updateDetail(SalesApDisplayJDto djDto) {
SalesApDisplayJ salesApDisplayJ = salesApDisplayJMapper.selectById(djDto.getSadjId());
// 判断salesMonth是否是当前月份
if (!DateUtils.isSameYearMonth(salesApDisplayJ.getSalesMonth(),new Date())){
throw new CheckedException(ECode.SALES_AP_UPDATE_ERROR);
}
SalesApDisplayJ entity = new SalesApDisplayJ(); SalesApDisplayJ entity = new SalesApDisplayJ();
BeanUtils.copyProperties(djDto, entity); BeanUtils.copyProperties(djDto, entity);
salesApDisplayJMapper.updateById(entity); salesApDisplayJMapper.updateById(entity);
......
...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl; ...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.utils.DateUtils;
import com.sfa.common.core.utils.StringUtils; import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.domain.PageInfo; import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport; import com.sfa.common.core.web.page.TableSupport;
...@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -38,6 +42,10 @@ public class SalesApDisplaySDaoImpl implements ISalesApDisplaySDao { ...@@ -38,6 +42,10 @@ public class SalesApDisplaySDaoImpl implements ISalesApDisplaySDao {
@Override @Override
public void updateDetail(SalesApDisplaySDto dsDto) { public void updateDetail(SalesApDisplaySDto dsDto) {
SalesApDisplayS salesApDisplayS = salesApDisplaySMapper.selectById(dsDto.getSadsId());
if (!DateUtils.isSameYearMonth(salesApDisplayS.getSalesMonth(),new Date())){
throw new CheckedException(ECode.SALES_AP_UPDATE_ERROR);
}
SalesApDisplayS entity = new SalesApDisplayS(); SalesApDisplayS entity = new SalesApDisplayS();
BeanUtils.copyProperties(dsDto, entity); BeanUtils.copyProperties(dsDto, entity);
salesApDisplaySMapper.updateById(entity); salesApDisplaySMapper.updateById(entity);
......
...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl; ...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.utils.DateUtils;
import com.sfa.common.core.utils.StringUtils; import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.domain.PageInfo; import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport; import com.sfa.common.core.web.page.TableSupport;
...@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -37,6 +41,10 @@ public class SalesApPromotionDisplayDaoImpl implements ISalesApPromotionDisplayD ...@@ -37,6 +41,10 @@ public class SalesApPromotionDisplayDaoImpl implements ISalesApPromotionDisplayD
@Override @Override
public void updateDetail(SalesApPromotionDisplayDto pdDto) { public void updateDetail(SalesApPromotionDisplayDto pdDto) {
SalesApPromotionDisplay salesApPromotionDisplay = salesApPromotionDisplayMapper.selectById(pdDto.getSapdId());
if (!DateUtils.isSameYearMonth(salesApPromotionDisplay.getSalesMonth(),new Date())){
throw new CheckedException(ECode.SALES_AP_UPDATE_ERROR);
}
SalesApPromotionDisplay pd = new SalesApPromotionDisplay(); SalesApPromotionDisplay pd = new SalesApPromotionDisplay();
BeanUtils.copyProperties(pdDto,pd); BeanUtils.copyProperties(pdDto,pd);
salesApPromotionDisplayMapper.updateById(pd); salesApPromotionDisplayMapper.updateById(pd);
......
...@@ -45,9 +45,12 @@ public class SalesApPromotionImplDao implements ISalesApPromotionDao { ...@@ -45,9 +45,12 @@ public class SalesApPromotionImplDao implements ISalesApPromotionDao {
@Override @Override
public void updateById(SalesApPromotionDto dto) { public void updateById(SalesApPromotionDto dto) {
SalesApPromotion entityOld = salesApPromotionMapper.selectById(dto.getSapId());
if (!DateUtils.isSameYearMonth(entityOld.getSalesMonth(),new Date())){
throw new CheckedException(ECode.SALES_AP_UPDATE_ERROR);
}
// 实际-档期开始/结束时间,是否在当月或下月内 // 实际-档期开始/结束时间,是否在当月或下月内
if (dto.getIsActualPromotionStartDate() || dto.getIsActualPromotionEndDate()){ if (dto.getIsActualPromotionStartDate() || dto.getIsActualPromotionEndDate()){
SalesApPromotion entityOld = salesApPromotionMapper.selectById(dto.getSapId());
if (dto.getIsActualPromotionStartDate() && Objects.nonNull(dto.getActualPromotionStartDate())){ if (dto.getIsActualPromotionStartDate() && Objects.nonNull(dto.getActualPromotionStartDate())){
Date plansDate = entityOld.getPlannedPromotionStartDate(); Date plansDate = entityOld.getPlannedPromotionStartDate();
Date sDate = dto.getActualPromotionStartDate(); Date sDate = dto.getActualPromotionStartDate();
......
...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl; ...@@ -3,6 +3,9 @@ package com.sfa.operation.domain.sales.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.utils.DateUtils;
import com.sfa.common.core.utils.StringUtils; import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.domain.PageInfo; import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport; import com.sfa.common.core.web.page.TableSupport;
...@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -37,9 +41,13 @@ public class SalesApSnacksDisplayDaoImpl implements ISalesApSnacksDisplayDao { ...@@ -37,9 +41,13 @@ public class SalesApSnacksDisplayDaoImpl implements ISalesApSnacksDisplayDao {
@Override @Override
public void updateDetail(SalesApSnacksDisplayDto sdDto) { public void updateDetail(SalesApSnacksDisplayDto sdDto) {
SalesApSnacksDisplay salesApSnacksDisplay = new SalesApSnacksDisplay(); SalesApSnacksDisplay salesApSnacksDisplay = salesapsnackdsDisplayMapper.selectById(sdDto.getSasdId());
BeanUtils.copyProperties(sdDto, salesApSnacksDisplay); if (!DateUtils.isSameYearMonth(salesApSnacksDisplay.getSalesMonth(),new Date())){
salesapsnackdsDisplayMapper.updateById(salesApSnacksDisplay); throw new CheckedException(ECode.SALES_AP_UPDATE_ERROR);
}
SalesApSnacksDisplay entity = new SalesApSnacksDisplay();
BeanUtils.copyProperties(sdDto, entity);
salesapsnackdsDisplayMapper.updateById(entity);
} }
private LambdaQueryWrapper<SalesApSnacksDisplay> buildWq(SalesApWq salesApWq) { private LambdaQueryWrapper<SalesApSnacksDisplay> buildWq(SalesApWq salesApWq) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论