设备报废功能增加

cuikaidong

2025-05-27 178278bf8d570ace8cc59ee865035b49333a4421

设备报废功能增加

 db/Êý¾Ý¿â²úÆ·»¯Éè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-5-26 14:55:20",
  "updatedTime": "2025-5-27 10:54:54",
  "dbConns": [],
  "profile": {
    "default": {
@@ -14010,6 +14010,62 @@
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "45EE18F4-2F86-4D31-A5A1-FE3C95BDE686"
        },
        {
          "defKey": "approval_deal_type",
          "defName": "审核类型",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "refDict": "",
          "extProps": {},
          "notes": {},
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "74BA9D2B-0477-46CD-9CD1-0E74A864D8B1",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "scrap_status",
          "defName": "报废（转让）状态",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "refDict": "",
          "extProps": {},
          "notes": {},
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "3147B647-8FB7-41C0-B032-DC415CA853B1",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        }
      ],
      "correlations": [],

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java

@@ -4,7 +4,9 @@
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.*;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
@@ -128,10 +130,30 @@
            case PARTIAL_REPAIR:
                break;
            case LEAN_OUT:
                if (result instanceof EamEquipmentLeanOut) {
                    EamEquipmentLeanOut order = (EamEquipmentLeanOut) result;
                    if (EquipmentLeanOutStatusEnum.COMPLETE.name().equals(order.getLeanStatus())) {
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getLeanPerson());
                        log.setDescription(order.getLeanReason());
                        log.setCreateTime(order.getLeanStartTime());
                    }
                }
                break;
            case GIVE_BACK:
                break;
            case SEAL_UP:
                if (result instanceof EamEquipmentSealUp) {
                    EamEquipmentSealUp order = (EamEquipmentSealUp) result;
                    if (EquipmentSealUpStatusEnum.COMPLETE.name().equals(order.getSealStatus())) {
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getReportUser());
                        log.setDescription(order.getSealUpReason());
                        log.setCreateTime(order.getSealEndTime());
                    }
                }
                break;
            case UNSEALED:
                break;
@@ -148,6 +170,16 @@
                }
                break;
            case SCRAPPED:
                if (result instanceof EamEquipmentScrap) {
                    EamEquipmentScrap order = (EamEquipmentScrap) result;
                    if (EquipmentScrapStatusEnum.COMPLETE.name().equals(order.getScrapStatus())) {
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getReportUser());
                        log.setDescription(order.getScrapReason());
                        log.setCreateTime(order.getScrapTime());
                    }
                }
                break;
            default:
                break;

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

@@ -25,6 +25,8 @@
    String SEAL_UP_CODE_RULE = "EquipmentSealUpCodeRule";
    //设备调拨编码规则
    String TRANSFER_CODE_RULE = "EquipmentTransferCodeRule";
    //设备调拨编码规则
        String SCRAP_CODE_RULE = "EquipmentScrapCodeRule";
    /**
     * å¤‡ä»¶è¯·è´­å•çŠ¶æ€ 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */

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

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

/**
 * @author cuikaidong
 * @date 2025/5/27
 */
public enum EquipmentScrapStatusEnum {
    WAIT_SUBMIT, //待提交
    WAIT_CHECK, //待审核
    COMPLETE, //已完成
    ;

    public static EquipmentScrapStatusEnum getInstance(String code) {
        EquipmentScrapStatusEnum[] values = EquipmentScrapStatusEnum.values();
        for (EquipmentScrapStatusEnum value : values) {
            if (value.name().equals(code)) {
                return value;
            }
        }
        return null;
    }
}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
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.aspect.annotation.Dict;
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-05-13
 * @Version: V1.0
 */
@Data
@TableName("eam_equipment_lean_out")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "eam_equipment_lean_out对象", description = "设备借出归还")
public class EamEquipmentLeanOut implements Serializable {

