From 5f0bc1e4ad0c51a8bf1382dc3f98e282c1393c3b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 17:48:55 +0800
Subject: [PATCH] 真空热处理炉批量打印接口 三保 加工设备保养计划变更申请单批量打印接口 设备精度检查单批量打印接口开发

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java                  |   45 +++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceFurnaceMapper.xml                         |    7 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderResult.java                    |  327 +++++++++++++++++++++++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java |   15 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceFurnaceController.java                    |   12 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceChangeService.java                          |    9 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceChangeController.java                     |   12 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java                     |   10 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java                 |   42 +++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceFurnaceMapper.java                            |   10 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java    |   17 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java                   |    2 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java             |   41 +++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml                  |    7 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceChangeMapper.xml                          |   13 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceChangeMapper.java                             |    4 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java          |   60 +++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java         |    7 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java                  |   11 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceFurnaceService.java                         |   10 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java            |    8 
 21 files changed, 663 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
index 4911f1a..6ded61d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
@@ -16,12 +16,16 @@
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.util.TranslateDictTextUtils;
 import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
+import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationCheckCategoryEnum;
 import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
 import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
 import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderResult;
 import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗�
@@ -146,4 +150,41 @@
             return Result.error("鏁版嵁杞瘧澶辫触锛�");
         }
     }
+
+    /**
+     * 璁惧绮惧害妫�鏌ユ妧鏈壌瀹氳〃鎵归噺鎵撳嵃鎺ュ彛
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "鎶�鏈壌瀹氳〃璁惧绮惧害妫�鏌ユ壒閲忔墦鍗版帴鍙�", notes = "鎶�鏈壌瀹氳〃璁惧绮惧害妫�鏌ユ壒閲忔墦鍗版帴鍙�")
+    @GetMapping(value = "/accuracyPrint")
+    public Result<?> batchPrint(@RequestParam(name = "ids", required = true) String ids) {
+        List<EamTechnicalStatusEvaluationOrderResult> list = eamTechnicalStatusEvaluationOrderService.batchPrint(ids, TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name());
+        return Result.OK(list);
+    }
+
+    /**
+     * 瀹夊叏瑁呯疆鎶�鏈壌瀹氳〃鎵归噺鎵撳嵃鎺ュ彛
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "鎶�鏈壌瀹氳〃瀹夊叏瑁呯疆鎵归噺鎵撳嵃鎺ュ彛", notes = "鎶�鏈壌瀹氳〃瀹夊叏瑁呯疆鎵归噺鎵撳嵃鎺ュ彛")
+    @GetMapping(value = "/safePrint")
+    public Result<?> safePrint(@RequestParam(name = "ids", required = true) String ids) {
+        List<EamTechnicalStatusEvaluationOrderResult> list = eamTechnicalStatusEvaluationOrderService.batchPrint(ids, TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name());
+        return Result.OK(list);
+    }
+
+    /**
+     * 鍏朵粬妫�鏌ユ妧鏈壌瀹氳〃鎵归噺鎵撳嵃鎺ュ彛
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "鎶�鏈壌瀹氳〃鍏朵粬妫�鏌ユ壒閲忔墦鍗版帴鍙�", notes = "鎶�鏈壌瀹氳〃鍏朵粬妫�鏌ユ壒閲忔墦鍗版帴鍙�")
+    @GetMapping(value = "/otherPrint")
+    public Result<?> otherPrint(@RequestParam(name = "ids", required = true) String ids) {
+        List<EamTechnicalStatusEvaluationOrderResult> list = eamTechnicalStatusEvaluationOrderService.batchPrint(ids, TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name());
+        return Result.OK(list);
+    }
+
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceChangeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceChangeController.java
index 3b66158..dd93703 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceChangeController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceChangeController.java
@@ -211,4 +211,16 @@
         }
     }
 
+    /**
+     * 鎵归噺鎵撳嵃涓変繚鍙樻洿
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "涓変繚鍙樻洿-鎵归噺鎵撳嵃")
+    @ApiOperation(value = "涓変繚鍙樻洿-鎵归噺鎵撳嵃", notes = "涓変繚鍙樻洿-鎵归噺鎵撳嵃")
+    @GetMapping(value = "/batchExport")
+    public Result<?> batchExport(@RequestParam(name = "ids", required = true) String ids) {
+        return Result.OK(eamThirdMaintenanceChangeService.export(ids));
+    }
+
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceFurnaceController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceFurnaceController.java
index 5177a22..0b7b557 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceFurnaceController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceFurnaceController.java
@@ -252,4 +252,16 @@
         return Result.ok("鎿嶄綔鎴愬姛锛�");
     }
 
+    /**
+     * 鎵归噺鎵撳嵃鐪熺┖鐑鐞嗕笁淇�
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "鐪熺┖鐑鐞嗙倝涓変繚-鎵归噺鎵撳嵃")
+    @ApiOperation(value = "鐪熺┖鐑鐞嗙倝涓変繚-鎵归噺鎵撳嵃", notes = "鐪熺┖鐑鐞嗙倝涓変繚-鎵归噺鎵撳嵃")
+    @GetMapping(value = "/batchExport")
+    public Result<?> batchExport(@RequestParam(name = "ids", required = true) String ids) {
+        return Result.ok(eamThirdMaintenanceFurnaceService.export(ids));
+    }
+
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java
index a23c089..a8933f9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java
@@ -7,6 +7,9 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderResult;
+
+import java.util.List;
 
 /**
  * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗�
@@ -23,4 +26,11 @@
      * @return
      */
     IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, @Param(Constants.WRAPPER) QueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper);
