Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -9,6 +9,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -19,6 +20,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 @EnableLock(type = LockType.REDIS)
 @ServletComponentScan(basePackages = {"com.lframework.xingyun"})
 @SpringBootApplication(scanBasePackages = {"com.lframework.xingyun"})
+@EnableScheduling
 @MapperScan({"com.lframework.xingyun.**.mappers"})
 public class XingYunApiApplication {
 

@@ -3,9 +3,9 @@ server:
   port: 8081
 spring:
   application:
-    name: @project.artifactId@
+    name: "@project.artifactId@"
   profiles:
-    active: @profiles-active@
+    active: "@profiles-active@"
   servlet:
     multipart:
       #是否开启文件上传

@@ -106,6 +106,12 @@ public class QuerySpecLockDelayApplicationBo extends BaseBo<SpecLockDelayApplica
     @ApiModelProperty(value = "数量（t）")
     private BigDecimal totalQuantity;
 
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @ApiModelProperty(value = "是否展示审核按钮")
+    private Boolean showExamine;
+
     public QuerySpecLockDelayApplicationBo() {
 
     }

@@ -444,6 +444,19 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
     @ApiModelProperty(value = "是否展示审核按钮")
     private Boolean showExamine;
 
+
+    /**
+     * 企业操作类型
+     */
+    @ApiModelProperty("企业操作类型")
+    private String enterpriseOperationType;
+
+    /**
+     * 冻结状态（正常：NORMAL，冻结：FROZEN）
+     */
+    @ApiModelProperty(value = "冻结状态")
+    private String frozenStatus;
+
     /**
      * 核心人员
      */

@@ -250,4 +250,18 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
         return InvokeResultBuilder.success(result);
     }
 
+
+    /**
+     * 订单申请延期取消
+     */
+    @ApiOperation("订单申请延期取消")
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
+
+        specLockDelayApplicationService.cancelApplication(id);
+
+        specLockDelayApplicationService.cleanCacheByKey(id);
+
+        return InvokeResultBuilder.success();
+    }
 }

@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportListener;
 import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportModel;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.vo.customer.credit.CreateCustomerCreditVo;
@@ -35,6 +36,7 @@ import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -43,7 +45,10 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.io.*;
 import java.net.URLEncoder;