    /**
     * ä¸»é”®
     */
    @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;
    /**
     * è®¾å¤‡ID
     */
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**
     * å•æ®å·
     */
    @Excel(name = "单据号", width = 15)
    @ApiModelProperty(value = "单据号")
    private String code;
    /**
     * å€Ÿå…¥éƒ¨é—¨
     */
    @Excel(name = "借入部门", width = 15, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
    @ApiModelProperty(value = "借入部门")
    @Dict(dicCode = "mdc_production, production_name, id")
    private String leanDepartId;
    /**
     * å€Ÿå…¥è´£ä»»äºº
     */
    @Excel(name = "借入责任人", width = 15)
    @ApiModelProperty(value = "借入责任人")
    @Dict(dicCode = "sys_user, realname, username")
    private String leanPerson;
    /**
     * å€Ÿç”¨åŽŸå› 
     */
    @ApiModelProperty(value = "借用原因")
    private String leanReason;
    /**
     * å®¡æ‰¹ç±»åž‹
     */
    @ApiModelProperty(value = "审批类型")
    @Dict(dicCode = "approved_rejected")
    private String approvalDealType;
    /**
     * å€Ÿå‡ºçŠ¶æ€
     */
    @Excel(name = "借出状态", width = 15)
    @ApiModelProperty(value = "借出状态")
    @Dict(dicCode = "equipment_lean_out_status")
    private String leanStatus;
    /**
     * å€Ÿå‡ºå¼€å§‹æ—¶é—´
     */
    @ApiModelProperty(value = "借出时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date leanStartTime;
    /**
     * å€Ÿå‡ºå½’还时间
     */
    @ApiModelProperty(value = "归还时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date leanEndTime;
    /**
     * å®¡æ ¸äºº
     */
    @Excel(name = "审核人", width = 15)
    @ApiModelProperty(value = "审核人")
    @Dict(dicCode = "sys_user, realname, username")
    private String approvalUser;
    /**
     * å®¡æ ¸æ„è§
     */
    @Excel(name = "审核意见", width = 15)
    @ApiModelProperty(value = "审核意见")
    private String approvalComment;
    /**
     * å®¡æ ¸æ—¶é—´
     */
    @ApiModelProperty(value = "审核时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date approvalTime;
    /**
     * ç¡®è®¤äºº
     */
    @Excel(name = "确认人", width = 15)
    @ApiModelProperty(value = "确认人")
    @Dict(dicCode = "sys_user, realname, username")
    private String confirmUser;
    /**
     * ç¡®è®¤æ„è§
     */
    @Excel(name = "确认意见", width = 15)
    @ApiModelProperty(value = "确认意见")
    private String confirmComment;
    /**
     * ç¡®è®¤æ—¶é—´
     */
    @ApiModelProperty(value = "确认时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmTime;
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "归还备注", width = 15)
    @ApiModelProperty(value = "归还备注")
    private String returnComment;

    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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.jeecgframework.poi.excel.annotation.Excel;

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

/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Author: jeecg-boot
 * @Date: 2025-05-15
 * @Version: V1.0
 */
@Data
@TableName("eam_equipment_scrap")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "eam_equipment_scrap对象", description = "设备报废(转让)")
public class EamEquipmentScrap implements Serializable {

    /**
     * ä¸»é”®
     */
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**
     * åˆ›å»ºäºº
     */
    @Excel(name = "创建人", width = 15)
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**
     * æ›´æ–°äºº
     */
    @Excel(name = "更新人", width = 15)
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**
     * æ›´æ–°æ—¶é—´
     */
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**
     * åˆ é™¤æ ‡è®°
     */
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    /**
     * å•æ®å·
     */
    @Excel(name = "单据号", width = 15)
    @ApiModelProperty(value = "单据号")
    private String code;
    /**
     * è®¾å¤‡ID
     */
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**
     * è½¬è®©/报废
     */
    @Excel(name = "转让/报废", width = 15)
    @ApiModelProperty(value = "转让/报废")
    @Dict(dicCode = "scrap_sell")
    private String scrapType;
    /**
     * ç”³è¯·äºº
     */
    @Excel(name = "申请人", width = 15)
    @ApiModelProperty(value = "申请人")
    @Dict(dicCode = "sys_user, realname, username")
    private String reportUser;
    /**
     * å¤„置时间
     */
    @ApiModelProperty(value = "处置时间")
    private Date scrapTime;
    /**
     * å¤„置理由
     */
    @Excel(name = "处置理由", width = 15)
    @ApiModelProperty(value = "处置理由")
    private String scrapReason;
    /**
     * å¤„置金额
     */
    @Excel(name = "处置金额", width = 15)
    @ApiModelProperty(value = "处置金额")
    private java.math.BigDecimal scrapAmount;
    /**
     * æŠ¥åºŸçŠ¶æ€
     */
    @Excel(name = "报废状态", width = 15)
    @ApiModelProperty(value = "报废状态")
    @Dict(dicCode = "equipment_scrap_status")
    private String scrapStatus;
    /**
     * å®¡æ ¸äºº
     */
    @Excel(name = "审核人", width = 15)
    @ApiModelProperty(value = "审核人")
    @Dict(dicCode = "sys_user, realname, username")
    private String approvalUser;
    /**
     * å®¡æ ¸ç±»åž‹
     */
    @Excel(name = "审核类型", width = 15)
    @ApiModelProperty(value = "审核类型")
    private String approvalDealType;
    /**
     * å®¡æ ¸æ„è§
     */
    @Excel(name = "审核意见", width = 15)
    @ApiModelProperty(value = "审核意见")
    private String approvalComment;
    /**
     * å®¡æ ¸æ—¶é—´
     */
    @ApiModelProperty(value = "审核时间")
    private Date approvalTime;
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
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.aspect.annotation.Dict;
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-05-13
 * @Version: V1.0
 */
@Data
@TableName("eam_equipment_seal_up")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "eam_equipment_seal_up对象", description = "设备封存启封")
public class EamEquipmentSealUp implements Serializable {

    /**
     * ä¸»é”®
     */
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**
     * åˆ›å»ºäºº
     */
    @Excel(name = "创建人", width = 15)
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**
     * æ›´æ–°äºº
     */
    @Excel(name = "更新人", width = 15)
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**
     * æ›´æ–°æ—¶é—´
     */
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**
     * åˆ é™¤æ ‡è®°
     */
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    /**
     * è®¾å¤‡ID
     */
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**
     * å•æ®å·
     */
    @Excel(name = "单据号", width = 15)
    @ApiModelProperty(value = "单据号")
    private String code;
    /**
     * ç”³è¯·äºº
     */
    @Excel(name = "申请人", width = 15)
    @ApiModelProperty(value = "申请人")
    @Dict(dicCode = "sys_user, realname, username")
    private String reportUser;
    /**
     * å°å­˜å¼€å§‹æ—¶é—´
     */
    @ApiModelProperty(value = "封存开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date sealStartTime;
    /**
     * å°å­˜ç»“束时间
     */
    @ApiModelProperty(value = "封存结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date sealEndTime;
    /**
     * å°å­˜åŽŸå› 
     */
    @Excel(name = "封存原因", width = 15)
    @ApiModelProperty(value = "封存原因")
    private String sealUpReason;
    /**
     * å°å­˜çŠ¶æ€
     */
    @Excel(name = "封存状态", width = 15)
    @ApiModelProperty(value = "封存状态")
    @Dict(dicCode = "equipment_seal_up_status")
    private String sealStatus;
    /**
     * å®¡æ ¸äºº
     */
    @Excel(name = "审核人", width = 15)
    @ApiModelProperty(value = "审核人")
    private String approvalUser;
    /**
     * å®¡æ ¸æ—¶é—´
     */
    @ApiModelProperty(value = "审核时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date approvalTime;
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * å®¡æ ¸ç±»åž‹
     */
    @Excel(name = "审核类型", width = 15)
    @ApiModelProperty(value = "审核类型")
    private String approvalDealType;
    /**
     * å®¡æ ¸æ„è§
     */
    @Excel(name = "审核意见", width = 15)
    @ApiModelProperty(value = "审核意见")
    private String approvalComment;
    /**
     * å¯å°ç”³è¯·äºº
     */
    @Excel(name = "启封申请人", width = 15)
    @ApiModelProperty(value = "启封申请人")
    private String unsealReportUser;
    /**
     * å¯å°åŽŸå› 
     */
    @Excel(name = "启封原因", width = 15)
    @ApiModelProperty(value = "启封原因")
    private String unsealReason;
    /**
     * å¯å°å®¡æ ¸äºº
     */
    @Excel(name = "启封审核人", width = 15)
    @ApiModelProperty(value = "启封审核人")
    private String unsealApprovalUser;
    /**
     * å¯å°å®¡æ ¸æ—¶é—´
     */
    @Excel(name = "启封审核时间", width = 15)
    @ApiModelProperty(value = "启封审核时间")
    private Date unsealApprovalTime;
    /**
     * å¯å°å®¡æ ¸ç±»åž‹
     */
    @Excel(name = "启封审核类型", width = 15)
    @ApiModelProperty(value = "启封审核类型")
    private String unsealApprovalDealType;
    /**
     * å¯å°å®¡æ ¸æ„è§
     */
    @Excel(name = "启封审核意见", width = 15)
    @ApiModelProperty(value = "启封审核意见")
    private String unsealApprovalComment;


    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;

}

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

@@ -1,39 +1,32 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
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.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
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.EquipmentScrapStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
import org.jeecg.modules.eam.request.EamEquipmentScrapQuery;
import org.jeecg.modules.eam.request.EamEquipmentScrapRequest;
import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;

 /**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
@@ -48,6 +41,12 @@
public class EamEquipmentScrapController extends JeecgController<EamEquipmentScrap, IEamEquipmentScrapService> {
    @Autowired
    private IEamEquipmentScrapService eamEquipmentScrapService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;
    
    /**
     * åˆ†é¡µåˆ—表查询
@@ -61,41 +60,55 @@
    @AutoLog(value = "设备报废(转让)-分页列表查询")
    @ApiOperation(value="设备报废(转让)-分页列表查询", notes="设备报废(转让)-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamEquipmentScrap eamEquipmentScrap,
    public Result<?> queryPageList(EamEquipmentScrapQuery query,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamEquipmentScrap> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipmentScrap, req.getParameterMap());
        Page<EamEquipmentScrap> page = new Page<EamEquipmentScrap>(pageNo, pageSize);
        IPage<EamEquipmentScrap> pageList = eamEquipmentScrapService.page(page, queryWrapper);
        IPage<EamEquipmentScrap> pageList = eamEquipmentScrapService.queryPageList(page, query);
        return Result.OK(pageList);
    }
    
    /**
     * æ·»åŠ 
     *
     * @param eamEquipmentScrap
     * @param request
     * @return
     */
    @AutoLog(value = "设备报废(转让)-添加")
    @ApiOperation(value="设备报废(转让)-添加", notes="设备报废(转让)-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamEquipmentScrap eamEquipmentScrap) {
        eamEquipmentScrapService.save(eamEquipmentScrap);
    public Result<?> add(@RequestBody EamEquipmentScrap request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        request.setCode(businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SCRAP_CODE_RULE));
        request.setScrapStatus(EquipmentScrapStatusEnum.WAIT_SUBMIT.name());
        request.setDelFlag(CommonConstant.DEL_FLAG_0);
        boolean b = eamEquipmentScrapService.addScrap(request);
        if (!b) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }
    
    /**
     * ç¼–辑
     *
     * @param eamEquipmentScrap
     * @param request
     * @return
     */
    @AutoLog(value = "设备报废(转让)-编辑")
    @ApiOperation(value="设备报废(转让)-编辑", notes="设备报废(转让)-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamEquipmentScrap eamEquipmentScrap) {
        eamEquipmentScrapService.updateById(eamEquipmentScrap);
    public Result<?> edit(@RequestBody EamEquipmentScrap request) {
        if (request == null) {
            return Result.error("编辑的对象不能为空！");
        }
        boolean b = eamEquipmentScrapService.editScrap(request);
        if (!b) {
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }
    
@@ -109,7 +122,11 @@
    @ApiOperation(value="设备报废(转让)-通过id删除", notes="设备报废(转让)-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        eamEquipmentScrapService.removeById(id);
        EamEquipmentScrap entity = eamEquipmentScrapService.getById(id);
        if (entity != null) {
            entity.setDelFlag(CommonConstant.DEL_FLAG_1);
            eamEquipmentScrapService.updateById(entity);
        }
        return Result.OK("删除成功!");
    }
    
@@ -124,6 +141,14 @@
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamEquipmentScrapService.removeByIds(Arrays.asList(ids.split(",")));
        List<String> list = Arrays.asList(ids.split(","));
        list.forEach(id -> {
            EamEquipmentScrap entity = eamEquipmentScrapService.getById(id);
            if (entity != null) {
                entity.setDelFlag(CommonConstant.DEL_FLAG_1);
                eamEquipmentScrapService.updateById(entity);
            }
        });
        return Result.OK("批量删除成功！");
    }
    
@@ -138,30 +163,53 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamEquipmentScrap eamEquipmentScrap = eamEquipmentScrapService.getById(id);
        return Result.OK(eamEquipmentScrap);
        if (eamEquipmentScrap == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamEquipmentScrap);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("reportUser", eamEquipmentScrap.getReportUser(), item, "sys_user,realname,username");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

  /**
   * å¯¼å‡ºexcel
     * æäº¤
   *
   * @param request
   * @param eamEquipmentScrap
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamEquipmentScrap eamEquipmentScrap) {
      return super.exportXls(request, eamEquipmentScrap, EamEquipmentScrap.class, "设备报废(转让)");
  }

  /**
   * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
     * @param id
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamEquipmentScrap.class);
    @AutoLog(value = "设备报废(转让)-提交")
    @ApiOperation(value = "设备报废(转让)-提交", notes = "设备报废(转让)-提交")
    @GetMapping(value = "/submit")
    public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
        boolean b = eamEquipmentScrapService.submit(id);
        if (!b) {
            return Result.error("操作失败！");
        }
        return Result.OK("操作成功!");
  }

    /**
     * å®¡æ‰¹æµ
     *
     * @param request
     * @return
     */
    @AutoLog(value = "设备报废(转让)-审批流")
    @ApiOperation(value = "设备报废(转让)-审批流", notes = "设备报废(转让)-审批流")
    @RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> approval(@RequestBody EamEquipmentScrapRequest request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        EamEquipmentScrap entity = eamEquipmentScrapService.approval(request);
        if (entity == null) {
            return Result.error("操作失败！");
        }
        return Result.OK("操作成功!");
    }
}

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

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -8,10 +9,12 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;

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

/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Author: jeecg-boot
@@ -25,68 +28,124 @@
@ApiModel(value="eam_equipment_scrap对象", description="设备报废(转让)")
public class EamEquipmentScrap implements Serializable {
    
    /**主键*/
    /**
     * ä¸»é”®
     */
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    /**
     * åˆ›å»ºäºº
     */
    @Excel(name = "创建人", width = 15)
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    /**
     * åˆ›å»ºæ—¶é—´
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    /**
     * æ›´æ–°äºº
     */
    @Excel(name = "更新人", width = 15)
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    /**
     * æ›´æ–°æ—¶é—´
     */
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    /**
     * åˆ é™¤æ ‡è®°
     */
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    /**单据号*/
    /**
     * å•æ®å·
     */
    @Excel(name = "单据号", width = 15)
    @ApiModelProperty(value = "单据号")
    private String code;
    /**设备ID*/
    /**
     * è®¾å¤‡ID
     */
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**转让/报废*/
    /**
     * è½¬è®©/报废
     */
    @Excel(name = "转让/报废", width = 15)
    @ApiModelProperty(value = "转让/报废")
    @Dict(dicCode = "scrap_sell")
    private String scrapType;
    /**申请人*/
    /**
     * ç”³è¯·äºº
     */
    @Excel(name = "申请人", width = 15)
    @ApiModelProperty(value = "申请人")
    @Dict(dicCode = "sys_user, realname, username")
    private String reportUser;
    /**处置时间*/
    /**
     * å¤„置时间
     */
    @ApiModelProperty(value = "处置时间")
    private Date scrapTime;
    /**处置理由*/
    /**
     * å¤„置理由
     */
    @Excel(name = "处置理由", width = 15)
    @ApiModelProperty(value = "处置理由")
    private String scrapReason;
    /**处置金额*/
    /**
     * å¤„置金额
     */
    @Excel(name = "处置金额", width = 15)
    @ApiModelProperty(value = "处置金额")
    private java.math.BigDecimal scrapAmount;
    /**审核人*/
    /**
     * æŠ¥åºŸçŠ¶æ€
     */
    @Excel(name = "报废状态", width = 15)
    @ApiModelProperty(value = "报废状态")
    @Dict(dicCode = "equipment_scrap_status")
    private String scrapStatus;
    /**
     * å®¡æ ¸äºº
     */
    @Excel(name = "审核人", width = 15)
    @ApiModelProperty(value = "审核人")
    @Dict(dicCode = "sys_user, realname, username")
    private String approvalUser;
    /**审核意见*/
    /**
     * å®¡æ ¸ç±»åž‹
     */
    @Excel(name = "审核类型", width = 15)
    @ApiModelProperty(value = "审核类型")
    private String approvalDealType;
    /**
     * å®¡æ ¸æ„è§
     */
    @Excel(name = "审核意见", width = 15)
    @ApiModelProperty(value = "审核意见")
    private String approvalComment;
    /**审核时间*/
    /**
     * å®¡æ ¸æ—¶é—´
     */
    @ApiModelProperty(value = "审核时间")
    private Date approvalTime;
    /**备注*/
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
}

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

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

import java.util.List;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
@@ -13,5 +15,14 @@
 * @Version: V1.0
 */
public interface EamEquipmentScrapMapper extends BaseMapper<EamEquipmentScrap> {
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param page
     * @param queryWrapper
     * @return
     */
    IPage<EamEquipmentScrap> queryPageList(Page<EamEquipmentScrap> page, @Param(Constants.WRAPPER) QueryWrapper<EamEquipmentScrap> queryWrapper);


}

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

@@ -2,4 +2,11 @@
<!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.EamEquipmentScrapMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentScrap">
        select wmo.*, e.equipment_code, e.equipment_name
        from eam_equipment_scrap wmo
                 inner join eam_equipment e
                            on wmo.equipment_id = e.id
            ${ew.customSqlSegment}
    </select>
</mapper>

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@Data
public class EamEquipmentScrapQuery {
    private String code;
    private String equipmentId;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date leanDateBegin;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date leanDateEnd;
    private String sealStatus;

    private String column;
    private String order;
}

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

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

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.flowable.domain.vo.FlowTaskVo;

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

/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Author: jeecg-boot
 * @Date: 2025-05-30
 * @Version: V1.0
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class EamEquipmentScrapRequest extends FlowTaskVo implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®
     */
    @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 code;
    /**
     * è®¾å¤‡ID
     */
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**
     * è½¬è®©/报废
     */
    @ApiModelProperty(value = "转让/报废")
    private String scrapType;
    /**
     * ç”³è¯·äºº
     */
    @ApiModelProperty(value = "申请人")
    private String reportUser;
    /**
     * å¤„置时间
     */
    @ApiModelProperty(value = "处置时间")
    private Date scrapTime;
    /**
     * å¤„置理由
     */
    @ApiModelProperty(value = "处置理由")
    private String scrapReason;
    /**
     * å¤„置金额
     */
    @ApiModelProperty(value = "处置金额")
    private java.math.BigDecimal scrapAmount;
    /**
     * å˜åŠ¨çŠ¶æ€
     */
    @ApiModelProperty(value = "变动状态")
    @Dict(dicCode = "equipment_transfer_status")
    private String scrapStatus;
    /**
     * å®¡æ ¸äºº
     */
    @ApiModelProperty(value = "审核人")
    private String approvalUser;
    /**
     * å®¡æ ¸ç±»åž‹
     */
    @ApiModelProperty(value = "审核类型")
    private String approvalDealType;
    /**
     * å®¡æ ¸æ„è§
     */
    @ApiModelProperty(value = "审核意见")
    private String approvalComment;
    /**
     * å®¡æ ¸æ—¶é—´
     */
    @ApiModelProperty(value = "审核时间")
    private Date approvalTime;
    /**
     * å¤‡æ³¨
     */
    @ApiModelProperty(value = "备注")
    private String remark;
}

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

@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.service;

import org.jeecg.modules.eam.entity.EamEquipmentScrap;
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.modules.eam.entity.EamEquipmentScrap;
import org.jeecg.modules.eam.request.EamEquipmentScrapQuery;
import org.jeecg.modules.eam.request.EamEquipmentScrapRequest;

/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
@@ -10,5 +14,44 @@
 * @Version: V1.0
 */
public interface IEamEquipmentScrapService extends IService<EamEquipmentScrap> {
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param page
     * @param query
     * @return
     */
    IPage<EamEquipmentScrap> queryPageList(Page<EamEquipmentScrap> page, EamEquipmentScrapQuery query);

    /**
     * æ·»åŠ æŠ¥åºŸï¼ˆè£…让）记录
     *
     * @param request
     * @return
     */
    boolean addScrap(EamEquipmentScrap request);

    /**
     * æäº¤ç”³è¯·
     *
     * @param id
     * @return
     */
    boolean submit(String id);

    /**
     * å®¡æ‰¹æµç¨‹æŽ§åˆ¶
     *
     * @param request
     * @return
     */
    EamEquipmentScrap approval(EamEquipmentScrapRequest request);

    /**
     * ç¼–辑
     *
     * @param request
     * @return
     */
    boolean editScrap(EamEquipmentScrap request);
}

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

@@ -17,7 +17,10 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper;
@@ -242,6 +245,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.LEAN_OUT, businessTable = "eam_equipment_lean_out")
    public EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request) {
        EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(request.getId());
        if (entity == null) {

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

@@ -1,19 +1,361 @@
package org.jeecg.modules.eam.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
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.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.EquipmentScrapStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
import org.jeecg.modules.eam.mapper.EamEquipmentScrapMapper;
import org.jeecg.modules.eam.request.EamEquipmentScrapQuery;
import org.jeecg.modules.eam.request.EamEquipmentScrapRequest;
import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
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;
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.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Description: è®¾å¤‡æŠ¥åºŸ(报废 ï¼ˆ è½¬å‡º ï¼‰)
 * @Author: jeecg-boot
 * @Date:   2025-05-15
 * @Version: V1.0
 */
@Service
public class EamEquipmentScrapServiceImpl extends ServiceImpl<EamEquipmentScrapMapper, EamEquipmentScrap> implements IEamEquipmentScrapService {
@Service("IEamEquipmentScrapService")
public class EamEquipmentScrapServiceImpl extends ServiceImpl<EamEquipmentScrapMapper, EamEquipmentScrap> implements IEamEquipmentScrapService, FlowCallBackServiceI {

    @Resource
    private EamEquipmentScrapMapper equipmentScrapMapper;
    @Autowired
    private IEamEquipmentService eamEquipmentService;
    @Autowired
    private FlowCommonService flowCommonService;
    @Autowired
    private IFlowDefinitionService flowDefinitionService;
    @Autowired
    private IFlowMyBusinessService flowMyBusinessService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private IFlowTaskService flowTaskService;

    @Autowired
    private ISysUserService sysUserService;

    @Override
    public IPage<EamEquipmentScrap> queryPageList(Page<EamEquipmentScrap> page, EamEquipmentScrapQuery query) {
        QueryWrapper<EamEquipmentScrap> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return page;
        }
        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            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());
        }
        //控制待提交状态的数据只能本人查看
        queryWrapper.and(i -> i.ne("wmo.scrap_status", EquipmentScrapStatusEnum.WAIT_SUBMIT).or().eq("wmo.report_user", sysUser.getUsername()));
        //查询条件过滤
        if (query != null) {
            if (StringUtils.isNotBlank(query.getEquipmentId())) {
                queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
            }
            if (StringUtils.isNotBlank(query.getCode())) {
                queryWrapper.like("wmo.code", query.getCode());
            }
            if (StringUtils.isNotBlank(query.getSealStatus())) {
                queryWrapper.eq("wmo.scrap_status", query.getSealStatus());
            }
            if (query.getLeanDateBegin() != null && query.getLeanDateEnd() != null) {
                queryWrapper.between("wmo.lean_start_time", query.getLeanDateBegin(), query.getLeanDateEnd());
            }
            //排序
            if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
                String column = query.getColumn();
                if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
                    column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
                }
                if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
                    queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
                } else {
                    queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
                }
            } else {
                queryWrapper.orderByDesc("wmo.create_time");
            }
        } else {
            queryWrapper.orderByDesc("wmo.create_time");
        }

        return equipmentScrapMapper.queryPageList(page, queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addScrap(EamEquipmentScrap request) {
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
            throw new JeecgBootException("此设备当前资产状态不允许报废！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法添加借用记录！");
        }
        request.setReportUser(sysUser.getUsername());
        return equipmentScrapMapper.insert(request) > 0;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean submit(String id) {
        EamEquipmentScrap entity = equipmentScrapMapper.selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要提交的数据不存在，请刷新重试！");
        }
        if (!EquipmentScrapStatusEnum.WAIT_SUBMIT.name().equals(entity.getScrapStatus())) {
            throw new JeecgBootException("当前数据状态不允许编辑！");
        }
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑报废（转出）记录！");
        }
        UpdateWrapper<EamEquipmentScrap> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("scrap_status", EquipmentScrapStatusEnum.WAIT_SUBMIT.name());
        updateWrapper.eq("id", id);
        updateWrapper.eq("report_user", sysUser.getUsername());
        boolean success = super.update(updateWrapper);
        if (success) {
            equipment.setAssetStatus(AssetStatusEnum.SCRAP.name()); // è®¾å¤‡æŠ¥åºŸï¼ˆè½¬å‡ºï¼‰
            eamEquipmentService.updateById(equipment);
        }
        //启动审批流程
        flowCommonService.initActBusiness("工单号:" + entity.getCode() + ";设备编号: " + equipment.getEquipmentCode() + ";进行设备报废（转出）",
                entity.getId(), "IEamEquipmentScrapService", "equipment_scrap", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());
        variables.put("organization", entity.getScrapReason());
        variables.put("comment", entity.getScrapReason());
        variables.put("proofreading", true);
        // åˆ†é…ç»™è®¾å¤‡ç®¡ç†å‘˜
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("设备未分配给设备管理员，无法进入下级审批！");
        }
        List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("equipment_scrap", variables);
        if (result != null) {
            entity.setScrapTime(new Date());
            entity.setScrapStatus(EquipmentScrapStatusEnum.WAIT_CHECK.name());
            //保存工单
            equipmentScrapMapper.updateById(entity);
            return result.isSuccess();
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SCRAPPED, businessTable = "eam_equipment_scrap")
    public EamEquipmentScrap approval(EamEquipmentScrapRequest request) {
        EamEquipmentScrap entity = equipmentScrapMapper.selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("审批的数据已删除，请刷新重试！");
        }
        // èŽ·å–当前登录用户
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (user == null || StrUtil.isBlank(user.getId())) {
            throw new JeecgBootException("未获取到登录用户，请重新登录后再试！");
        }
        request.setApprovalUser(user.getUsername());
        // èŽ·å–流程业务记录
        FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId());
        if (flowMyBusiness == null) {
            throw new JeecgBootException("流程实例不存在，请刷新后重试！");
        }

        boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
        if (!userAuthorized) {
            throw new JeecgBootException("用户无权操作此任务，请刷新后重试！");
        }
        // è®¤é¢†ä»»åŠ¡
        if (!claimTask(flowMyBusiness.getTaskId(), user)) {
            throw new JeecgBootException("任务不存在、已完成或已被他人认领！");
        }

        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，请检查！");
        }

        EquipmentScrapStatusEnum status = EquipmentScrapStatusEnum.getInstance(entity.getScrapStatus());
        if (status == null) {
            return null;
        }
        //流程变量
        Map<String, Object> values = new HashMap<>();
        // å®¡æ‰¹
        if (status == EquipmentScrapStatusEnum.WAIT_CHECK) {//执行完成
            values.put("dataId", entity.getId());
            values.put("organization", request.getApprovalComment());
            values.put("comment", request.getApprovalComment());
            values.put("approvalDealType", request.getApprovalDealType());
            request.setComment(request.getApprovalComment());
            entity.setApprovalUser(user.getUsername());// å®¡æ ¸äºº
            entity.setApprovalComment(request.getApprovalComment());// å®¡æ ¸æ„è§
            entity.setApprovalTime(new Date());// å®¡æ ¸æ—¶é—´
            entity.setApprovalDealType(request.getApprovalDealType()); // å®¡æ‰¹ç±»åž‹
            // éªŒè¯é€šè¿‡è¿˜æ˜¯é©³å›ž
            if (request.getApprovalDealType().equals("1")) {
                //设置entity
                entity.setScrapStatus(EquipmentScrapStatusEnum.COMPLETE.name());
                List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getReportUser()));
                values.put("NextAssignee", userApprovalList);
                // ä¿®æ”¹è®¾å¤‡çŠ¶æ€
                equipment.setAssetStatus(AssetStatusEnum.SCRAP.name());

            } else {
                //设置entity
                entity.setScrapStatus(EquipmentScrapStatusEnum.COMPLETE.name());
                // ä¿®æ”¹è®¾å¤‡çŠ¶æ€
                equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
            }
            entity.setApprovalUser(user.getUsername());
            entity.setApprovalComment(request.getApprovalComment());
            entity.setApprovalTime(new Date());
            eamEquipmentService.updateById(equipment);
        }
        request.setValues(values);

        // å®Œæˆæµç¨‹ä»»åŠ¡
        Result result = flowTaskService.complete(request);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败，请刷新查看！");
        }
        //保存工单
        equipmentScrapMapper.updateById(entity);
        return entity;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean editScrap(EamEquipmentScrap request) {
        EamEquipmentScrap entity = equipmentScrapMapper.selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("要编辑的数据不存在，请刷新重试！");
        }
        if (!EquipmentScrapStatusEnum.WAIT_SUBMIT.name().equals(entity.getScrapStatus())) {
            throw new JeecgBootException("当前数据状态不允许编辑！");
        }
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑报废记录！");
        }
        UpdateWrapper<EamEquipmentScrap> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("equipment_id", request.getEquipmentId());
        updateWrapper.set("remark", request.getRemark());
        updateWrapper.set("scrap_reason", request.getScrapReason());
        updateWrapper.set("scrap_amount", request.getScrapAmount());
        updateWrapper.set("scrap_type", request.getScrapType());
        updateWrapper.eq("id", request.getId());
        updateWrapper.eq("report_user", sysUser.getUsername());
        return super.update(updateWrapper);
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数
        business.getActStatus();
    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }

    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }

    /**
     * åˆ¤æ–­ç”¨æˆ·æ˜¯å¦æ‹¥æœ‰æ­¤æƒé™
     *
     * @param flowMyBusiness
     * @param user
     * @return
     */
    private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
        List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
        return todoUsers != null && todoUsers.contains(user.getUsername());
    }

    private boolean claimTask(String taskId, LoginUser user) {
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        if (task == null) {
            return false;
        }
        if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
            return false;
        }
        taskService.claim(taskId, user.getUsername());
        return true;
    }
}

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

