update

Lius

3 天以前 2196ba833d88c32dd0e26b526928d313cfea0d80

update

 lxzn-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -143,6 +143,8 @@
        filterChainDefinitionMap.put("/eam/eamInspectionOrder/exportInsOrderDetailUserList", "anon");
        filterChainDefinitionMap.put("/eam/eamInspectionOrder/exportWeekInsDetailList", "anon");
        filterChainDefinitionMap.put("/eam/eamInspectionOrder/exportWeekInsOrderDetailUserList", "anon");
        //设备三保导出接口排除
        filterChainDefinitionMap.put("/eam/thirdMaintenanceOrder/exportThirdMaintenanceOrderBaseInfo", "anon");
        //设备完好率报表排除
        filterChainDefinitionMap.put("/eam/repairOrder/equipmentAvailability", "anon");
        //生产故障间隔时间报表排除

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceBaseResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
package org.jeecg.modules.eam.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-31
 * @Description: ä¸‰ä¿å·¥å•åŸºç¡€ä¿¡æ¯å¯¼å‡ºè¯¦ç»†
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="返回对象", description="三保工单基础信息导出详细")
public class EamThirdMaintenanceBaseResponse implements Serializable {

    private static final long serialVersionUID = -615083252449625415L;

    @ApiModelProperty(value = "移交单hf编码")
    private String hfCodeA;

    @ApiModelProperty(value = "验收单hf编码")
    private String hfCodeB;

    @ApiModelProperty(value = "设备名称")
    private String equipmentName;

    @ApiModelProperty(value = "设备型号")
    private String equipmentModel;

    @ApiModelProperty(value = "设备编号")
    private String equipmentCode;

    @ApiModelProperty(value = "单位")
    private String factoryName;

    @ApiModelProperty(value = "保养日期")
    private String maintenanceDate;

    @ApiModelProperty(value = "设备功能是否齐备;是否")
    private String fullyFunctional;

    @ApiModelProperty(value = "设备功能是否齐备;是否")
    private String runningNormally;

    @ApiModelProperty(value = "问题描述")
    private String problemDescription;

    @ApiModelProperty(value = "操作人")
    private String operatorSignature;

    @ApiModelProperty(value = "协助操作人")
    private String assistantOperator;

    @ApiModelProperty(value = "维修人签字")
    private String repairmanSignature;

    @ApiModelProperty(value = "协助维修人")
    private String assistantRepairman;

    @ApiModelProperty(value = "维修室主任签字")
    private String repairManagerSignature;

    @ApiModelProperty(value = "设备检查人签字")
    private String inspectorSignature;

    //验收单字段
    @ApiModelProperty(value = "设备类别")
    private String equipmentCategory;

    @ApiModelProperty(value = "检查人")
    private String createBy;