-import java.util.List;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -68,6 +73,8 @@ public class CustomerCreditController extends DefaultBaseController {
     private RedisHandler redisHandler;
     @Value("${customer.credit.export:/web/service/erp/xingyun/export/templates/}")
     private String exportTemplate;
+    @Resource
+    private ContractDistributorStandardService contractDistributorStandardService;
 
     /**
      * 查询列表
@@ -83,7 +90,32 @@ public class CustomerCreditController extends DefaultBaseController {
         List<GetCustomerCreditBo> results = null;
 
         if (!CollectionUtil.isEmpty(datas)) {
-            results = datas.stream().map(GetCustomerCreditBo::new).collect(Collectors.toList());
+            results = datas.stream().map(data -> {
+                GetCustomerCreditBo bo = new GetCustomerCreditBo(data);
+                // frozenStatus 转中文
+                String frozenStatus = data.getFrozenStatus();
+                if ("NORMAL".equals(frozenStatus)) {
+                    bo.setFrozenStatus("正常");
+                } else if ("FROZEN".equals(frozenStatus)) {
+                    bo.setFrozenStatus("冻结");
+                } else {
+                    bo.setFrozenStatus("");
+                }
+
+                // enterpriseOperationType 转中文
+                String opType = data.getEnterpriseOperationType();
+                if ("NEW_CUSTOMER".equals(opType)) {
+                    bo.setEnterpriseOperationType("新开发客户");
+                } else if ("RECONNECT_CUSTOMER".equals(opType)) {
+                    bo.setEnterpriseOperationType("再接轨客户");
+                } else if ("OLD_CUSTOMER".equals(opType)) {
+                    bo.setEnterpriseOperationType("老客户");
+                } else {
+                    bo.setEnterpriseOperationType("");
+                }
+
+                return bo;
+            }).collect(Collectors.toList());
         }
 
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
@@ -308,6 +340,86 @@ public class CustomerCreditController extends DefaultBaseController {
         }
     }
 
+    /**
+     * 定时任务:冻结
+     */
+    @Scheduled(cron = "0 0 0 31 3 ?")
+    @GetMapping("/frozenCustomerCredit")
+    public void frozenCustomerCredit() {
+        System.out.println("===定时任务开始===");
+        // 每年的3月31号去看今年1月1号之前建的资信，如果没在今年1月1号到3月31号之间申请变更并通过都给冻结
+        QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
+        vo.setStatus("PASS");
+        vo.setFrozenStatus("NORMAL");
+        // 获取当前年份
+        int currentYear = LocalDate.now().getYear();
+        // 创建当年1月1日 00:00:00（本地时间）
+        LocalDateTime startOfYear = LocalDateTime.of(currentYear, 1, 1, 0, 0, 0);
+        // 定义格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 转为字符串
+        String formattedDate = startOfYear.format(formatter);
+        vo.setCreateTimeStr(formattedDate);
+        //创建时间
+        List<CustomerCredit> creditList = customerCreditService.query(vo);
+        if (CollectionUtil.isNotEmpty(creditList)) {
+            List<String> idList = creditList.stream()
+                    .map(CustomerCredit::getId)
+                    .collect(Collectors.toList());
+            List<String> needFrozenIds = customerCreditService.getNeedFrozenIds(idList, formattedDate);
+            //冻结客户资信
+            customerCreditService.updateFrozenStatus(needFrozenIds, "FROZEN");
+        }
+        System.out.println("===定时任务结束===");
+    }
+
+    /**
+     * 定时任务:更新企业操作类型
+     */
+    @Scheduled(cron = "0 0 1 * * ?")
+    @GetMapping("/updateEnterpriseOperationType")
+    public void updateEnterpriseOperationType() {
+        System.out.println("===定时任务开始===");
+        //更新企业操作类型：新开发客户（在系统中未签订过合同的客户）、再接轨客户（在一年之前有签订过合同）、老客户（一年内有签订过合同）
+        List<CustomerCredit> customerCreditList = customerCreditService.query(new QueryCustomerCreditVo());
+        if (CollectionUtil.isNotEmpty(customerCreditList)) {
+            Map<String, String> map = new HashMap<>();
+            for (CustomerCredit customerCredit : customerCreditList) {
+                map.put(customerCredit.getCompanyId(), customerCredit.getId());
+            }
+            //客户合集
+            Set<String> companyIds = map.keySet();
+            ArrayList<String> companyIdList = new ArrayList<>(companyIds);
+            //一年之内未签订合同的客户集合
+            List<String> noContractSignedCompanyIds = contractDistributorStandardService.getNoContractSigned(companyIdList);
+            //一年之内签订过合同的客户集合
+            List<String> contractSignedCompanyIds = contractDistributorStandardService.getContractSigned(companyIdList);
+            //移除后得到从未签订过合同的客户
+            companyIdList.removeAll(noContractSignedCompanyIds);
+            companyIdList.removeAll(contractSignedCompanyIds);
+            System.out.println("companyIdList===" + companyIdList);
+            //一年之内未签订合同的客户资信
+            List<String> noContractSignedCreditIds = noContractSignedCompanyIds.stream()
+                    .map(map::get)               // 根据 companyId 获取对应的 creditId
+                    .filter(Objects::nonNull)    // 可选：防止 map 中不存在该 key（逻辑上应该都存在）
+                    .collect(Collectors.toList());
+            customerCreditService.updateEnterpriseOperationType(noContractSignedCreditIds,"RECONNECT_CUSTOMER");
+            //一年之内签订过合同的客户资信
+            List<String> contractSignedCreditIds = contractSignedCompanyIds.stream()
+                    .map(map::get)               // 根据 companyId 获取对应的 creditId
+                    .filter(Objects::nonNull)    // 可选：防止 map 中不存在该 key（逻辑上应该都存在）
+                    .collect(Collectors.toList());
+            customerCreditService.updateEnterpriseOperationType(contractSignedCreditIds,"OLD_CUSTOMER");
+            //从未签订过合同的客户资信
+            List<String> creditIds = companyIdList.stream()
+                    .map(map::get)               // 根据 companyId 获取对应的 creditId
+                    .filter(Objects::nonNull)    // 可选：防止 map 中不存在该 key（逻辑上应该都存在）
+                    .collect(Collectors.toList());
+            customerCreditService.updateEnterpriseOperationType(creditIds,"NEW_CUSTOMER");
+        }
+        System.out.println("===定时任务结束===");
+    }
+
 
 
     /**

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -332,6 +333,16 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private String marketingCenterSupervisor;
 
     /**
+     * 企业操作类型
+     */
+    private String enterpriseOperationType;
+
+    /**
+     * 冻结状态（正常：NORMAL，冻结：FROZEN）
+     */
+    private String frozenStatus;
+
+    /**
      * 是否展示审核按钮(非持久化字段)
      */
     @TableField(exist = false)

@@ -100,4 +100,9 @@ public class SpecLockDelayApplication extends BaseEntity implements BaseDto {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
+    /**
+     * 是否展示正式合同审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamine;
 }

@@ -41,4 +41,18 @@ public enum CustomerDevelopStatus implements BaseEnum<Integer> {
         }
         return null;
     }
+
+    /**
+     * 通过name获取desc（安全版本，不区分大小写）
+     * @param name 枚举名称
+     * @return 描述信息
+     */
+    public static String getDescByNameSafe(String name) {
+        for (CustomerDevelopStatus status : values()) {
+            if (status.name().equalsIgnoreCase(name)) {
+                return status.getDesc();
+            }
+        }
+        return null;
+    }
 }

@@ -11,6 +11,7 @@ import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
+import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
@@ -66,6 +67,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private MqProducerService mqProducerService;
     @Resource
     private TransactorHandler transactorHandler;
+    @Resource
+    private SpecLockDelayApplicationService specLockDelayApplicationService;
 
 
     /**
@@ -118,6 +121,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "SPEC_CHANGE_CONFIRM":
                 handleOrderSpecChangeData(flowStatus, businessId);
                 break;
+            case "SPEC_LOCK_DELAY":
+                handleSpecLockDelayAuditData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -150,6 +156,19 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         }
     }
 
+    private void handleSpecLockDelayAuditData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            specLockDelayApplicationService.updateAuditStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            specLockDelayApplicationService.updateAuditStatus(businessId, "REFUSE");
+        } else if (FlowInstanceStatus.UNDO.getCode().equals(flowStatus)) {
+            specLockDelayApplicationService.updateAuditStatus(businessId, "REFUSE");
+        }
+    }
+
     /**
      * 客户开发业务数据处理
      *
@@ -305,6 +324,10 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 customerCreditService.updateNoFlowInstance(vo);
                 //清除缓存
                 redisHandler.del(businessId);
+                //更新冻结状态为正常
+                List<String> list = new ArrayList<>();
+                list.add(businessId);
+                customerCreditService.updateFrozenStatus(list, "NORMAL");
             } else {
                 //非变更审核
                 customerCreditService.updateStatus(businessId, "PASS");
@@ -347,8 +370,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     /**
      * 处理订货单变更相关数据
      *
-     * @param flowStatus    审核结果
-     * @param businessId    业务ID
+     * @param flowStatus 审核结果
+     * @param businessId 业务ID
      */
     private void handleOrderSpecChangeData(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)

@@ -38,6 +38,7 @@ import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorS
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractStdProcessingLineVo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -496,7 +497,9 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
                 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
         if (!data.getStatus().equals("STANDARD")
-                && ("DISTRIB_STD".equals(data.getType()) || "INTL_STD_CONTRACT".equals(data.getType()))) { // 只有经销(外贸)标准合同才修改状态
+                && ("DISTRIB_STD".equals(data.getType())
+                || "INTL_STD_CONTRACT".equals(data.getType())
+                || "PROCESS_STD_AGMT".equals(data.getType()))) { // 只有经销(外贸、加工)标准合同才修改状态
             updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD")
                     .set(ContractDistributorStandard::getStandardizedAt, LocalDateTime.now());
         }
@@ -820,6 +823,14 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
     }
 