@@ -18,8 +18,10 @@
import org.jeecg.common.exception.JeecgBootException;
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.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
@@ -278,6 +280,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SEAL_UP, businessTable = "eam_equipment_seal_up")
    public EamEquipmentSealUp approval(EamEquipmentSealUpRequest request) {
        EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(request.getId());
        if (entity == null) {
@@ -336,7 +339,7 @@
                    values.put("NextAssignee", userApprovalList);
                } else {
                    //设置entity
                    entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_SUBMIT.name());
                    entity.setSealStatus(EquipmentSealUpStatusEnum.COMPLETE.name());
                    // ä¿®æ”¹è®¾å¤‡çŠ¶æ€
                    equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                    eamEquipmentService.updateById(equipment);

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

@@ -259,13 +259,12 @@
                entity.setTransferStatus(EquipmentTransferStatusEnum.COMPLETE.name());
                List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getReportUser()));
                values.put("NextAssignee", userApprovalList);
                // ä¿®æ”¹è®¾å¤‡çŠ¶æ€
                equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
            } else {
                //设置entity
                entity.setTransferStatus(EquipmentTransferStatusEnum.WAIT_SUBMIT.name());
                // ä¿®æ”¹è®¾å¤‡çŠ¶æ€
                entity.setTransferStatus(EquipmentTransferStatusEnum.COMPLETE.name());
            }
            // ä¿®æ”¹è®¾å¤‡çŠ¶æ€
            equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
            entity.setApprovalUser(user.getUsername());
            entity.setApprovalComment(request.getApprovalComment());
            entity.setApprovalTime(new Date());