From c255b0949b5887955570c200fd119f96bf9d902b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 17 六月 2025 09:52:07 +0800
Subject: [PATCH] 超时查询增加时间查询条件

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java                              |   17 ++++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java                      |   17 ++++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml                       |   36 +++++++++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java                |    5 
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java              |   51 ++++++++++++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java                    |   45 +++++++++++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java                 |    8 +
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java                            |   22 +++++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java         |   26 ------
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java |    4 
 10 files changed, 201 insertions(+), 30 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
index 98d4446..b01667b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
+++ b/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 = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�")
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
index 96fb795..1375348 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
+++ b/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);
 	}
 
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index 24f3cd2..b629ef5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/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+"%");
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
index a9c0752..8011b15 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
+++ b/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;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
new file mode 100644
index 0000000..d636152
--- /dev/null
+++ b/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);
+	}
+
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
new file mode 100644
index 0000000..92babc1
--- /dev/null
+++ b/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;
+
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
new file mode 100644
index 0000000..9c1ec8c
--- /dev/null
+++ b/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);
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
new file mode 100644
index 0000000..5ee260f
--- /dev/null
+++ b/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>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
new file mode 100644
index 0000000..cf866af
--- /dev/null
+++ b/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);
+	}
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java
new file mode 100644
index 0000000..735dc89
--- /dev/null
+++ b/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;
+
+}

--
Gitblit v1.9.3