+    public List<String> getNoContractSigned(List<String> buyerList) {
+        return getBaseMapper().getNoContractSigned(buyerList);
+    }
+
+    public List<String> getContractSigned(List<String> buyerList) {
+        return getBaseMapper().getContractSigned(buyerList);
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

 package com.lframework.xingyun.sc.impl.contract;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+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;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
+import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.mappers.SpecLockDelayApplicationMapper;
 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;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateSpecLockDelayApplicationVo;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecLockDelayApplicationMapper, SpecLockDelayApplication> implements SpecLockDelayApplicationService {
 
+    private static final String SPEC_LOCK_DELAY_FLAY = "SPEC_LOCK_DELAY"; // 未锁规格申请单审批
+
+    @Autowired
+    private FlowInstanceWrapperService flowInstanceWrapperService;
+    @Autowired
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
+
     @Override
     public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
 
@@ -40,6 +60,18 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<SpecLockDelayApplication> datas = this.query(vo);
 
+        if (CollectionUtils.isNotEmpty(datas)) {
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (CollectionUtils.isEmpty(flowTaskList)) {
+                return new PageResult<>();
+            }
+            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            for (SpecLockDelayApplication specLockDelayApplication : datas) {
+                specLockDelayApplication.setShowExamine(ids.contains(specLockDelayApplication.getId()));
+            }
+        }
+
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
 
@@ -67,13 +99,15 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         data.setSpecLockDate(vo.getSpecLockDate());
         data.setApplicationCount(vo.getApplicationCount());
         data.setDelayReason(vo.getDelayReason());
-        data.setApprovalStatus(vo.getApprovalStatus());
+        data.setApprovalStatus(CustomerDevelopStatus.AUDIT.name());  // 新建完成直接提交审核
 
         getBaseMapper().insert(data);
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
 
+        // 开启审核
+        flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
         return data.getId();
     }
 
@@ -87,18 +121,88 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
             throw new DefaultClientException("锁价无规格操作申请单不存在！");
         }
 
