朱园亮 / xingyun-erp · Commits

Commit 6c2eb1bc84e9fb214ed1bf75869a02823f2fc66a

Authored by 杨鸣坤
1 parent aacd1320

楚江ERP：重新提交更新审核状态

Inline Side-by-side
Showing 2 changed files with 2 additions and 3 deletions
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 import com.lframework.starter.common.exceptions.impl.DefaultClientException; 5 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
6 import com.lframework.starter.common.utils.CollectionUtil; 6 import com.lframework.starter.common.utils.CollectionUtil;
7 -import com.lframework.starter.common.utils.DateUtil;  
8 import com.lframework.starter.web.core.annotations.security.HasPermission; 7 import com.lframework.starter.web.core.annotations.security.HasPermission;
9 import com.lframework.starter.web.core.components.resp.InvokeResult; 8 import com.lframework.starter.web.core.components.resp.InvokeResult;
10 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; 9 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
@@ -20,7 +19,6 @@ import com.lframework.xingyun.basedata.entity.Workshop; @@ -20,7 +19,6 @@ import com.lframework.xingyun.basedata.entity.Workshop;
20 import com.lframework.xingyun.basedata.service.customer.CustomerService; 19 import com.lframework.xingyun.basedata.service.customer.CustomerService;
21 import com.lframework.xingyun.basedata.service.workshop.WorkshopService; 20 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
22 import com.lframework.xingyun.sc.bo.contract.GetSpecLockDelayApplicationBo; 21 import com.lframework.xingyun.sc.bo.contract.GetSpecLockDelayApplicationBo;
23 -import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;  
24 import com.lframework.xingyun.sc.bo.contract.QuerySpecLockDelayApplicationBo; 22 import com.lframework.xingyun.sc.bo.contract.QuerySpecLockDelayApplicationBo;
25 import com.lframework.xingyun.sc.entity.ContractDistributorStandard; 23 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
26 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication; 24 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
@@ -39,6 +37,7 @@ import org.springframework.validation.annotation.Validated; @@ -39,6 +37,7 @@ import org.springframework.validation.annotation.Validated;
39 import org.springframework.web.bind.annotation.*; 37 import org.springframework.web.bind.annotation.*;
40 38
41 import javax.validation.constraints.NotBlank; 39 import javax.validation.constraints.NotBlank;
  40 +import java.time.LocalDate;
42 import java.util.List; 41 import java.util.List;
43 import java.util.Map; 42 import java.util.Map;
44 import java.util.function.Function; 43 import java.util.function.Function;
@@ -20,7 +20,6 @@ import com.lframework.starter.web.core.utils.OpLogUtil; @@ -20,7 +20,6 @@ import com.lframework.starter.web.core.utils.OpLogUtil;
20 import com.lframework.starter.web.core.utils.PageHelperUtil; 20 import com.lframework.starter.web.core.utils.PageHelperUtil;
21 import com.lframework.starter.web.core.utils.PageResultUtil; 21 import com.lframework.starter.web.core.utils.PageResultUtil;
22 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType; 22 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
23 -import com.lframework.xingyun.sc.entity.CustomerCredit;  
24 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication; 23 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
25 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus; 24 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
26 import com.lframework.xingyun.sc.mappers.SpecLockDelayApplicationMapper; 25 import com.lframework.xingyun.sc.mappers.SpecLockDelayApplicationMapper;
@@ -128,6 +127,7 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL @@ -128,6 +127,7 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
128 LambdaUpdateWrapper<SpecLockDelayApplication> updateWrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class) 127 LambdaUpdateWrapper<SpecLockDelayApplication> updateWrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class)
129 .set(SpecLockDelayApplication::getSpecLockDate, vo.getSpecLockDate()) 128 .set(SpecLockDelayApplication::getSpecLockDate, vo.getSpecLockDate())
130 .set(SpecLockDelayApplication::getDelayReason, vo.getDelayReason()) 129 .set(SpecLockDelayApplication::getDelayReason, vo.getDelayReason())
  130 + .set(SpecLockDelayApplication::getApprovalStatus, CustomerDevelopStatus.AUDIT.name())
131 .eq(SpecLockDelayApplication::getId, vo.getId()); 131 .eq(SpecLockDelayApplication::getId, vo.getId());
132 132
133 getBaseMapper().update(updateWrapper); 133 getBaseMapper().update(updateWrapper);