超时查询增加时间查询条件

yangys

2025-06-17 c255b0949b5887955570c200fd119f96bf9d902b

超时查询增加时间查询条件

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java

@@ -46,7 +46,7 @@
     * æ–°å¢ž
     */
    @PostMapping("/save")
    @Operation(summary = "新增", description = "机床组信息")
    @Operation(summary = "新增", description = "机床信息")
    public R<Boolean> save(@RequestBody MachineSaveVO vo) {

        service.saveMachine(vo);
@@ -109,7 +109,7 @@
            list.add(excelVO);
        });

        ExcelUtil.export(response, "机床数据" + DateUtil.time(), "用户数据表", list, MachineExcelVO.class);
        ExcelUtil.export(response, "机床数据" + DateUtil.time(), "机床数据表", list, MachineExcelVO.class);
    }

    @Operation(summary = "产生机床回传结构树", description = "产生机床回传结构树")

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java

@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDate;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -39,8 +40,8 @@
    @GetMapping("overtime-list")
    @ApiOperationSupport(order = 3)
    @Operation(summary = "超时查询", description = "查询所有超时任务")
    public R<IPage<BladeFlow>> overtimeList(@Parameter(description = "执行人员") String assigneeName, @Parameter(description = "关键字") String keyword, Query query) {
        IPage<BladeFlow> pages = businessService.selectOvertimePage(Condition.getPage(query), assigneeName,keyword);
    public R<IPage<BladeFlow>> overtimeList(@Parameter(description = "任务到达时间开始") LocalDate createTimeBegin, @Parameter(description = "任务到达时间截止")LocalDate createTimeEnd, @Parameter(description = "执行人员") String assigneeName, @Parameter(description = "关键字") String keyword, Query query) {
        IPage<BladeFlow> pages = businessService.selectOvertimePage(Condition.getPage(query), createTimeBegin,createTimeEnd,assigneeName,keyword);
        return R.data(pages);
    }


 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java

@@ -396,11 +396,17 @@
     * @param keyword
     * @return
     */
    public IPage<BladeFlow> selectOvertimePage(IPage<BladeFlow> page, String assigneeName,String keyword) {
    public IPage<BladeFlow> selectOvertimePage(IPage<BladeFlow> page,LocalDate createTimeBegin,LocalDate createTimeEnd, String assigneeName,String keyword) {

        List<BladeFlow> flowList = new LinkedList<>();
        Date now = new Date();
        TaskQuery todoQuery = taskService.createTaskQuery().taskDueBefore(now).active().includeProcessVariables();
        if(Func.isNotEmpty(createTimeBegin)) {
            todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
        }
        if(Func.isNotEmpty(createTimeEnd)) {
            todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
        }

        if(Func.isNotEmpty(keyword)) {
            todoQuery.taskVariableValueLike("assigneeName", "%"+assigneeName+"%");

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java

@@ -1,28 +1,4 @@
/**
 * BladeX Commercial License Agreement
 * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
 * <p>
 * Use of this software is governed by the Commercial License Agreement
 * obtained after purchasing a license from BladeX.
 * <p>
 * 1. This software is for development use only under a valid license
 * from BladeX.
 * <p>
 * 2. Redistribution of this software's source code to any third party
 * without a commercial license is strictly prohibited.
 * <p>
 * 3. Licensees may copyright their own code but cannot use segments
 * from this software for such purposes. Copyright of this software
 * remains with BladeX.
 * <p>
 * Using this software signifies agreement to this License, and the software
 * must not be used for illegal purposes.
 * <p>
 * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
 * not liable for any claims arising from secondary or illegal development.
 * <p>
 * Author: Chill Zhuang (bladejava@qq.com)
 */

package org.springblade.mdm.program.controller;

import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@

package org.springblade.mdm.program.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;

/**
 * ç¨‹åºèŠ‚点
 *
 * @author yangys
 */
@NonDS
@RestController
@RequestMapping("/program/node")
@AllArgsConstructor
@Tag(name = "程序节点", description = "程序节点")
@Slf4j
public class NcNodeController {

    private final NcNodeService ncNodeService;

    /**
     * æ–°å¢ž
     */
    @PostMapping("/save")
    @Operation(summary = "新增", description = "节点信息")
    public R<Boolean> save(@RequestBody NcNodeVO vo) {

        ncNodeService.saveNcCode(vo);
        return R.<Boolean>status(true);
    }

    /**
     * æ–°å¢ž
     */
    @PostMapping("/update")
    @Operation(summary = "修改", description = "节点信息")
    public R<Boolean> update(@RequestBody NcNodeVO vo) {

        ncNodeService.updateNcCode(vo);
        return R.<Boolean>status(true);
    }

}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package org.springblade.mdm.program.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.base.BizEntity;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Setter
@Getter
@TableName("mdm_nc_node")
public class NcNode extends BizEntity {
    private String name;
    private Long parentId;
    /**
     * ç¨‹åºåŒ…名
      */
    private String nodeType;

}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.springblade.mdm.program.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;

public interface NcNodeMapper extends BladeMapper<NcNode> {

    /**
     * èŽ·å–最新固化程序
     * @param partNo é›¶ç»„件号
     * @param machineGroupCode æœºåºŠç»„代码
     * @return
     */
    //NcProgram getCuredNcProgram(@Param("partNo")String partNo,@Param("machineGroupCode")String machineGroupCode);
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
<?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="org.springblade.mdm.program.mapper.NcNodeMapper">
    <resultMap id="BaseResultMap" type="org.springblade.mdm.program.entity.NcNode">
        <id column="id" property="id"/>
        <result column="name" property="name"/>
        <result column="parent_id" property="parentId"/>
        <result column="node_type" property="nodeType"/>
        <result column="status" property="status"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>
<!--

    <select id="pageQuery" resultType="org.springblade.mdm.basesetting.machine.vo.MachineVO">
        select m.id,m.name,m.code,g.dict_key machine_group_code,g.dict_value machine_group_name,m.machine_spec,m.manufacturer,m.operator
        from mdm_machine m join blade_dict_biz g on m.machine_group_code=g.dict_key and g.code='machine_group' and g.is_deleted=0
            ${ew.customSqlSegment}
    </select>
-->


    <!--    <select id="parentTree" resultMap="treeNodeResultMap">-->
<!--        select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!--    </select>-->
    <sql id="all_columns">id,tenant_id,nc_node_id,code,name,package_name,machine_code,part_no,is_cured,
  expire_date,process_edition,is_last_edition,is_locked,task_assign_time,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
    <select id="getCuredNcProgram" resultMap="BaseResultMap">
        select <include refid="all_columns"/> from mdm_nc_program
        where is_deleted=0 and is_cured=1 and part_no=#{partNo} and is_last_edition=1
        and machine_code in (select code from mdm_machine where machine_group_code=#{machineGroupCode})
        order by create_time desc
        limit 1
    </select>
</mapper>

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@

package org.springblade.mdm.program.service;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.*;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.mapper.NcNodeMapper;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

/**
 * ç¨‹åºèŠ‚点
 *
 * @author yangys
 */
@Slf4j
@Service
@AllArgsConstructor
public class NcNodeService extends BizServiceImpl<NcNodeMapper, NcNode> {


    public void saveNcCode(NcNodeVO vo) {
        NcNode ncNode = new NcNode();

        BeanUtils.copyProperties(vo, ncNode);
        ncNode.setId(null);

        this.save(ncNode);
    }


    public void updateNcCode(NcNodeVO vo) {
        NcNode ncNode = this.getById(vo.getId());
        ncNode.setName(vo.getName());
        ncNode.setNodeType(vo.getNodeType());

        this.updateById(ncNode);
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.springblade.mdm.program.vo;

import lombok.Getter;
import lombok.Setter;
import org.springblade.mdm.commons.vo.BaseVO;

@Setter
@Getter
public class NcNodeVO extends BaseVO {
    private String name;
    private Long parentId;
    /**
     * ç¨‹åºåŒ…名
      */
    private String nodeType;

}