+        if (!CustomerDevelopStatus.REFUSE.name().equals(data.getApprovalStatus())) {
+            throw new DefaultClientException(CustomerDevelopStatus.getDescByNameSafe(data.getApprovalStatus()) + "的锁价无规格操作申请单不允许修改！");
+        }
+
         LambdaUpdateWrapper<SpecLockDelayApplication> updateWrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class)
-                .set(SpecLockDelayApplication::getContractId, vo.getContractId())
                 .set(SpecLockDelayApplication::getSpecLockDate, vo.getSpecLockDate())
-                .set(SpecLockDelayApplication::getApplicationCount, vo.getApplicationCount())
                 .set(SpecLockDelayApplication::getDelayReason, vo.getDelayReason())
-                .set(SpecLockDelayApplication::getApprovalStatus, vo.getApprovalStatus())
                 .eq(SpecLockDelayApplication::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+
+        // 编辑完成再次开启审核
+        flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
+    }
+
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "锁价无规格操作申请单审批完成，ID：{}， 审批状态：{}", params = {"#id", "#approvedStatus"})
+    @Transactional(rollbackFor = Exception.class)
+    public void updateAuditStatus(String id, String approvedStatus) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(approvedStatus)) {
+            return;
+        }
+
+        Wrapper<SpecLockDelayApplication> wrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class)
+                .set(SpecLockDelayApplication::getApprovalStatus, approvedStatus)
+                .set(SpecLockDelayApplication::getApprovedAt, LocalDateTime.now())
+                .set(SpecLockDelayApplication::getApproverId, SecurityUtil.getCurrentUser().getId())
+                .eq(SpecLockDelayApplication::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        UpdateSpecLockDelayApplicationVo vo = new UpdateSpecLockDelayApplicationVo();
+        vo.setId(id);
+        vo.setApprovalStatus(approvedStatus);
+        vo.setApprovedAt(LocalDateTime.now());
+        vo.setApproverId(SecurityUtil.getCurrentUser().getId());
+
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(vo);
+
+        cleanCacheByKey(id);
+    }
+
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "锁价无规格操作申请单取消，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelApplication(String id) {
+        SpecLockDelayApplication data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("锁价无规格操作申请单不存在！");
+        }
+
+        if (CustomerDevelopStatus.CANCEL.name().equals(data.getApprovalStatus())) {
+            throw new DefaultClientException("锁价无规格操作申请单已经取消！");
+        }
+
+        if (!CustomerDevelopStatus.REFUSE.name().equals(data.getApprovalStatus())) {
+            throw new DefaultClientException(CustomerDevelopStatus.getDescByNameSafe(data.getApprovalStatus()) + "的锁价无规格操作申请单不允许取消！");
+        }
+
+        Wrapper<SpecLockDelayApplication> wrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class)
+                .set(SpecLockDelayApplication::getApprovalStatus, CustomerDevelopStatus.CANCEL.name())
+                .set(SpecLockDelayApplication::getApprovedAt, LocalDateTime.now())
+                .set(SpecLockDelayApplication::getApproverId, SecurityUtil.getCurrentUser().getId())
+                .eq(SpecLockDelayApplication::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        UpdateSpecLockDelayApplicationVo vo = new UpdateSpecLockDelayApplicationVo();
+        vo.setId(id);
+        vo.setApprovalStatus(CustomerDevelopStatus.CANCEL.name());
+        vo.setApprovedAt(LocalDateTime.now());
+        vo.setApproverId(SecurityUtil.getCurrentUser().getId());
+
+
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(vo);
+
+        cleanCacheByKey(id);
     }
 
     @CacheEvict(value = SpecLockDelayApplication.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")

@@ -296,6 +296,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             data.setCompanySuggestedCategory(vo.getCompanySuggestedCategory());
         }
         data.setStatus(vo.getStatus());