    @ApiModelProperty(value = "检查日期")
    private String createTime;


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java

@@ -268,4 +268,14 @@
        }
        return Result.ok("操作成功！");
    }

    /**
     * å¯¼å‡ºèŽ·å–工单基本信息
     *
     * @return
     */
    @GetMapping("/exportThirdMaintenanceOrderBaseInfo")
    public JSONObject exportThirdMaintenanceOrderBaseInfo(@RequestParam(name = "id", required = true) String id) {
        return eamThirdMaintenanceOrderService.exportThirdMaintenanceOrderBaseInfo(id);
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceOrderDetailMapper.java

@@ -1,7 +1,12 @@
package org.jeecg.modules.eam.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.vo.EamThirdMaintenanceBaseVo;

import java.util.Map;

/**
 * @Description: è®¾å¤‡ä¸‰çº§ä¿å…»æ˜Žç»†
@@ -11,4 +16,5 @@
 */
public interface EamThirdMaintenanceOrderDetailMapper extends BaseMapper<EamThirdMaintenanceOrderDetail> {

    EamThirdMaintenanceBaseVo selectCreatByAndTimeByOrderId(@Param("id") String id);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceOrderMapper.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
import org.jeecg.modules.eam.request.EamThirdMaintenanceBaseResponse;

/**
 * @Description: è®¾å¤‡ä¸‰çº§ä¿å…»
@@ -24,4 +25,11 @@
     * @return
     */
    IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, @Param(Constants.WRAPPER) QueryWrapper<EamThirdMaintenanceOrder> queryWrapper);

    /**
     *
     * @param id
     * @return
     */
    EamThirdMaintenanceBaseResponse findThirdMaintenanceBaseInfo(@Param("id") String id);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderDetailMapper.xml

@@ -2,4 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderDetailMapper">

    <select id="selectCreatByAndTimeByOrderId" resultType="org.jeecg.modules.eam.vo.EamThirdMaintenanceBaseVo">
        SELECT DISTINCT
            CASE

                WHEN
                    update_by IS NOT NULL
                        AND update_time IS NOT NULL THEN
                    update_by ELSE create_by
                END AS operate_by,
            CASE

                WHEN update_by IS NOT NULL
                    AND update_time IS NOT NULL THEN
                    FORMAT ( update_time, 'yyyyå¹´MM月dd日' ) ELSE FORMAT ( create_time, 'yyyyå¹´MM月dd日' )
                END AS operate_time
        FROM
            eam_third_maintenance_order_detail
        WHERE
            order_id = #{id}
    </select>

</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml

@@ -9,4 +9,30 @@
        on wmo.equipment_id = e.id
        ${ew.customSqlSegment}
    </select>

    <select id="findThirdMaintenanceBaseInfo" resultType="org.jeecg.modules.eam.request.EamThirdMaintenanceBaseResponse">
        SELECT
            t1.hf_code_a,
            t1.hf_code_b,
            t2.equipment_code,
            t2.equipment_name,
            t2.equipment_model,
            t3.factory_name,
            CONVERT ( VARCHAR ( 4 ), YEAR ( TRY_CONVERT ( DATE, t1.maintenance_date ) ) ) + 'å¹´' + CONVERT ( VARCHAR ( 2 ), MONTH ( TRY_CONVERT ( DATE, t1.maintenance_date ) ) ) + '月' + CONVERT ( VARCHAR ( 2 ), DAY ( TRY_CONVERT ( DATE, t1.maintenance_date ) ) ) + '日'  AS maintenance_date,
            t1.fully_functional,
            t1.running_normally,
            t1.problem_description,
            t1.operator_signature,
            t1.assistant_operator,
            t1.repairman_signature,
            t1.assistant_repairman,
            t1.repair_manager_signature,
            t1.inspector_signature,
            t2.equipment_category
        FROM
            eam_third_maintenance_order t1
                LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
                LEFT JOIN eam_base_factory t3 ON t3.org_code = SUBSTRING ( t2.factory_org_code , 1, 6 )
        WHERE t1.id = #{id}
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderDetailService.java

@@ -2,6 +2,9 @@

import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.vo.EamThirdMaintenanceBaseVo;

import java.util.Map;

/**
 * @Description: è®¾å¤‡ä¸‰çº§ä¿å…»æ˜Žç»†
@@ -11,4 +14,5 @@
 */
public interface IEamThirdMaintenanceOrderDetailService extends IService<EamThirdMaintenanceOrderDetail> {

    EamThirdMaintenanceBaseVo selectCreatByAndTimeByOrderId(String id);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.api.vo.Result;
@@ -81,4 +82,10 @@
     */
    List<EamThirdMaintenanceOrder> selectUnCompletedThirdMaintenanceOrderList();

    /**
     * èŽ·å–工单基本信息
     * @param id å·¥å•id
     * @return
     */
    JSONObject exportThirdMaintenanceOrderBaseInfo(String id);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java

@@ -439,8 +439,6 @@
        if (eamWeekInsDetailUserResponseList == null || eamWeekInsDetailUserResponseList.isEmpty()) {
            return result;
        }
        // ä½¿ç”¨AtomicInteger作为计数器，从1开始
        AtomicInteger counter = new AtomicInteger(1);
        Map<Integer, EamWeekInsDetailUserResponse> groupMap = eamWeekInsDetailUserResponseList
                .stream()
                .collect(Collectors.toMap(

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderDetailServiceImpl.java

@@ -3,9 +3,12 @@
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderDetailMapper;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderDetailService;
import org.jeecg.modules.eam.vo.EamThirdMaintenanceBaseVo;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.Map;

/**
 * @Description: è®¾å¤‡ä¸‰çº§ä¿å…»æ˜Žç»†
@@ -16,4 +19,8 @@
@Service
public class EamThirdMaintenanceOrderDetailServiceImpl extends ServiceImpl<EamThirdMaintenanceOrderDetailMapper, EamThirdMaintenanceOrderDetail> implements IEamThirdMaintenanceOrderDetailService {

    @Override
    public EamThirdMaintenanceBaseVo selectCreatByAndTimeByOrderId(String id) {
        return this.baseMapper.selectCreatByAndTimeByOrderId(id);
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java

@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -25,9 +26,11 @@
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper;
import org.jeecg.modules.eam.request.EamThirdMaintenanceBaseResponse;
import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.EamThirdMaintenanceBaseVo;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
@@ -38,6 +41,7 @@
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.system.service.ISysDictService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.BeanUtils;
@@ -91,6 +95,8 @@
    private IEamThirdMaintenanceOrderDetailService eamThirdMaintenanceOrderDetailService;
    @Resource
    private IEamThirdMaintenanceSpareService eamThirdMaintenanceSpareService;
    @Resource
    private ISysDictService sysDictService;

    @Override
    public IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, EamThirdMaintenanceQuery query) {
@@ -407,6 +413,35 @@
    }

    /**
     * èŽ·å–工单基本信息
     *
     * @param id å·¥å•id
     * @return
     */
    @Override
    public JSONObject exportThirdMaintenanceOrderBaseInfo(String id) {
        // åˆ›å»ºç»“果对象
        JSONObject result = new JSONObject();
        EamThirdMaintenanceBaseResponse eamThirdMaintenanceBaseResponse = eamThirdMaintenanceOrderMapper.findThirdMaintenanceBaseInfo(id);
        if (eamThirdMaintenanceBaseResponse == null) {
            return result;
        }
        eamThirdMaintenanceBaseResponse.setOperatorSignature(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamThirdMaintenanceBaseResponse.getOperatorSignature()) + "," + eamThirdMaintenanceBaseResponse.getAssistantOperator());
        eamThirdMaintenanceBaseResponse.setRepairmanSignature(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamThirdMaintenanceBaseResponse.getRepairmanSignature()) + "," + eamThirdMaintenanceBaseResponse.getAssistantRepairman());
        eamThirdMaintenanceBaseResponse.setRepairManagerSignature(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamThirdMaintenanceBaseResponse.getRepairManagerSignature()));
        eamThirdMaintenanceBaseResponse.setInspectorSignature(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamThirdMaintenanceBaseResponse.getInspectorSignature()));
        eamThirdMaintenanceBaseResponse.setEquipmentCategory(sysDictService.queryDictTextByKey("equipment_category", eamThirdMaintenanceBaseResponse.getEquipmentCategory()));
        //检查人和检查时间
        EamThirdMaintenanceBaseVo vo = eamThirdMaintenanceOrderDetailService.selectCreatByAndTimeByOrderId(id);
        if (vo != null) {
            eamThirdMaintenanceBaseResponse.setCreateBy(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", vo.getOperateBy()));
            eamThirdMaintenanceBaseResponse.setCreateTime(vo.getOperateTime());
        }
        result.put("data",Collections.singletonList(eamThirdMaintenanceBaseResponse));
        return result;
    }

    /**
     * è®¾ç½®æµç¨‹å˜é‡
     */
    private void setupProcessVariables(EamThirdMaintenanceRequest request, EamThirdMaintenanceOrder order, LoginUser user, EamEquipment equipment) {

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EamThirdMaintenanceBaseVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.vo;

import lombok.Data;

/**
 * @Author: Lius
 * @CreateTime: 2025-08-01
 * @Description:
 */
@Data
public class EamThirdMaintenanceBaseVo {
    private String operateBy;
    private String operateTime;
}