合同变更：未锁规合同只有在锁规完成后才能变更，和锁规延期申请不会同时进行（未锁规的才能进行锁规延期申请），所以多余的判断逻辑去除

@@ -24,7 +24,6 @@ import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
-import com.lframework.xingyun.sc.service.contract.ContractChangeApplicationService;
 import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateSpecLockDelayApplicationVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QuerySpecLockDelayApplicationVo;
@@ -66,8 +65,6 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
     private CustomerService customerService;
     @Autowired
     private WorkshopService workshopService;
-    @Autowired
-    private ContractChangeApplicationService contractChangeApplicationService;
 
     public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
 
@@ -228,11 +225,6 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
         if (contractDistributorStandard == null) {
             throw new DefaultClientException("对应锁价无规格合同不存在！");
         }
-        String rootContractId = StringUtils.isBlank(contractDistributorStandard.getParentId())
-                ? contractDistributorStandard.getId() : contractDistributorStandard.getParentId();
-        if (contractChangeApplicationService.hasUnfinishedApplication(rootContractId)) {
-            throw new DefaultClientException("该合同存在未结束的合同变更流程，不允许发起锁规延期申请！");
-        }
 
         QuerySpecLockDelayApplicationVo vo = new QuerySpecLockDelayApplicationVo();
         vo.setContractId(id);

@@ -9,7 +9,6 @@ import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.Assert;
-import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
@@ -31,7 +30,6 @@ import com.lframework.xingyun.sc.entity.ContractChangeApplication;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.ContractStdProcessingLine;
-import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.mappers.ContractChangeApplicationMapper;
 import com.lframework.xingyun.sc.mappers.ContractDistributorStandardMapper;
@@ -53,10 +51,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -87,8 +83,6 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
     @Resource
     private ContractStdProcessingLineService contractStdProcessingLineService;
     @Resource
-    private SpecLockDelayApplicationMapper specLockDelayApplicationMapper;
-    @Resource
     private WorkshopService workshopService;
     @Resource
     private SysDeptService sysDeptService;
@@ -126,6 +120,7 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
                 Wrappers.lambdaQuery(ContractChangeApplication.class)
                 .like(StringUtils.isNotBlank(vo.getContractCode()), ContractChangeApplication::getContractCode, vo.getContractCode())
                 .eq(StringUtils.isNotBlank(vo.getContractType()), ContractChangeApplication::getContractType, vo.getContractType())
