点检工单新增编辑

Lius

2025-07-05 5cccd878f9be614d1f2f7ff66df5d8762f603281

点检工单新增编辑

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionItemCategroyEnum.java

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

/**
 * ç‚¹æ£€åˆ†ç±»
 */
public enum InspectionItemCategroyEnum {
    DAY_INSPECTION, //日点检
    WEEK_INSPECTION //周点检
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java

@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

@@ -25,35 +26,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_inspection_order对象", description="点检工单")
public class EamInspectionOrder implements Serializable {
public class EamInspectionOrder extends JeecgEntity implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**工单号*/
    @Excel(name = "工单号", width = 15)
    @ApiModelProperty(value = "工单号")
@@ -122,21 +97,19 @@
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注-点检工单创建备注")
    private String remark;
    /**照片文件ids;id以逗号分隔*/
    @Excel(name = "照片文件ids;id以逗号分隔-执行时", width = 15)
    @ApiModelProperty(value = "照片文件ids;id以逗号分隔")
    private String imageFiles;

    /**标准名称*/
    @ApiModelProperty(value = "标准名称")
    private transient String standardName;
    /**保养周期;单位:天*/
    @ApiModelProperty(value = "保养周期;单位:天")
    private transient Integer maintenancePeriod;
    /**设备编号*/
    @ApiModelProperty(value = "设备编号")
    private transient String equipmentCode;

    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;

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

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java

@@ -1,19 +1,15 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: ç‚¹æ£€å·¥å•æ˜Žç»†
@@ -26,29 +22,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_inspection_order_detail对象", description="点检工单明细")
public class EamInspectionOrderDetail implements Serializable {
public class EamInspectionOrderDetail extends JeecgEntity implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**工单ID*/
    @Excel(name = "工单ID", width = 15)
    @ApiModelProperty(value = "工单ID")

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java

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

import com.baomidou.mybatisplus.annotation.TableName;
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.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: å‘¨ç‚¹æ£€å·¥å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
@Data
@TableName("eam_week_inspection_detail")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_week_inspection_detail对象", description="周点检工单明细")
public class EamWeekInspectionDetail extends JeecgEntity implements Serializable {
    private static final long serialVersionUID = 1L;

    /**设备ID*/
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**标准ID*/
    @Excel(name = "保养标准ID", width = 15)
    @ApiModelProperty(value = "保养标准ID")
    @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_name")
    private String standardId;
    /**计划点检日期*/
    @Excel(name = "计划点检日期", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "计划点检日期")
    private Date planInspectionDate;
    /**点检结果*/
    @Excel(name = "点检结果", width = 15)
    @ApiModelProperty(value = "点检结果-正常-异常")
    private String inspectionResult;
    /**异常描述*/
    @Excel(name = "异常描述", width = 15)
    @ApiModelProperty(value = "异常描述")
    private String exceptionDescription;
    /**异常是否保修*/
    @Excel(name = "异常是否报修", width = 15)
    @ApiModelProperty(value = "异常是否报修")
    private String reportFlag;
    /**保养项序号*/
    @ApiModelProperty(value = "保养项序号")
    private Integer itemCode;
    /**保养项*/
    @ApiModelProperty(value = "保养项")
    private String itemName;
    /**保养要求*/
    @ApiModelProperty(value = "保养要求")
    private String  itemDemand;

    public EamWeekInspectionDetail(){}

    public EamWeekInspectionDetail(EamMaintenanceStandardDetail detail) {
        this.itemCode = detail.getItemCode();
        this.itemName = detail.getItemName();
        this.itemDemand = detail.getItemDemand();
    }

}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java

@@ -9,6 +9,7 @@
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.util.*;
@@ -1086,4 +1087,32 @@

        return dateString;
    }

    /**
     * èŽ·å–本周的第一天日期， æ ¼å¼ä¸ºï¼šyyyy-MM-dd
     * @return
     */
    public static Date getFirstDayOfWeek() {
        // èŽ·å–本周第一天（周一）的 LocalDate
        LocalDate today = LocalDate.now();
        LocalDate firstDayOfWeek = today.with(DayOfWeek.MONDAY);

        // å¦‚果需要转换为传统的 Date ç±»åž‹ï¼ˆå¯é€‰ï¼‰
        java.sql.Date sqlDate = java.sql.Date.valueOf(firstDayOfWeek);
        return new Date(sqlDate.getTime());
    }

    /**
     * èŽ·å–本周的最后一天日期， æ ¼å¼ä¸ºï¼šyyyy-MM-dd
     * @return
     */
    public static Date getLastDayOfWeek() {
        // èŽ·å–本周第一天（周一）的 LocalDate
        LocalDate today = LocalDate.now();
        LocalDate firstDayOfWeek = today.with(DayOfWeek.SUNDAY);

        // å¦‚果需要转换为传统的 Date ç±»åž‹ï¼ˆå¯é€‰ï¼‰
        java.sql.Date sqlDate = java.sql.Date.valueOf(firstDayOfWeek);
        return new Date(sqlDate.getTime());
    }
}

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

@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -15,10 +16,12 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.request.EamInspectionBatchApprovalRequest;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
@@ -27,16 +30,13 @@
import org.jeecg.modules.eam.vo.InspectionVo;
import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @Description: ç‚¹æ£€å·¥å•
@@ -49,15 +49,16 @@
@RequestMapping("/eam/eamInspectionOrder")
@Slf4j
public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
    @Autowired

