真空热处理炉批量打印接口 三保 加工设备保养计划变更申请单批量打印接口 设备精度检查单批量打印接口开发

lyh

12 小时以前 5f0bc1e4ad0c51a8bf1382dc3f98e282c1393c3b

真空热处理炉批量打印接口 三保 加工设备保养计划变更申请单批量打印接口 设备精度检查单批量打印接口开发

 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);
    }

}

 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));
    }

}

 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));
    }

}

 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);
}

 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);
}

 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);

}

 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>

 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>

 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>

 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;

 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;
}

 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);

}

 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);

}

 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);
}

 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);

}

 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);
}

 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);
    }
}

 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<>();

 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);
    }
}

 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) {

 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) {