+        //新增默认正常
+        data.setFrozenStatus("NORMAL");
 
         getBaseMapper().insert(data);
 
@@ -913,7 +915,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             UpdateCustomerCreditVo updateCustomerCreditVo = objectMapper.readValue(json, UpdateCustomerCreditVo.class);
             // 使用转换后的对象
             System.out.println(updateCustomerCreditVo);
-            updateNoFlowInstance(updateCustomerCreditVo);
+            updatePartNoFlowInstance(updateCustomerCreditVo);
 
         } catch (JsonProcessingException e) {
             e.printStackTrace();
@@ -1076,6 +1078,32 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         cleanCacheByKey(vo.getId());
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "审核中修改客户资信表不走审核，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updatePartNoFlowInstance(UpdateCustomerCreditVo vo) {
+
+        CustomerCredit data = customerCreditMapper.findById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("客户资信表不存在！");
+        }
+        LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
+                .set(CustomerCredit::getCompanySettlementPeriod, StringUtil.isBlank(vo.getCompanySettlementPeriod()) ? null : vo.getCompanySettlementPeriod())
+                .set(CustomerCredit::getCompanyCreditLimit, StringUtil.isBlank(vo.getCompanyCreditLimit()) ? null : vo.getCompanyCreditLimit())
+                .set(CustomerCredit::getCompanyMaterialSupplyPlan, StringUtil.isBlank(vo.getCompanyMaterialSupplyPlan()) ? null : vo.getCompanyMaterialSupplyPlan())
+                .set(CustomerCredit::getCompanySuggestedCategory, vo.getCompanySuggestedCategory())
+                .set(CustomerCredit::getBusinessFileName, StringUtil.isBlank(vo.getBusinessFileName()) ? null : vo.getBusinessFileName())
+                .set(CustomerCredit::getBusinessFileId, StringUtil.isBlank(vo.getBusinessFileId()) ? null : vo.getBusinessFileId())
+                .set(CustomerCredit::getShareholderFileName, StringUtil.isBlank(vo.getShareholderFileName()) ? null : vo.getShareholderFileName())
+                .set(CustomerCredit::getShareholderFileId, StringUtil.isBlank(vo.getShareholderFileId()) ? null : vo.getShareholderFileId())
+                .eq(CustomerCredit::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+        cleanCacheByKey(vo.getId());
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "更新状态，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -1135,6 +1163,37 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         cleanCacheByKey(id);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "批量更新企业操作类型，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateEnterpriseOperationType(List<String> ids, String enterpriseOperationType) {
+        if (CollectionUtils.isEmpty(ids) || StringUtils.isBlank(enterpriseOperationType)) {
+            return;
+        }
+        getBaseMapper().updateEnterpriseOperationType(ids, enterpriseOperationType);
+    }
+
+
+    @OpLog(type = OtherOpLogType.class, name = "批量更新冻结状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateFrozenStatus(List<String> ids, String frozenStatus) {
+        if (CollectionUtils.isEmpty(ids) || StringUtils.isBlank(frozenStatus)) {
+            return;
+        }
+        getBaseMapper().updateFrozenStatus(ids, frozenStatus);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "批量更新冻结状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public List<String> getNeedFrozenIds(List<String> ids, String createTime) {
+        if (CollectionUtils.isEmpty(ids) || StringUtils.isBlank(createTime)) {
+            return null;
+        }
+        return getBaseMapper().getNeedFrozenIds(ids, createTime);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -37,7 +37,7 @@ public class FlowTaskServiceImpl implements FlowTaskService {
             UpdateCustomerCreditVo updateCustomerCreditVo = JsonUtil.parseObject(json, UpdateCustomerCreditVo.class);
             // 使用转换后的对象
             System.out.println(updateCustomerCreditVo);
-            customerCreditService.updateNoFlowInstance(updateCustomerCreditVo);
+            customerCreditService.updatePartNoFlowInstance(updateCustomerCreditVo);
             customerCreditService.cleanCacheByKey(updateCustomerCreditVo.getId());
         } catch (JsonProcessingException e) {
             e.printStackTrace();

@@ -23,4 +23,21 @@ public interface ContractDistributorStandardMapper extends BaseMapper<ContractDi
     List<ContractDistributorStandard> query(@Param("vo") QueryContractDistributorStandardVo vo);
 
     List<ContractDistributorStandard> getCustomerSpecificQualityRequirements(@Param("customerId") String customerId, @Param("productIdList") List<String> productIdList);
+
+    /**
+     * 获取一年内未签订合同的企业
+     *
+     * @param buyerList 企业id集合
+     * @return 一年内未签订合同的企业
+     */
+    List<String> getNoContractSigned(@Param("buyerList") List<String> buyerList);
+
+    /**
+     * 获取一年内签订过合同的企业
+     *
+     * @param buyerList 企业id集合
+     * @return 一年内未签订合同的企业
+     */
+    List<String> getContractSigned(@Param("buyerList") List<String> buyerList);
+
 }

@@ -38,4 +38,23 @@ public interface CustomerCreditMapper extends BaseMapper<CustomerCredit> {
      * @return 已使用编码
      */
     Set<String> getGenerateCode(@Param("code") String code);
+
+    /**
+     * 批量更新企业操作类型
+     *
+     * @param ids                     资信ids
+     * @param enterpriseOperationType 企业操作类型
+     */
+    void updateEnterpriseOperationType(@Param("ids") List<String> ids, @Param("enterpriseOperationType") String enterpriseOperationType);
+
+    /**
+     * 批量更新冻结状态
+     *
+     * @param ids          资信ids
+     * @param frozenStatus 冻结状态
+     */
+    void updateFrozenStatus(@Param("ids") List<String> ids, @Param("frozenStatus") String frozenStatus);
+
+
+    List<String> getNeedFrozenIds(@Param("ids") List<String> ids, @Param("createTime") String createTime);
 }

@@ -6,6 +6,7 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -104,4 +105,20 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      */
     void specificationLock(UpdateContractDistributorStandardVo vo);
 
-}
\ No newline at end of file
+    /**
+     * 获取一年内未签订合同的企业
+     *
+     * @param buyerList 企业id集合
+     * @return 一年内未签订合同的企业
+     */
+    List<String> getNoContractSigned(List<String> buyerList);
+
+    /**
+     * 获取一年内签订过合同的企业
+     *
+     * @param buyerList 企业id集合
+     * @return 一年内未签订合同的企业
+     */
+    List<String> getContractSigned(List<String> buyerList);
+
+}