    @Resource
    private IEamInspectionOrderService eamInspectionOrderService;
    @Autowired
    @Resource
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    @Resource
    private ObjectMapper objectMapper;
    @Autowired
    @Resource
    private TranslateDictTextUtils translateDictTextUtils;
    @Autowired
    @Resource
    private IEamInspectionOrderDetailService eamInspectionOrderDetailService;

    /**
@@ -69,14 +70,12 @@
     * @param req
     * @return
     */
    //@AutoLog(value = "点检工单-分页列表查询")
    @ApiOperation(value = "点检工单-分页列表查询", notes = "点检工单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
//        QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
        Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
        IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);
        return Result.OK(pageList);
@@ -282,7 +281,6 @@
     * @param id
     * @return
     */
    //@AutoLog(value = "点检工单-通过id查询")
    @ApiOperation(value = "点检工单-通过id查询", notes = "点检工单-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -300,6 +298,7 @@
            translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
            translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
            translateDictTextUtils.translateField("equipmentCode", eamInspectionOrder.getEquipmentId(), item, "eam_equipment,id,equipment_code");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");

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

@@ -11,12 +11,15 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
@@ -33,7 +36,7 @@
@RequestMapping("/eam/eamInspectionOrderDetail")
@Slf4j
public class EamInspectionOrderDetailController extends JeecgController<EamInspectionOrderDetail, IEamInspectionOrderDetailService> {
    @Autowired
    @Resource
    private IEamInspectionOrderDetailService eamInspectionOrderDetailService;

    /**

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
import org.jeecg.modules.eam.service.IEamWeekInspectionDetailService;
import org.jeecg.modules.eam.util.DateUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * @Description: å‘¨ç‚¹æ£€å·¥å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date: 2025-04-02
 * @Version: V1.0
 */
@Api(tags = "周点检工单明细")
@RestController
@RequestMapping("/eam/eamWeekInspectionDetail")
@Slf4j
public class EamWeekInspectionDetailController extends JeecgController<EamWeekInspectionDetail, IEamWeekInspectionDetailService> {

    @Resource
    private IEamWeekInspectionDetailService eamWeekInspectionDetailService;

    /**
     * å‘¨ç‚¹æ£€å·¥å•æ˜Žç»†åˆ—表查询
     *
     * @param standardId
     * @return
     */
    @ApiOperation(value = "周点检工单明细-日点检规范列表查询", notes = "周点检工单明细-日点检规范列表查询")
    @GetMapping(value = "/queryStandardList")
    public Result<?> queryStandardList(@RequestParam("standardId") String standardId) {
        LambdaQueryWrapper<EamWeekInspectionDetail> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamWeekInspectionDetail::getStandardId, standardId);
        queryWrapper.between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(), DateUtils.getLastDayOfWeek());
        queryWrapper.orderByAsc(EamWeekInspectionDetail::getItemCode);
        List<EamWeekInspectionDetail> list = eamWeekInspectionDetailService.list(queryWrapper);
        return Result.OK(list);
    }

}

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-05
 * @Description: å‘¨ç‚¹æ£€æ˜Žç»†
 */
public interface EamWeekInspectionDetailMapper extends BaseMapper<EamWeekInspectionDetail> {
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamWeekInspectionDetailMapper">

</mapper>

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

@@ -11,6 +11,7 @@
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -109,6 +110,10 @@
    @ApiModelProperty(value = "列表 ä¿å…»é¡¹æ˜Žç»†")
    private List<EamInspectionOrderDetail> tableDetailList;

    /**列表 å‘¨ä¿å…»é¡¹æ˜Žç»†*/
    @ApiModelProperty(value = "列表 å‘¨ä¿å…»é¡¹æ˜Žç»†")
    private List<EamWeekInspectionDetail> tableWeekDetailList;

    /**确认意见*/
    @ApiModelProperty(value = "确认意见")
    private String confirmComment;

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

@@ -1,10 +1,12 @@
package org.jeecg.modules.eam.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.vo.InspectionVo;

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-05
 * @Description: å‘¨ç‚¹æ£€æ˜Žç»†
 */
public interface IEamWeekInspectionDetailService extends IService<EamWeekInspectionDetail> {
}

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

@@ -6,15 +6,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
@@ -22,19 +20,20 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
import org.jeecg.modules.eam.base.service.IBaseFactoryService;
import org.jeecg.modules.eam.base.service.IBaseFactoryUserService;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.util.DateUtils;
import org.jeecg.modules.eam.vo.InspectionVo;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
@@ -42,14 +41,13 @@
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.IMdcUserProductionService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: ç‚¹æ£€å·¥å•
@@ -62,26 +60,30 @@