+
+    /**
+     * 鍒楄〃鏌ヨ
+     * @param queryWrapper
+     * @return
+     */
+    List<EamTechnicalStatusEvaluationOrderResult> queryList(@Param(Constants.WRAPPER) QueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper);
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceChangeMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceChangeMapper.java
index 718ee26..634fbb3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceChangeMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceChangeMapper.java
@@ -8,6 +8,8 @@
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange;
 
+import java.util.List;
+
 /**
  * @Description: 涓変繚鍙樻洿
  * @Author: jeecg-boot
@@ -17,4 +19,6 @@
 public interface EamThirdMaintenanceChangeMapper extends BaseMapper<EamThirdMaintenanceChange> {
 
     IPage<EamThirdMaintenanceChange> queryPageList(Page<EamThirdMaintenanceChange> page, @Param(Constants.WRAPPER) QueryWrapper<EamThirdMaintenanceChange> queryWrapper);
+
+    List<EamThirdMaintenanceChange> queryList(@Param(Constants.WRAPPER) QueryWrapper<EamThirdMaintenanceChange> queryWrapper);
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceFurnaceMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceFurnaceMapper.java
index d575f33..a9e56ff 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceFurnaceMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceFurnaceMapper.java
@@ -8,6 +8,8 @@
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace;
 
+import java.util.List;
+
 /**
  * @Description: 鐪熺┖鐑鐞嗙倝涓変繚
  * @Author: jeecg-boot
@@ -23,4 +25,12 @@
      * @return
      */
     IPage<EamThirdMaintenanceFurnace> queryPageList(Page<EamThirdMaintenanceFurnace> page, @Param(Constants.WRAPPER) QueryWrapper<EamThirdMaintenanceFurnace> queryWrapper);
+
+    /**
+     * 鏌ヨ鍒楄〃
+     * @param queryWrapper
+     * @return
+     */
+    List<EamThirdMaintenanceFurnace> queryList(@Param(Constants.WRAPPER) QueryWrapper<EamThirdMaintenanceFurnace> queryWrapper);
+
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml
index 0bc7f67..a7f8c04 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml
@@ -8,4 +8,11 @@
         on ems.equipment_id = e.id
         ${ew.customSqlSegment}
     </select>
+    <select id="queryList" resultType="org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderResult">
+        select ems.*, e.equipment_code, e.equipment_name, e.equipment_model ,e.factory_org_code
+        from eam_technical_status_evaluation_order ems
+                 inner join eam_equipment e
+                            on ems.equipment_id = e.id
+            ${ew.customSqlSegment}
+    </select>
 </mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceChangeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceChangeMapper.xml
index 17e6439..2d0d537 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceChangeMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceChangeMapper.xml
@@ -15,4 +15,17 @@
                 INNER JOIN eam_equipment e ON tmo.equipment_id = e.id
             ${ew.customSqlSegment}
     </select>