@@ -52,5 +52,20 @@ public interface SpecLockDelayApplicationService extends BaseMpService<SpecLockD
      */
     void update(UpdateSpecLockDelayApplicationVo vo);
 
+    /**
+     * 更新审核状态
+     *
+     * @param id
+     * @param approvedStatus
+     */
+    void updateAuditStatus(String id, String approvedStatus);
+
+    /**
+     * 取消申请
+     *
+     * @param id
+     */
+    void cancelApplication(String id);
+
 }
 

@@ -8,6 +8,7 @@ import com.lframework.xingyun.sc.vo.customer.credit.CreateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import freemarker.template.TemplateException;
+import org.apache.ibatis.annotations.Param;
 
 import java.io.IOException;
 import java.util.List;
@@ -65,6 +66,8 @@ public interface CustomerCreditService extends BaseMpService<CustomerCredit> {
      */
     void updateNoFlowInstance(UpdateCustomerCreditVo vo);
 
+    void updatePartNoFlowInstance(UpdateCustomerCreditVo vo);
+
 
     /**
      * 更新状态
@@ -88,6 +91,31 @@ public interface CustomerCreditService extends BaseMpService<CustomerCredit> {
     void cancel(String id);
 
     /**
+     * 批量更新企业操作类型
+     *
+     * @param ids                      主键
+     * @param enterpriseOperationType 企业操作类型
+     */
+    void updateEnterpriseOperationType(List<String> ids, String enterpriseOperationType);
+
+    /**
+     * 批量更新冻结状态
+     *
+     * @param ids           主键
+     * @param frozenStatus 冻结状态
+     */
+    void updateFrozenStatus(List<String> ids, String frozenStatus);
+
+    /**
+     * 获取需要冻结的客户资信id
+     *
+     * @param ids        资信id集合
+     * @param createTime 创建时间
+     * @return 需要冻结的客户资信id集合
+     */
+    List<String> getNeedFrozenIds(List<String> ids, String createTime);
+
+    /**
      * 根据ID删除
      * @param id
      * @return

@@ -8,6 +8,7 @@ import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 public class UpdateSpecLockDelayApplicationVo implements BaseVo, Serializable {
@@ -55,4 +56,15 @@ public class UpdateSpecLockDelayApplicationVo implements BaseVo, Serializable {
     @Length(message = "审核状态最多允许50个字符！")
     private String approvalStatus;
 
+    /**
+     * 审核人
+     */
+    @ApiModelProperty(value = "审核人")
+    private String approverId;
+
+    /**
+     * 审核时间
+     */
+    @ApiModelProperty(value = "审核时间")
+    private LocalDateTime approvedAt;
 }

