楚江ERP：校验申请日期是否超过规定值

@@ -232,4 +232,21 @@ create table `tbl_spec_lock_delay_application`
     `update_by`         varchar(20) not null comment '更新人',
     `create_time`       datetime default now() comment '创建时间',
     `update_time`       datetime default now() comment '更新时间'
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '锁价无规格操作申请单' ROW_FORMAT = DYNAMIC;
\ No newline at end of file
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '锁价无规格操作申请单' ROW_FORMAT = DYNAMIC;
+
+-- 节假日
+DROP TABLE IF EXISTS `tbl_holidays`;
+create table `tbl_holidays`
+(
+    `id`           varchar(32) primary key comment 'ID',
+    `year`         int(4) NOT NULL COMMENT '年份',
+    `holiday_date` date        NOT NULL COMMENT '日期',
+    `rest`         TINYINT(1) COMMENT '是否休息（0-补班，1-休息）',
+    `holiday_name` varchar(50) COMMENT '节假日名称',
+    `create_by_id` varchar(32) not null comment '创建人ID',
+    `create_by`    varchar(20) not null comment '创建人',
+    `update_by_id` varchar(32) not null comment '更新人ID',
+    `update_by`    varchar(20) not null comment '更新人',
+    `create_time`  datetime default now() comment '创建时间',
+    `update_time`  datetime default now() comment '更新时间'
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '节假日' ROW_FORMAT = DYNAMIC;
\ No newline at end of file

@@ -192,7 +192,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
     @ApiOperation("新增")
     @HasPermission({"entity:speclockdelayapplication:add"})
     @PostMapping
-    public InvokeResult<Void> create(@RequestBody CreateSpecLockDelayApplicationVo vo) {
+    public InvokeResult<Void> create(@RequestBody CreateSpecLockDelayApplicationVo vo) throws Exception {
 
         specLockDelayApplicationService.create(vo);
 
@@ -205,7 +205,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
     @ApiOperation("修改")
     @HasPermission({"entity:speclockdelayapplication:modify"})
     @PutMapping
-    public InvokeResult<Void> update(@RequestBody UpdateSpecLockDelayApplicationVo vo) {
+    public InvokeResult<Void> update(@RequestBody UpdateSpecLockDelayApplicationVo vo) throws Exception {
 
         specLockDelayApplicationService.update(vo);
 

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 节假日
+ * </p>
+ */
+@Data
+@TableName("tbl_holidays")
+public class Holidays extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "Holidays";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 年份
+     */
+    private Integer year;
+
+    /**
+     * 日期
+     */
+    private LocalDate holidayDate;
+
+    /**
+     * 是否休息（0-补班，1-休息）
+     */
+    private Boolean rest;
+
+    /**
+     * 节假日名称
+     */
+    private String holidayName;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

+package com.lframework.xingyun.sc.impl;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.DateUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.xingyun.sc.entity.Holidays;
+import com.lframework.xingyun.sc.mappers.HolidaysMapper;
+import com.lframework.xingyun.sc.service.HolidaysService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.Serializable;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class HolidaysServiceImpl extends BaseMpServiceImpl<HolidaysMapper, Holidays> implements HolidaysService {
+
+    @Override
+    public List<Holidays> query(Holidays vo) {
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public Holidays findById(String id) {
+        return getBaseMapper().selectById(id);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(Holidays vo) {
+        vo.setId(IdUtil.getUUID());
+        getBaseMapper().insert(vo);
+
+        return vo.getId();
+    }
+
+    @Override
+    public boolean isWithinWorkdayLimit(LocalDate startDate, LocalDate endDate, int maxWorkdays) throws Exception {
+        int startYear = startDate.getYear();
+        int endYear = endDate.getYear();
+
+        List<Holidays> holidaysList = new ArrayList<>(getHolidaysForYear(startYear));
+
+        if (endYear != startYear) {
+            holidaysList.addAll(getHolidaysForYear(endYear));
+        }
+
+        if (CollectionUtils.isEmpty(holidaysList)) {
+            throw new DefaultClientException("获取节假日信息出错！");
+        }
+
+        // 节假日休息日期
+        List<LocalDate> restHolidaysList = holidaysList.stream()
+                .filter(Holidays::getRest)
+                .map(Holidays::getHolidayDate)
+                .collect(Collectors.toList());
+
+        // 节假日调休日期
+        List<LocalDate> unRestHolidaysList = holidaysList.stream()
+                .filter(holidays -> BooleanUtils.isFalse(holidays.getRest()))
+                .map(Holidays::getHolidayDate)
+                .collect(Collectors.toList());
+
+        int workingDays = 0;
+        LocalDate currentDate = startDate.plusDays(1); // 从签订日第二天开始计算
+
+        while (!currentDate.isAfter(endDate)) {
+            if (restHolidaysList.contains(currentDate)) {
+                currentDate = currentDate.plusDays(1);
+                continue;
+            }
+
+            // 调休或者小于 1=周一, 5=周五
+            if (unRestHolidaysList.contains(currentDate) || currentDate.getDayOfWeek().getValue() <= 5) {
+                workingDays++;
+            }
+
+            currentDate = currentDate.plusDays(1);
+        }
+
+        return workingDays <= maxWorkdays;
+    }
+
+    private List<Holidays> getHolidaysForYear(int year) throws Exception {
+        Holidays query = new Holidays();
+        query.setYear(year);
+        List<Holidays> holidays = query(query);
+
+        if (CollectionUtils.isEmpty(holidays)) {
+            holidays = callHolidayApi(year);
+        }
+
+        return holidays != null ? holidays : Collections.emptyList();
+    }
+
+    private List<Holidays> callHolidayApi(int year) throws Exception {
+        String API_URL = "https://publicapi.xiaoai.me/holiday/year?date=" + year;
+
+        StringBuilder response = new StringBuilder();
+        HttpURLConnection connection = null;
+
+        try {
+            URL url = new URL(API_URL);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("GET");
+            connection.setConnectTimeout(5000);
+            connection.setReadTimeout(5000);
+
+            int responseCode = connection.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                try (BufferedReader reader = new BufferedReader(
+                        new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        response.append(line);
+                    }
+                }
+            } else {
+                throw new RuntimeException("HTTP请求失败，响应码: " + responseCode);
+            }
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+
+        if (StringUtils.isBlank(response)) {
+            return null;
+        }
+
+        Object data = JsonUtil.parseObj(response).get("data");
+        if (ObjectUtil.isNull(data)) {
+            return null;
+        }
+
+        JSONArray jsonArray = JsonUtil.parseArray(data);
+        if (jsonArray.isEmpty()) {
+            return null;
+        }
+
+        List<Holidays> holidaysList = new ArrayList<>(jsonArray.size());
+        for (Object object : jsonArray) {
+            if (ObjectUtil.isNull(object)) {
+                continue;
+            }
+
+            JSONObject jsonObject = JsonUtil.parseObj(object);
+            Holidays holidays = new Holidays();
+            holidays.setYear(year);
+            holidays.setHolidayName(jsonObject.getStr("holiday"));
+            holidays.setRest(jsonObject.getInt("rest") == 1);
+            holidays.setHolidayDate(DateUtil.toLocalDate(jsonObject.getDate("date")));
+            holidaysList.add(holidays);
+        }
+
+        if (CollectionUtils.isNotEmpty(holidaysList)) {
+            holidaysList.forEach(this::create);
+        }
+
+        return holidaysList;
+    }
+
+    @CacheEvict(value = Holidays.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}
\ No newline at end of file

@@ -20,9 +20,12 @@ 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.ContractDistributorStandard;
 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.HolidaysService;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 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;
@@ -36,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -49,6 +53,10 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
     private FlowInstanceWrapperService flowInstanceWrapperService;
     @Autowired
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Autowired
+    private ContractDistributorStandardService contractDistributorStandardService;
+    @Autowired
+    private HolidaysService holidaysService;
 
     @Override
     public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
@@ -90,7 +98,8 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
     @OpLog(type = OtherOpLogType.class, name = "新增锁价无规格操作申请单，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public String create(CreateSpecLockDelayApplicationVo vo) {
+    public String create(CreateSpecLockDelayApplicationVo vo) throws Exception {
+        checkSpecLockDateLimit(vo.getApplicationCount(), vo.getContractId(), vo.getSpecLockDate());
 
         SpecLockDelayApplication data = new SpecLockDelayApplication();
         data.setId(IdUtil.getUUID());
@@ -110,10 +119,29 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         return data.getId();
     }
 
+    private void checkSpecLockDateLimit(Integer applicationCount, String contractId, LocalDate specLockDate) throws Exception {
+        if (applicationCount == 1) {
+            ContractDistributorStandard contractDistributorStandard = contractDistributorStandardService.findById(contractId);
+            if (!holidaysService.isWithinWorkdayLimit(contractDistributorStandard.getOrderDate(), specLockDate, 10)) {
+                throw new DefaultClientException("第一次申请的延期时间不能超过正式合同签订时间之日起的10个工作日！");
+            }
+        } else {
+            // 获取上一次的申请数据
+            Wrapper<SpecLockDelayApplication> wrapper = Wrappers.lambdaQuery(SpecLockDelayApplication.class)
+                    .eq(SpecLockDelayApplication::getContractId, contractId)
+                    .eq(SpecLockDelayApplication::getApplicationCount, applicationCount - 1);
+            SpecLockDelayApplication lastApplication = getBaseMapper().selectOne(wrapper);
+            if (!holidaysService.isWithinWorkdayLimit(lastApplication.getSpecLockDate(), specLockDate, 5)) {
+                throw new DefaultClientException("申请的延期时间与上一次申请延期时间不能超过5个工作日！");
+            }
+        }
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "修改锁价无规格操作申请单，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void update(UpdateSpecLockDelayApplicationVo vo) {
+    public void update(UpdateSpecLockDelayApplicationVo vo) throws Exception {
+        checkSpecLockDateLimit(vo.getApplicationCount(), vo.getContractId(), vo.getSpecLockDate());
 
         SpecLockDelayApplication data = getBaseMapper().selectById(vo.getId());
         if (ObjectUtil.isNull(data)) {

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.Holidays;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 节假日 Mapper 接口
+ * </p>
+ */
+public interface HolidaysMapper extends BaseMapper<Holidays> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<Holidays> query(@Param("vo") Holidays vo);
+}

+package com.lframework.xingyun.sc.service;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.entity.Holidays;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 节假日 Service
+ */
+public interface HolidaysService extends BaseMpService<Holidays> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<Holidays> query(Holidays vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    Holidays findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo
+     * @return
+     */
+    String create(Holidays vo);
+
+    /**
+     * 计算是否超过指定工作日日期
+     *
+     * @param startDate   开始日期
+     * @param endDate     结束日期
+     * @param maxWorkdays 最大工作日
+     * @return true表示没有超过，false表示超过了
+     */
+    boolean isWithinWorkdayLimit(LocalDate startDate, LocalDate endDate, int maxWorkdays) throws Exception;
+}

@@ -43,14 +43,14 @@ public interface SpecLockDelayApplicationService extends BaseMpService<SpecLockD
      * @param vo
      * @return
      */
-    String create(CreateSpecLockDelayApplicationVo vo);
+    String create(CreateSpecLockDelayApplicationVo vo) throws Exception;
 
     /**
      * 修改
      *
      * @param vo
      */
-    void update(UpdateSpecLockDelayApplicationVo vo);
+    void update(UpdateSpecLockDelayApplicationVo vo) throws Exception;
 
     /**
      * 更新审核状态

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.sc.mappers.HolidaysMapper">
+
+    <resultMap id="Holidays" type="com.lframework.xingyun.sc.entity.Holidays">
+        <id column="id" property="id"/>
+        <result column="year" property="year"/>
+        <result column="holiday_date" property="holidayDate"/>
+        <result column="rest" property="rest"/>
+        <result column="holiday_name" property="holidayName"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="Holidays_sql">
+        SELECT tb.id,
+               tb.year,
+               tb.holiday_date,
+               tb.rest,
+               tb.holiday_name,
+               tb.create_by_id,
+               tb.create_by,
+               tb.update_by_id,
+               tb.update_by,
+               tb.create_time,
+               tb.update_time
+        FROM tbl_holidays AS tb
+    </sql>
+
+    <select id="query" resultMap="Holidays">
+        <include refid="Holidays_sql"/>
+        <where>
+            <if test="vo.year != null">
+                AND tb.year = #{vo.year}
+            </if>
+            <if test="vo.holidayDate != null">
+                AND tb.holiday_date = #{vo.holidayDate}
+            </if>
+        </where>
+        order by tb.year,tb.holiday_date
+    </select>
+</mapper>