+    <select id="queryList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceChange">
+        SELECT
+            tmc.*,
+            e.equipment_code,
+            e.equipment_name,
+            e.equipment_model,
+            e.factory_org_code as 'factoryCode'
+        FROM
+            eam_third_maintenance_change tmc
+                INNER JOIN eam_third_maintenance_order tmo ON tmc.order_id = tmo.id
+                INNER JOIN eam_equipment e ON tmo.equipment_id = e.id
+            ${ew.customSqlSegment}
+    </select>
 </mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceFurnaceMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceFurnaceMapper.xml
index a250e20..98aad78 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceFurnaceMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceFurnaceMapper.xml
@@ -9,4 +9,11 @@
         on tmf.equipment_id = e.id
         ${ew.customSqlSegment}
     </select>
+    <select id="queryList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace">
+        select tmf.*, e.equipment_code, e.equipment_name, e.equipment_model,e.factory_org_code
+        from eam_third_maintenance_furnace tmf
+                 inner join eam_equipment e
+                            on tmf.equipment_id = e.id
+            ${ew.customSqlSegment}
+    </select>
 </mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java
index 69afb5b..52bb426 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java
@@ -1,12 +1,10 @@
 package org.jeecg.modules.eam.request;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail;
 import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderResult.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderResult.java