@@ -397,4 +397,16 @@ public class CreateCustomerCreditVo implements BaseVo, Serializable {
     @ApiModelProperty("是否为导入")
     private String importType;
 
+    /**
+     * 企业操作类型
+     */
+    @ApiModelProperty("企业操作类型")
+    private String enterpriseOperationType;
+
+    /**
+     * 冻结状态（正常：NORMAL，冻结：FROZEN）
+     */
+    @ApiModelProperty(value = "冻结状态")
+    private String frozenStatus;
+
 }

@@ -76,4 +76,22 @@ public class QueryCustomerCreditVo extends PageVo implements BaseVo, Serializabl
     @ApiModelProperty("导出类型")
     private String exportType;
 
+    /**
+     * 企业操作类型
+     */
+    @ApiModelProperty("企业操作类型")
+    private String enterpriseOperationType;
+
+    /**
+     * 冻结状态（正常：NORMAL，冻结：FROZEN）
+     */
+    @ApiModelProperty(value = "冻结状态")
+    private String frozenStatus;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private String createTimeStr;
+
 }

@@ -458,4 +458,16 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "营销中心主管")
     private String marketingCenterSupervisor;
 
+    /**
+     * 企业操作类型
+     */
+    @ApiModelProperty("企业操作类型")
+    private String enterpriseOperationType;
+
+    /**
+     * 冻结状态（正常：NORMAL，冻结：FROZEN）
+     */
+    @ApiModelProperty(value = "冻结状态")
+    private String frozenStatus;
+
 }