+                .eq(StringUtils.isNotBlank(vo.getContractStage()), ContractChangeApplication::getContractStage, vo.getContractStage())
                 .eq(StringUtils.isNotBlank(vo.getApprovalStatus()), ContractChangeApplication::getApprovalStatus, vo.getApprovalStatus());
         if (CollectionUtils.isNotEmpty(buyerIds)) {
             List<String> finalBuyerIds = buyerIds;
@@ -480,9 +475,6 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
         if (hasUnfinishedApplication(rootContractId)) {
             throw new DefaultClientException("该合同存在未结束的合同变更流程，不允许重复发起变更！");
         }
-        if (hasUnfinishedSpecLockDelay(rootContractId)) {
-            throw new DefaultClientException("该合同存在未结束的锁规延期申请，不允许发起合同变更！");
-        }
     }
 
     /**
@@ -611,35 +603,6 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
     }
 
     /**
-     * 是否存在未结束的锁规延期申请
-     *
-     * @param rootContractId 根合同ID
-     * @return 是否存在未结束的锁规延期申请
-     */
-    private boolean hasUnfinishedSpecLockDelay(String rootContractId) {
-        if (StringUtils.isBlank(rootContractId)) {
-            return false;
-        }
-
-        Wrapper<ContractDistributorStandard> contractWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
-                .select(ContractDistributorStandard::getId)
-                .eq(ContractDistributorStandard::getId, rootContractId)
-                .or()
-                .eq(ContractDistributorStandard::getParentId, rootContractId);
-        List<ContractDistributorStandard> contractList = contractDistributorStandardMapper.selectList(contractWrapper);
-        List<String> contractIds = contractList.stream().map(ContractDistributorStandard::getId).collect(Collectors.toList());
-        if (!contractIds.contains(rootContractId)) {
-            contractIds.add(rootContractId);
-        }
-
-        Wrapper<SpecLockDelayApplication> wrapper = Wrappers.lambdaQuery(SpecLockDelayApplication.class)
-                .in(SpecLockDelayApplication::getContractId, contractIds)
-                .notIn(SpecLockDelayApplication::getApprovalStatus,
-                        Arrays.asList(CustomerDevelopStatus.PASS.name(), CustomerDevelopStatus.CANCEL.name()));
-        return specLockDelayApplicationMapper.selectCount(wrapper) > 0;
-    }
-
-    /**
      * 应用合同变更
      *
      * @param application 变更申请单

@@ -32,7 +32,6 @@ import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.SpecLockDelayApplicationMapper;
-import com.lframework.xingyun.sc.service.contract.ContractChangeApplicationService;
 import com.lframework.xingyun.sc.service.HolidaysService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService;
@@ -80,8 +79,6 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
     private SysDeptService sysDeptService;
     @Resource
     private TransactorHandler transactorHandler;
-    @Resource
-    private ContractChangeApplicationService contractChangeApplicationService;
 
     @Override
     public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
@@ -134,7 +131,6 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String create(CreateSpecLockDelayApplicationVo vo) throws Exception {
-        checkNoUnfinishedContractChange(vo.getContractId());
         checkSpecLockDateLimit(vo.getApplicationCount(), vo.getContractId(), vo.getSpecLockDate());
 
         SpecLockDelayApplication data = new SpecLockDelayApplication();
@@ -185,7 +181,6 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void update(UpdateSpecLockDelayApplicationVo vo) throws Exception {
-        checkNoUnfinishedContractChange(vo.getContractId());
         checkSpecLockDateLimit(vo.getApplicationCount(), vo.getContractId(), vo.getSpecLockDate());
 
         SpecLockDelayApplication data = getBaseMapper().selectById(vo.getId());
@@ -291,25 +286,6 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
 
     }
 
-    /**
-     * 校验不存在未结束的合同变更
-     *
-     * @param contractId 合同ID
-     */
-    private void checkNoUnfinishedContractChange(String contractId) {
-        if (StringUtils.isBlank(contractId)) {
-            return;
-        }
-        ContractDistributorStandard contract = contractDistributorStandardService.findById(contractId);
-        if (contract == null) {
-            return;
-        }
-        String rootContractId = StringUtils.isBlank(contract.getParentId()) ? contract.getId() : contract.getParentId();
-        if (contractChangeApplicationService.hasUnfinishedApplication(rootContractId)) {
-            throw new DefaultClientException("该合同存在未结束的合同变更流程，不允许发起锁规延期申请！");
-        }
-    }
-
     public void sendDelaySpecLockMessage() {
         log.info("开始执行延迟锁规消息发送任务");
 

@@ -56,17 +56,6 @@
               WHERE cca.root_contract_id = IFNULL(NULLIF(tb.parent_id, ''), tb.id)
                 AND cca.approval_status NOT IN ('PASS', 'CANCEL')
           )
-          AND NOT EXISTS (
-              SELECT 1
-              FROM tbl_spec_lock_delay_application sda
-                       LEFT JOIN tbl_contract_distributor_standard rel
-                                 ON rel.id = sda.contract_id
-              WHERE sda.approval_status NOT IN ('PASS', 'CANCEL')
-                AND (
-                  sda.contract_id = IFNULL(NULLIF(tb.parent_id, ''), tb.id)
-                      OR rel.parent_id = IFNULL(NULLIF(tb.parent_id, ''), tb.id)
-                  )
-          )
         ORDER BY tb.create_time DESC
     </select>
 </mapper>