    @Resource
    private EamInspectionOrderMapper eamInspectionOrderMapper;
    @Autowired
    @Resource
    private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
    @Resource
    private IEamWeekInspectionDetailService eamWeekInspectionDetailService;
    @Resource
    private IBaseFactoryUserService baseFactoryUserService;
    @Resource
    private IBaseFactoryService baseFactoryService;
    @Resource
    private FlowCommonService flowCommonService;
    @Resource
    private IFlowDefinitionService flowDefinitionService;
    @Autowired
    @Resource
    private IFlowTaskService flowTaskService;
    @Autowired
    @Resource
    private IEamEquipmentService eamEquipmentService;
    @Autowired
    @Resource
    private FlowMyBusinessServiceImpl flowMyBusinessService;
    @Autowired
    @Resource
    private TaskService taskService;
    @Autowired
    private IEamEquipmentService iEamEquipmentService;
    @Autowired
    private IMdcUserProductionService mdcUserProductionService;
    @Autowired
    @Resource
    private IEamReportRepairService eamReportRepairService;
    @Resource
    private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;

    @Override
    public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -96,8 +98,14 @@
            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
            queryWrapper.in("e.equipment_code", equipArr);
        } else {
            //没有选择设备，根据车间过滤设备
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
            //没有选择设备，根据中心过滤设备
            List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
                    list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
            if(!CollectionUtils.isEmpty(baseFactoryUserList)){
                List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
                List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
                queryWrapper.in("e.factory_code", factoryCode);
            }
        }
        //查询条件过滤
        if (query != null) {
@@ -157,6 +165,7 @@
        } else {
            eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
        }
        eamInspectionOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
        save(eamInspectionOrder);
        //处理明细数据
        if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
@@ -165,6 +174,10 @@
                tableDetail.setId(null);
            });
            eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
        }
        //处理周点检明细数据
        if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableWeekDetailList())) {
            eamWeekInspectionDetailService.saveOrUpdateBatch(eamInspectionOrderRequest.getTableWeekDetailList());
        }
        if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
            triggerProcess(eamInspectionOrder);
@@ -183,9 +196,9 @@
        if (equipment == null) {
            return false;
        } else {
            eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
            eamInspectionOrder.setEquipmentId(equipment.getEquipmentCode());
        }
        flowCommonService.initActBusiness("工单号: " + eamInspectionOrder.getOrderNum() + ";设备编号: " + eamInspectionOrder.getEquipmentCode() + ";安装位置: " + equipment.getInstallationPosition(),
        flowCommonService.initActBusiness("工单号: " + eamInspectionOrder.getOrderNum() + ";设备编号: " + eamInspectionOrder.getEquipmentId() + ";安装位置: " + equipment.getInstallationPosition(),
                eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", eamInspectionOrder.getId());
@@ -213,16 +226,16 @@
            eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
        }
        super.updateById(eamInspectionOrder);
        //处理明细数据
        if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
            eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
                tableDetail.setOrderId(eamInspectionOrder.getId());
                tableDetail.setCreateTime(new Date());
            });
            //删除明细
            eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
            eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
        }
//        //处理明细数据
//        if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
//            eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
//                tableDetail.setOrderId(eamInspectionOrder.getId());
//                tableDetail.setCreateTime(new Date());
//            });
//            //删除明细
//            eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
//            eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
//        }
        return true;
    }

@@ -417,16 +430,16 @@
                // ç‚¹æ£€å®Œæˆ
                order.setInspectionStatus(InspectionStatus.WAIT_CONFIRM.name());
                order.setOperateTime(new Date());
                if (CollectionUtil.isNotEmpty(request.getFileList())) {
                    List<FileUploadResult> fileUploadResultList = request.getFileList();
                    ObjectMapper mapper = new ObjectMapper();
                    try {
                        String referenceFile = mapper.writeValueAsString(fileUploadResultList);
                        order.setImageFiles(referenceFile);
                    } catch (JsonProcessingException e) {
                        log.error("JSON转换失败：" + e.getMessage(), e);
                    }
                }
//                if (CollectionUtil.isNotEmpty(request.getFileList())) {
//                    List<FileUploadResult> fileUploadResultList = request.getFileList();
//                    ObjectMapper mapper = new ObjectMapper();
//                    try {
//                        String referenceFile = mapper.writeValueAsString(fileUploadResultList);
//                        order.setImageFiles(referenceFile);
//                    } catch (JsonProcessingException e) {
//                        log.error("JSON转换失败：" + e.getMessage(), e);
//                    }
//                }
                eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
                eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
            } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
import org.jeecg.modules.eam.mapper.EamWeekInspectionDetailMapper;
import org.jeecg.modules.eam.service.IEamWeekInspectionDetailService;
import org.springframework.stereotype.Service;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-05
 * @Description: å‘¨ç‚¹æ£€æ˜Žç»†
 */
@Service
public class EamWeekInspectionDetailServiceImpl extends ServiceImpl<EamWeekInspectionDetailMapper, EamWeekInspectionDetail> implements IEamWeekInspectionDetailService {
}