@@ -189,4 +189,40 @@
         WHERE rn = 1
         ORDER BY create_time;
     </select>
+
+    <select id="getNoContractSigned" resultType="java.lang.String">
+        SELECT DISTINCT buyer
+        FROM (
+        SELECT
+        buyer,
+        formalized_at,
+        ROW_NUMBER() OVER (PARTITION BY buyer ORDER BY formalized_at DESC) AS rn
+        FROM tbl_contract_distributor_standard
+        WHERE formalized_at is not null
+        and buyer in
+        <foreach collection="buyerList" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+        ) t
+        WHERE rn = 1
+        AND DATE(formalized_at) &lt; DATE_SUB(CURDATE(), INTERVAL 1 YEAR);
+    </select>
+
+    <select id="getContractSigned" resultType="java.lang.String">
+        SELECT DISTINCT buyer
+        FROM (
+        SELECT
+        buyer,
+        formalized_at,
+        ROW_NUMBER() OVER (PARTITION BY buyer ORDER BY formalized_at DESC) AS rn
+        FROM tbl_contract_distributor_standard
+        WHERE formalized_at is not null
+        and buyer in
+        <foreach collection="buyerList" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+        ) t
+        WHERE rn = 1
+        AND DATE(formalized_at) >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR);
+    </select>
 </mapper>

@@ -64,6 +64,8 @@
         <result column="marketing_department_supervisor" property="marketingDepartmentSupervisor"/>
         <result column="marketing_center_supervisor" property="marketingCenterSupervisor"/>
         <result column="status" property="status"/>
+        <result column="enterprise_operation_type" property="enterpriseOperationType"/>
+        <result column="frozen_status" property="frozenStatus"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -135,6 +137,8 @@
             tb.marketing_department_supervisor,
             tb.marketing_center_supervisor,
             tb.shareholder_file_id,
+            tb.enterprise_operation_type,
+            tb.frozen_status,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,
@@ -174,6 +178,15 @@
             <if test="vo.statusCancel != null and vo.statusCancel != ''">
                 AND tb.status != #{vo.statusCancel}
             </if>
+            <if test="vo.enterpriseOperationType != null and vo.enterpriseOperationType != ''">
+                AND tb.enterprise_operation_type = #{vo.enterpriseOperationType}
+            </if>
+            <if test="vo.frozenStatus != null and vo.frozenStatus != ''">
+                AND tb.frozen_status = #{vo.frozenStatus}
+            </if>
+            <if test="vo.createTimeStr != null and vo.createTimeStr != ''">
+                AND tb.create_time &lt; #{vo.createTimeStr}
+            </if>
         </where>
     </select>
 
@@ -196,4 +209,49 @@
             </if>
         </where>
     </select>
+
+    <update id="updateEnterpriseOperationType">
+        UPDATE customer_credit
+        SET enterprise_operation_type = #{enterpriseOperationType}
+        WHERE id in
+        <foreach collection="ids" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updateFrozenStatus">
+        UPDATE customer_credit
+        SET frozen_status = #{frozenStatus}
+        WHERE id in
+        <foreach collection="ids" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="getNeedFrozenIds" resultType="String">
+        SELECT c.id
+        FROM customer_credit c
+        LEFT JOIN (
+        SELECT
+        h.credit_id,
+        MAX(h.create_time) AS latest_create_time  -- 直接取最大时间
+        FROM customer_credit_history h
+        WHERE h.id LIKE '%_01'
+        AND h.credit_id IN
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        GROUP BY h.credit_id
+        ) latest_h ON c.id = latest_h.credit_id
+        WHERE c.id IN
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND c.status = 'PASS'
+        AND (
+        latest_h.latest_create_time IS NULL           -- 无 history 记录
+        OR latest_h.latest_create_time &lt; #{createTime}  -- 有记录且最新时间小于createTime
+        );
+    </select>
+
 </mapper>