new file mode 100644
index 0000000..aee6565
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderResult.java
@@ -0,0 +1,327 @@
+package org.jeecg.modules.eam.request;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.aspect.annotation.DictList;
+import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞璞�", description="鎶�鏈姸鎬侀壌瀹氬伐鍗�")
+public class EamTechnicalStatusEvaluationOrderResult {
+
+    /**涓婚敭*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "涓婚敭")
+    private String id;
+    /**鍒涘缓浜�*/
+    @ApiModelProperty(value = "鍒涘缓浜�")
+    private String createBy;
+    /**鍒涘缓鏃堕棿*/
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    private Date createTime;
+    /**鏇存柊浜�*/
+    @ApiModelProperty(value = "鏇存柊浜�")
+    private String updateBy;
+    /**鏇存柊鏃堕棿*/
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    private Date updateTime;
+    /**鍒犻櫎鏍囪*/
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    private Integer delFlag;
+    /**宸ュ崟鍙�*/
+    @ApiModelProperty(value = "宸ュ崟鍙�")
+    private String orderNum;
+    /**璁惧ID*/
+    @ApiModelProperty(value = "璁惧ID")
+    private String equipmentId;
+    /**瑙勮寖ID*/
+    @ApiModelProperty(value = "瑙勮寖ID")
+    private String standardId;
+    /**璁″垝閴村畾鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "璁″垝閴村畾鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�")
+    private Date evaluationDate;
+    /**閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�")
+    private Date freezeOrderDate;
+    /**宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤")
+    private Date orderExpirationDate;
+    /**瀹為檯寮�濮嬫椂闂�*/
+    @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actualStartTime;
+    /**瀹為檯缁撴潫鏃堕棿*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
+    private Date actualEndTime;
+    /**棰嗗彇浜�*/
+    @ApiModelProperty(value = "棰嗗彇浜�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String evaluator;
+    /**閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡*/
+    @ApiModelProperty(value = "閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡")
+    @Dict(dicCode = "technical_status_evaluation_order_status")
+    private String evaluationStatus;
+    /**鍒涘缓鏂瑰紡*/
+    @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+    @Dict(dicCode = "order_creation_method")
+    private String creationMethod;
+    /**瀹夊叏瑁呯疆妫�鏌ユ槸鍚﹀畬鎴�*/
+    @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ユ槸鍚﹀畬鎴�")
+    private String safetyCheckCompleted;
+    /**璁惧绮惧害妫�鏌ユ槸鍚﹀畬鎴�*/
+    @ApiModelProperty(value = "璁惧绮惧害妫�鏌ユ槸鍚﹀畬鎴�")
+    private String precisionCheckCompleted;
+    /**鍏朵粬妫�鏌ユ槸鍚﹀畬鎴�*/
+    @ApiModelProperty(value = "鍏朵粬妫�鏌ユ槸鍚﹀畬鎴�")
+    private String otherCheckCompleted;
+    /**瀹夊叏瑁呯疆妫�鏌ョ‘璁や汉*/
+    @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁や汉")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String safetyCheckConfirm;
+    /**瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ椂闂�*/
+    @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ椂闂�")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date safetyCheckConfirmTime;
+    /**瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�*/
+    @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�")
+    @Dict(dicCode = "approved_rejected")
+    private String safetyCheckConfirmResult;
+    /**瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�*/
+    @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�")
+    private String safetyCheckConfirmComment;
+    /**璁惧绮惧害妫�鏌ョ‘璁や汉*/
+    @ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁や汉")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String precisionCheckConfirm;
+    /**璁惧绮惧害妫�鏌ョ‘璁ゆ椂闂�*/
+    @ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ゆ椂闂�")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date precisionCheckConfirmTime;
+    /**璁惧绮惧害妫�鏌ョ‘璁ょ粨鏋�*/
+    @ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ょ粨鏋�")
+    @Dict(dicCode = "approved_rejected")
+    private String precisionCheckConfirmResult;
+    /**璁惧绮惧害妫�鏌ョ‘璁ゆ剰瑙�*/
+    @ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ゆ剰瑙�")
+    private String precisionCheckConfirmComment;
+    /**鍏朵粬妫�鏌ョ‘璁や汉*/
+    @ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁や汉")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String otherCheckConfirm;
+    /**鍏朵粬妫�鏌ョ‘璁ゆ椂闂�*/
+    @ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ゆ椂闂�")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date otherCheckConfirmTime;
+    /**鍏朵粬妫�鏌ョ‘璁ょ粨鏋�*/
+    @ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ょ粨鏋�")
+    @Dict(dicCode = "approved_rejected")
+    private String otherCheckConfirmResult;
+    /**鍏朵粬妫�鏌ョ‘璁ゆ剰瑙�*/
+    @ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ゆ剰瑙�")
+    private String otherCheckConfirmComment;
+    /**瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁*/
+    @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁")
+    @Dict(dicCode = "yn")
+    private String safetyEquipmentCheckResult;
+    /**绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
+    @ApiModelProperty(value = "绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
+    @Dict(dicCode = "yes_no_none")
+    private String precisionCheckResult;
+    /**鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁*/
+    @ApiModelProperty(value = "鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁")
+    @Dict(dicCode = "yn")
+    private String functionalCheckResult;
+    /**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
+    @ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
+    @Dict(dicCode = "yes_no_none")
+    private String otherCheckResult;
+    /**缁翠慨浜虹瀛�*/
+    @ApiModelProperty(value = "缁翠慨浜虹瀛�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String repairerSignature;
+    /**缁翠慨浜虹瀛楁椂闂�*/
+    @ApiModelProperty(value = "缁翠慨浜虹瀛楁椂闂�")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date repairerSignatureTime;
+    /**缁翠慨瀹や富浠荤瀛�*/
+    @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String repairManagerSignature;
+    /**缁翠慨瀹や富浠荤瀛楁椂闂�*/
+    @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楁椂闂�")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date repairManagerSignatureTime;
+    /**缁翠慨瀹や富浠荤瀛楃粨鏋�*/
+    @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楃粨鏋�")
+    @Dict(dicCode = "approved_rejected")
+    private String repairManagerSignatureResult;
+    /**缁翠慨瀹や富浠绘剰瑙�*/
+    @ApiModelProperty(value = "缁翠慨瀹や富浠绘剰瑙�")
+    private String repairManagerComment;
+    /**璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸*/
+    @ApiModelProperty(value = "璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸")
+    private String sampleCheckResult;
+    /**宸ヨ壓鍛樼瀛�*/
+    @ApiModelProperty(value = "宸ヨ壓鍛樼瀛�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String processTechnicianSignature;
+    /**宸ヨ壓鍛樼瀛楁椂闂�*/
+    @ApiModelProperty(value = "宸ヨ壓鍛樼瀛楁椂闂�")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date processTechnicianSignatureTime;
+    /**宸ヨ壓鍛樻剰瑙�*/
+    @ApiModelProperty(value = "宸ヨ壓鍛樻剰瑙�")
+    private String processTechnicianComment;
+    /**浣跨敤鍗曚綅鎶�鏈富绠＄瀛�*/
+    @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String departTechnicalLeaderSignature;
+    /**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�*/
+    @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date departTechnicalLeaderSignatureTime;
+    /**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楃粨鏋�*/
+    @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楃粨鏋�")
+    @Dict(dicCode = "approved_rejected")
+    private String departTechnicalLeaderSignatureResult;
+    /**浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�*/
+    @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�")
+    private String departTechnicalLeaderComment;
+    /**閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�*/
+    @ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�")
+    @Dict(dicCode = "equipment_technology_status")
+    private String evaluationResult;
+    /**闄�/绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�*/
+    @ApiModelProperty(value = "闄�/绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�")
+    @Dict(dicCode = "technical_status_evaluation_result_reason")
+    private String evaluationReason;
+    /**璁惧妫�鏌ヤ汉绛惧瓧*/
+    @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+    private String inspectorSignature;
+    /**璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿*/
+    @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inspectorSignatureTime;
+    /**璁惧妫�鏌ヤ汉鎰忚*/
+    @ApiModelProperty(value = "璁惧妫�鏌ヤ汉鎰忚")
+    private String inspectorComment;
+    /**闄勫綍A HF缂栫爜*/
+    @ApiModelProperty(value = "闄勫綍A HF缂栫爜")
+    private String hfCodeA;
+    /**闄勫綍B HF缂栫爜*/
+    @ApiModelProperty(value = "闄勫綍B HF缂栫爜")
+    private String hfCodeB;
+    /**闄勫綍C HF缂栫爜*/
+    @ApiModelProperty(value = "闄勫綍C HF缂栫爜")
+    private String hfCodeC;
+    /**闄勫綍D HF缂栫爜*/
+    @ApiModelProperty(value = "闄勫綍D HF缂栫爜")
+    private String hfCodeD;
+    /**澶囨敞*/
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+
+    //鍒楄〃灞曠ず
+    @TableField(exist = false)
+    private String equipmentCode;
+    @TableField(exist = false)
+    private String equipmentName;
+    @TableField(exist = false)
+    private String equipmentModel;
+
+    /**
+     * 鍏徃
+     */
+    @ApiModelProperty(value = "鍏徃")
+    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+    @TableField(exist = false)
+    private transient String gsfactoryOrgCode;
+
+    /**
+     * 涓績
+     */
+    @ApiModelProperty(value = "涓績")
+    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+    @TableField(exist = false)
+    private transient String zxfactoryOrgCode;
+
+    /**
+     * 宸ュ尯
+     */
+    @ApiModelProperty(value = "宸ュ尯")
+    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+    @TableField(exist = false)
+    private transient String gqfactoryOrgCode;
+
+    /**
+     * 宸ユ
+     */
+    @ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
+    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+    @TableField(exist = false)
+    private String factoryOrgCode;
+
+    public void setFactoryOrgCode(String factoryOrgCode){
+        this.factoryOrgCode = factoryOrgCode;
+        if(StrUtil.isNotEmpty(factoryOrgCode)){
+            if(factoryOrgCode.length()==12){
+                this.gqfactoryOrgCode = factoryOrgCode.substring(0,9);
+                this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+                this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+            }
+
+            if(factoryOrgCode.length()==9){
+                this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+                this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+            }
+
+            if(factoryOrgCode.length()==6){
+                this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+            }
+        }
+    }
+
+    /**绮惧害妫�鏌ヤ繚鍏婚」鏄庣粏*/
+    @DictList
+    private List<EamTechnicalStatusEvaluationOrderDetail> tablePrecisionDetailList;
+    /**瀹夊叏瑁呯疆妫�鏌ヤ繚鍏婚」鏄庣粏*/
+    @DictList
+    private List<EamTechnicalStatusEvaluationOrderDetail> tableSafetyDetailList;
+    /**鍏朵粬妫�鏌ヤ繚鍏婚」鏄庣粏*/
+    @DictList
+    private List<EamTechnicalStatusEvaluationOrderDetail> tableOtherDetailList;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java
index 21cc765..13199a0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java
@@ -2,6 +2,7 @@
 
 import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
 
 /**
  * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�
@@ -11,4 +12,11 @@
  */
 public interface IEamTechnicalStatusEvaluationOrderDetailService extends IService<EamTechnicalStatusEvaluationOrderDetail> {
 
+    /**
+     * 鑾峰彇瑙勮寖鏄庣粏鏁版嵁
+     * @param id
+     * @param checkCategory
+     */
+    List<EamTechnicalStatusEvaluationOrderDetail> queryList(String id, String checkCategory);
+
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java
index f0439e1..0fbff62 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java
@@ -3,9 +3,11 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
 import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
 import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderResult;
 
 import java.util.List;
 
@@ -65,4 +67,13 @@
      * @return
      */
     List<EamTechnicalStatusEvaluationOrder> selectUncompletedEvaluationOrderList();
+
+    /**
+     * 鎶�鏈壌瀹氳〃鎵归噺鎵撳嵃鎺ュ彛
+     * @param ids
+     * @param type
+     * @return
+     */
+    List<EamTechnicalStatusEvaluationOrderResult> batchPrint(String ids, String type);
+
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java
index 1881d85..150311d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java
@@ -31,4 +31,11 @@
      * @param id
      */
     List<EamTechnicalStatusEvaluationStandardDetail> queryList(String id);
+
+    /**
+     * 鑾峰彇瑙勮寖鏄庣粏鏁版嵁
+     * @param id
+     * @param checkCategory
+     */
+    List<EamTechnicalStatusEvaluationStandardDetail> queryList(String id, String checkCategory);
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceChangeService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceChangeService.java
index a606fce..770fc3b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceChangeService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceChangeService.java
@@ -8,6 +8,8 @@
 import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery;
 import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest;
 
+import java.util.List;
+
 /**
  * @Description: 涓変繚鍙樻洿
  * @Author: jeecg-boot
@@ -52,4 +54,11 @@
      */
     EamThirdMaintenanceChange approval(EamThirdMaintenanceChangeRequest request);
 
+    /**
+     * 涓変繚鍔犲伐璁惧淇濆吇璁″垝鍙樻洿鐢宠鍗曟壒閲忔墦鍗版帴鍙�
+     * @param ids
+     * @return
+     */
+    List<EamThirdMaintenanceChange> export(String ids);
+
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceFurnaceService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceFurnaceService.java
index da457dc..137fc5d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceFurnaceService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceFurnaceService.java
@@ -4,9 +4,12 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExportYj;
 import org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace;
 import org.jeecg.modules.eam.request.EamThirdMaintenanceFurnaceQuery;
 import org.jeecg.modules.eam.request.EamThirdMaintenanceFurnaceRequest;
+
+import java.util.List;
 
 /**
  * @Description: 鐪熺┖鐑鐞嗙倝涓変繚
@@ -51,4 +54,11 @@
      * @return
      */
     EamThirdMaintenanceFurnace approval(EamThirdMaintenanceFurnaceRequest request);
+
+    /**
+     * 鎵归噺鎵撳嵃鐪熺┖鐑鐞嗕笁淇�
+     * @param ids
+     * @return
+     */
+    List<EamThirdMaintenanceFurnace> export(String ids);
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java
index 01e52fc..b13c349 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.eam.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail;
 import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderDetailMapper;
 import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService;
@@ -7,6 +8,7 @@
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
 /**
  * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�
  * @Author: jeecg-boot
@@ -16,4 +18,19 @@
 @Service
 public class EamTechnicalStatusEvaluationOrderDetailServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderDetailMapper, EamTechnicalStatusEvaluationOrderDetail> implements IEamTechnicalStatusEvaluationOrderDetailService {
 
+
+    /**
+     * 鑾峰彇瑙勮寖鏄庣粏鏁版嵁
+     * @param standardId
+     * @param checkCategory
+     */
+    @Override
+    public List<EamTechnicalStatusEvaluationOrderDetail> queryList(String standardId, String checkCategory){
+        LambdaQueryWrapper<EamTechnicalStatusEvaluationOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(EamTechnicalStatusEvaluationOrderDetail::getOrderId, standardId);
+        queryWrapper.eq(EamTechnicalStatusEvaluationOrderDetail::getCheckCategory, checkCategory);
+        queryWrapper.orderByAsc(EamTechnicalStatusEvaluationOrderDetail::getCheckCategory);
+        queryWrapper.orderByAsc(EamTechnicalStatusEvaluationOrderDetail::getItemCode);
+        return this.getBaseMapper().selectList(queryWrapper);
+    }
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
index 6a9a4f7..5fd573e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -24,6 +24,7 @@
 import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper;
 import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
 import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderResult;
 import org.jeecg.modules.eam.service.*;
 import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
 import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
@@ -86,6 +87,8 @@
     private ISysUserService sysUserService;
     @Autowired
     private IEamEquipmentExtendService equipmentExtendService;
+    @Autowired
+    private IEamTechnicalStatusEvaluationOrderDetailService eamTechnicalStatusEvaluationOrderDetailService;
 
     @Override
     public IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, EamTechnicalStatusEvaluationOrderQuery query) {
@@ -623,6 +626,63 @@
         return this.getBaseMapper().selectList(queryWrapper);
     }
 
+    /**
+     * 鎶�鏈壌瀹氳〃鎵归噺鎵撳嵃鎺ュ彛
+     * @param ids
+     * @param type
+     * @return
+     */
+    @Override
+    public List<EamTechnicalStatusEvaluationOrderResult> batchPrint(String ids, String type){
+        QueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ems.del_flag",CommonConstant.DEL_FLAG_0.toString());
+        queryWrapper.eq("ems.evaluation_status",TechnicalStatusEvaluationOrderStatusEnum.COMPLETED.name());
+        //鐢ㄦ埛鏁版嵁鏉冮檺
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (sysUser == null) {
+            return new ArrayList<>();
+        }
+        if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+            //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+            List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+            queryWrapper.in("e.equipment_code", equipArr);
+        } else {
+            //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+            List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
+                    list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
+            if(!CollectionUtils.isEmpty(baseFactoryUserList)){
+                Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+                Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+                queryWrapper.in("e.factory_org_code", factoryCode);
+            } else {
+                return new ArrayList<>();
+            }
+        }
+        //鏌ヨ鏉′欢杩囨护
+        if (StrUtil.isNotEmpty(ids)) {
+            List<String> idList = Arrays.asList(ids.split(","));
+            queryWrapper.in("ems.id", idList);
+        } else {
+            queryWrapper.orderByDesc("ems.create_time");
+        }
+        List<EamTechnicalStatusEvaluationOrderResult> list = this.baseMapper.queryList(queryWrapper);
+        list.forEach(item->{
+            if (TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(type)){
+                List<EamTechnicalStatusEvaluationOrderDetail> evaluationStandardDetails=
+                        eamTechnicalStatusEvaluationOrderDetailService.queryList(item.getId(),TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name());
+                item.setTableSafetyDetailList(evaluationStandardDetails);
+            }else if (TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(type)){
+                List<EamTechnicalStatusEvaluationOrderDetail> evaluationOrderDetails=
+                        eamTechnicalStatusEvaluationOrderDetailService.queryList(item.getId(),TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name());
+                item.setTablePrecisionDetailList(evaluationOrderDetails);
+            }else  if (TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(type)){
+                List<EamTechnicalStatusEvaluationOrderDetail> evaluationOrderDetails=
+                        eamTechnicalStatusEvaluationOrderDetailService.queryList(item.getId(),TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name());
+                item.setTableOtherDetailList(evaluationOrderDetails);
+            }
+        });
+        return list;
+    }
 
     private EamTechnicalStatusEvaluationOrder checkDuplicate(String equipmentId) {
         LambdaQueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = new LambdaQueryWrapper<>();
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java
index 453631f..82a3d66 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java
@@ -46,4 +46,19 @@
         queryWrapper.orderByAsc(EamTechnicalStatusEvaluationStandardDetail::getItemCode);
         return this.getBaseMapper().selectList(queryWrapper);
     }
+
+    /**
+     * 鑾峰彇瑙勮寖鏄庣粏鏁版嵁
+     * @param standardId
+     * @param checkCategory
+     */
+    @Override
+    public List<EamTechnicalStatusEvaluationStandardDetail> queryList(String standardId, String checkCategory){
+        LambdaQueryWrapper<EamTechnicalStatusEvaluationStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(EamTechnicalStatusEvaluationStandardDetail::getStandardId, standardId);
+        queryWrapper.eq(EamTechnicalStatusEvaluationStandardDetail::getCheckCategory, checkCategory);
+        queryWrapper.orderByAsc(EamTechnicalStatusEvaluationStandardDetail::getCheckCategory);
+        queryWrapper.orderByAsc(EamTechnicalStatusEvaluationStandardDetail::getItemCode);
+        return this.getBaseMapper().selectList(queryWrapper);
+    }
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
index 4bdc0c0..9407613 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
@@ -24,10 +24,7 @@
 import org.jeecg.common.util.TranslateDictTextUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.eam.constant.*;
-import org.jeecg.modules.eam.entity.EamBaseHFCode;
-import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange;
-import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
+import org.jeecg.modules.eam.entity.*;
 import org.jeecg.modules.eam.mapper.EamThirdMaintenanceChangeMapper;
 import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery;
 import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest;
@@ -330,6 +327,46 @@
     }
 
     /**
+     * 涓変繚鍔犲伐璁惧淇濆吇璁″垝鍙樻洿鐢宠鍗曟壒閲忔墦鍗版帴鍙�
+     * @param ids
+     * @return
+     */
+    @Override
+    public List<EamThirdMaintenanceChange> export(String ids){
+        QueryWrapper<EamThirdMaintenanceChange> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("tmc.del_flag",CommonConstant.DEL_FLAG_0.toString());
+        //鐢ㄦ埛鏁版嵁鏉冮檺
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (sysUser == null) {
+            return new ArrayList<>();
+        }
+        if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+            //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+            List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+            queryWrapper.in("e.equipment_code", equipArr);
+        } else {
+            //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+            List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
+                    list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
+            if(!CollectionUtils.isEmpty(baseFactoryUserList)){
+                Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+                Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+                queryWrapper.in("e.factory_org_code", factoryCode);
+            } else {
+                return new ArrayList<>();
+            }
+        }
+        //鏌ヨ鏉′欢杩囨护
+        if (StrUtil.isNotEmpty(ids)) {
+            List<String> idList = Arrays.asList(ids.split(","));
+            queryWrapper.in("tmc.id", idList);
+        } else {
+            queryWrapper.orderByDesc("tmc.create_time");
+        }
+        return eamThirdMaintenanceChangeMapper.queryList(queryWrapper);
+    }
+
+    /**
      * 璁剧疆娴佺▼鍙橀噺
      */
     private void setupProcessVariables(EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceChange entity, LoginUser user, EamEquipment equipment) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java
index 6db6954..7204e45 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java
@@ -21,6 +21,7 @@
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
 import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExport;
 import org.jeecg.modules.eam.entity.EamBaseHFCode;
 import org.jeecg.modules.eam.entity.EamEquipment;
 import org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace;
@@ -275,6 +276,47 @@
     }
 
     /**
+     * 鎵归噺鎵撳嵃鐪熺┖鐑鐞嗕笁淇�
+     * @param ids
+     * @return
+     */
+    @Override
+    public List<EamThirdMaintenanceFurnace> export(String ids){
+        QueryWrapper<EamThirdMaintenanceFurnace> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("tmf路.del_flag",CommonConstant.DEL_FLAG_0.toString());
+        queryWrapper.eq("tmf.maintenance_status",ThirdMaintenanceFurnaceStatusEnum.COMPLETE.name());
+        //鐢ㄦ埛鏁版嵁鏉冮檺
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (sysUser == null) {
+            return new ArrayList<>();
+        }
+        if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+            //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+            List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+            queryWrapper.in("e.equipment_code", equipArr);
+        } else {
+            //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+            List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
+                    list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
+            if(!CollectionUtils.isEmpty(baseFactoryUserList)){
+                Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+                Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+                queryWrapper.in("e.factory_org_code", factoryCode);
+            } else {
+                return new ArrayList<>();
+            }
+        }
+        //鏌ヨ鏉′欢杩囨护
+        if (StrUtil.isNotEmpty(ids)) {
+            List<String> idList = Arrays.asList(ids.split(","));
+            queryWrapper.in("tmf.id", idList);
+        } else {
+            queryWrapper.orderByDesc("tmf.create_time");
+        }
+        return this.baseMapper.queryList(queryWrapper);
+    }
+
+    /**
      * 璁剧疆娴佺▼鍙橀噺
      */
     private void setupProcessVariables(EamThirdMaintenanceFurnaceRequest request, EamThirdMaintenanceFurnace entity, LoginUser user, EamEquipment equipment) {

--
Gitblit v1.9.3