故障报修流程审批节点字段调整

hyingbo

2 天以前 d4d757f2d1a32deecb5e13111d6e753dfa18a58e

故障报修流程审批节点字段调整

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

@@ -93,6 +93,36 @@
    @Excel(name = "故障原因", width = 15)
    @ApiModelProperty(value = "故障原因")
    private String faultReason;

    /**
     * æ•…障类型
     */
    @Excel(name = "故障类型", width = 15)
    @ApiModelProperty(value = "故障类型")
    @Dict(dicCode = "repair_warehouse_fault_type")
    private String faultType;

    /**
     * æ•…障部位
     */
    @Excel(name = "故障部位", width = 15)
    @ApiModelProperty(value = "故障部位")
    private String faultPart;

    /**
     * æ•…障子部位
     */
    @Excel(name = "故障子部位", width = 15)
    @ApiModelProperty(value = "故障子部位")
    private String faultChildPart;

    /**
     * ä¸¥é‡ç¨‹åº¦
     */
    @Excel(name = "严重程度", width = 15)
    @ApiModelProperty(value = "严重程度")
    @Dict(dicCode = "repair_severity")
    private String severity;
    /**
     * ç»´ä¿®ç»“果描述
     */

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

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

import com.baomidou.mybatisplus.annotation.*;
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.constant.CommonConstant;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

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

/**
 * @Description: eam_repair_warehouse
 * @Author: jeecg-boot
 * @Date:   2025-09-05
 * @Version: V1.0
 */
@Data
@TableName("eam_repair_warehouse")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_repair_warehouse对象", description="维修知识库")
public class RepairWarehouse 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;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**故障类型*/
    @Excel(name = "故障类型", width = 15,dicCode = "repair_warehouse_fault_type")
    @ApiModelProperty(value = "故障类型")
    @Dict(dicCode = "repair_warehouse_fault_type")
    private String faultType;
    /**故障部位*/
    @Excel(name = "故障部位", width = 15)
    @ApiModelProperty(value = "故障部位")
    private String faultPart;
    /**故障子部位*/
    @Excel(name = "故障子部位", width = 15)
    @ApiModelProperty(value = "故障子部位")
    private String faultChildPart;
    /**维修描述*/
    @Excel(name = "维修描述", width = 15)
    @ApiModelProperty(value = "维修描述")
    private String repairDescription;
    /**需要返回的字段*/
    @ApiModelProperty(value = "需要返回的字段")
    @TableField(exist = false)
    private String column;
}

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.RepairWarehouse;

import java.util.List;

/**
 * @Description: eam_repair_warehouse
 * @Author: jeecg-boot
 * @Date:   2025-09-05
 * @Version: V1.0
 */
public interface RepairWarehouseMapper extends BaseMapper<RepairWarehouse> {

    List<String> getColumnDateList(@Param("repairWarehouse") RepairWarehouse repairWarehouse);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
<?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.RepairWarehouseMapper">

    <select id="getColumnDateList" resultType="java.lang.String">
        select
            distinct ${repairWarehouse.column}
        from eam_repair_warehouse
        where del_flag = '0'
        <if test="repairWarehouse.faultType != null and repairWarehouse.faultType != '' ">
            AND fault_type = #{repairWarehouse.faultType}
        </if>
        <if test="repairWarehouse.faultPart != null and repairWarehouse.faultPart != '' ">
            AND fault_part LIKE CONCAT(CONCAT('%',#{repairWarehouse.faultPart}),'%')
        </if>
        <if test="repairWarehouse.faultChildPart != null and repairWarehouse.faultChildPart != '' ">
            AND fault_child_part LIKE CONCAT(CONCAT('%',#{repairWarehouse.faultChildPart}),'%')
        </if>
        <if test="repairWarehouse.repairDescription != null and repairWarehouse.repairDescription != '' ">
            AND repair_description LIKE CONCAT(CONCAT('%',#{repairWarehouse.repairDescription}),'%')
        </if>
    </select>
</mapper>

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

@@ -5,6 +5,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;

import java.io.Serializable;
@@ -35,6 +36,33 @@
     */
    @ApiModelProperty(value = "故障原因")
    private String faultReason;

    /**
     * æ•…障类型
     */
    @ApiModelProperty(value = "故障类型")
    @Dict(dicCode = "repair_warehouse_fault_type")
    private String faultType;

    /**
     * æ•…障部位
     */
    @ApiModelProperty(value = "故障部位")
    private String faultPart;

    /**
     * æ•…障子部位
     */
    @ApiModelProperty(value = "故障子部位")
    private String faultChildPart;

    /**
     * ä¸¥é‡ç¨‹åº¦
     */
    @ApiModelProperty(value = "严重程度")
    @Dict(dicCode = "repair_severity")
    private String severity;

    /**
     * ç»´ä¿®ç»“果描述
     */

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

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

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

import java.util.List;

/**
 * @Description: eam_repair_warehouse
 * @Author: jeecg-boot
 * @Date:   2025-09-05
 * @Version: V1.0
 */
public interface IRepairWarehouseService extends IService<RepairWarehouse> {

    void add(RepairWarehouse repairWarehouse);

    void saveData(RepairWarehouse repairWarehouse);

    void edit(RepairWarehouse repairWarehouse);

    List<String> getColumnDateList(RepairWarehouse repairWarehouse);
}

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

@@ -24,15 +24,13 @@
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.entity.RepairWarehouse;
import org.jeecg.modules.eam.mapper.EamRepairOrderMapper;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.request.EamRepairOrderRequest;
import org.jeecg.modules.eam.request.EamRepairOrderResponse;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.util.DateUtils;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
@@ -91,6 +89,9 @@

    @Autowired
    private ISysUserService sysUserService;

    @Autowired
    private IRepairWarehouseService repairWarehouseService;

    /**
     * åˆ†é¡µåˆ—表
@@ -299,6 +300,8 @@
        Map<String, Object> values = new HashMap<>();
        List<UserSelector> userSelectors;
        List<String> userApprovalList;

        RepairWarehouse repairWarehouse = null;
        switch (status) {
            case WAIT_INTERNAL_CONFIRM:
                order.setRepairConfirm(request.getRepairConfirm());
@@ -345,6 +348,17 @@
                order.setFaultReason(request.getFaultReason());
                order.setRepairDescription(request.getRepairDescription());
                order.setActualEndTime(new Date());
                order.setFaultType(request.getFaultType());
                order.setFaultPart(request.getFaultPart());
                order.setFaultChildPart(request.getFaultChildPart());
                order.setSeverity(request.getSeverity());
                order.setRepairDescription(request.getRepairDescription());

                //保存维修知识库
                repairWarehouse = new RepairWarehouse();
                BeanUtils.copyProperties(request, repairWarehouse);
                repairWarehouseService.saveData(repairWarehouse);

                // å¤„理附件
                if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
                    List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -432,6 +446,17 @@
                order.setFaultReason(request.getFaultReason());
                order.setRepairDescription(request.getRepairDescription());
                order.setActualEndTime(new Date());
                order.setFaultType(request.getFaultType());
                order.setFaultPart(request.getFaultPart());
                order.setFaultChildPart(request.getFaultChildPart());
                order.setSeverity(request.getSeverity());
                order.setRepairDescription(request.getRepairDescription());

                //保存维修知识库
                repairWarehouse = new RepairWarehouse();
                BeanUtils.copyProperties(request, repairWarehouse);
                repairWarehouseService.saveData(repairWarehouse);

                // å¤„理附件
                if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
                    List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -459,6 +484,17 @@
                order.setFaultReason(request.getFaultReason());
                order.setRepairDescription(request.getRepairDescription());
                order.setActualEndTime(new Date());
                order.setFaultType(request.getFaultType());
                order.setFaultPart(request.getFaultPart());
                order.setFaultChildPart(request.getFaultChildPart());
                order.setSeverity(request.getSeverity());
                order.setRepairDescription(request.getRepairDescription());

                //保存维修知识库
                repairWarehouse = new RepairWarehouse();
                BeanUtils.copyProperties(request, repairWarehouse);
                repairWarehouseService.saveData(repairWarehouse);

                // å¤„理附件
                if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
                    List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.eam.entity.RepairWarehouse;
import org.jeecg.modules.eam.mapper.RepairWarehouseMapper;
import org.jeecg.modules.eam.service.IRepairWarehouseService;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.List;
import java.util.Objects;

/**
 * @Description: eam_repair_warehouse
 * @Author: jeecg-boot
 * @Date:   2025-09-05
 * @Version: V1.0
 */
@Service
@Slf4j
public class RepairWarehouseServiceImpl extends ServiceImpl<RepairWarehouseMapper, RepairWarehouse> implements IRepairWarehouseService {

    // å®šä¹‰åˆæ³•çš„字段名白名单
    private static final List<String> ALLOWED_COLUMNS = Arrays.asList(
            "fault_part", "fault_child_part", "repair_description"
    );
    /**
     * ä¿å­˜æ•°æ®
     * @param repairWarehouse
     */
    @Override
    public void add(RepairWarehouse repairWarehouse) {
        checkData(repairWarehouse);
        this.save(repairWarehouse);
    }

    @Override
    public void saveData(RepairWarehouse repairWarehouse) {

        RepairWarehouse warehouse = this.getOne(new LambdaQueryWrapper<RepairWarehouse>()
                .eq(RepairWarehouse::getFaultType, repairWarehouse.getFaultType())
                .eq(RepairWarehouse::getFaultPart, repairWarehouse.getFaultPart())
                .eq(RepairWarehouse::getFaultChildPart, repairWarehouse.getFaultChildPart())
                .eq(RepairWarehouse::getRepairDescription, repairWarehouse.getRepairDescription())
        );

        if(Objects.isNull(warehouse)) {
            this.save(repairWarehouse);
        }
    }

    @Override
    public void edit(RepairWarehouse repairWarehouse) {
        checkData(repairWarehouse);
        this.updateById(repairWarehouse);
    }

    @Override
    public List<String> getColumnDateList(RepairWarehouse repairWarehouse) {

        if (StringUtils.isBlank(repairWarehouse.getColumn()) || !ALLOWED_COLUMNS.contains(repairWarehouse.getColumn())) {
            throw new JeecgBootException("所需查询字段值无效");
        }
        return this.baseMapper.getColumnDateList(repairWarehouse);
    }

    private void checkData(RepairWarehouse repairWarehouse) {

        if(Objects.isNull(repairWarehouse)) {
            throw new JeecgBootException("数据不能为空");
        }

        if (StringUtils.isBlank(repairWarehouse.getFaultType())) {
            throw new JeecgBootException("故障类型不能为空");
        }

        if (StringUtils.isBlank(repairWarehouse.getFaultPart())) {
            throw new JeecgBootException("故障部位不能为空");
        }

        if (StringUtils.isBlank(repairWarehouse.getFaultChildPart())) {
            throw new JeecgBootException("故障子部位不能为空");
        }

        if (StringUtils.isBlank(repairWarehouse.getRepairDescription())) {
            throw new JeecgBootException("维修描述不能为空");
        }

        RepairWarehouse warehouse = this.getOne(new LambdaQueryWrapper<RepairWarehouse>()
                .eq(RepairWarehouse::getFaultType, repairWarehouse.getFaultType())
                .eq(RepairWarehouse::getFaultPart, repairWarehouse.getFaultPart())
                .eq(RepairWarehouse::getFaultChildPart, repairWarehouse.getFaultChildPart())
                .eq(RepairWarehouse::getRepairDescription, repairWarehouse.getRepairDescription())
                .le(StringUtils.isNotEmpty(repairWarehouse.getId()), RepairWarehouse::getId, repairWarehouse.getId())
        );

        if(Objects.nonNull(warehouse)) {
            throw new JeecgBootException("已存在该知识库");
        }
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.RepairWarehouse;
import org.jeecg.modules.eam.service.IRepairWarehouseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

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

/**
 * @Description: eam_repair_warehouse
 * @Author: jeecg-boot
 * @Date:   2025-09-05
 * @Version: V1.0
 */
@Api(tags="维修知识库")
@RestController
@RequestMapping("/repairWarehouse/repairWarehouse")
@Slf4j
public class RepairWarehouseController extends JeecgController<RepairWarehouse, IRepairWarehouseService> {
    @Autowired
    private IRepairWarehouseService repairWarehouseService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param repairWarehouse
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "eam_repair_warehouse-分页列表查询")
    @ApiOperation(value="eam_repair_warehouse-分页列表查询", notes="eam_repair_warehouse-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<RepairWarehouse>> queryPageList(RepairWarehouse repairWarehouse,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<RepairWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(repairWarehouse, req.getParameterMap());
        Page<RepairWarehouse> page = new Page<RepairWarehouse>(pageNo, pageSize);
        IPage<RepairWarehouse> pageList = repairWarehouseService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * è®¾å¤‡ç»´ä¿®æµç¨‹-根据查询条件查询指定字段数据
     *
     * @param repairWarehouse
     * @return
     */
    //@AutoLog(value = "eam_repair_warehouse-分页列表查询")
    @ApiOperation(value="根据查询条件查询指定字段数据", notes="根据查询条件查询指定字段数据")
    @GetMapping(value = "/getColumnDateList")
    public Result<?> getColumnDateList(RepairWarehouse repairWarehouse) {
        List<String> list = repairWarehouseService.getColumnDateList(repairWarehouse);
        return Result.OK(list);
    }
	
    /**
     *   æ·»åŠ 
     *
     * @param repairWarehouse
     * @return
     */
    @AutoLog(value = "eam_repair_warehouse-添加")
    @ApiOperation(value="eam_repair_warehouse-添加", notes="eam_repair_warehouse-添加")
    //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody RepairWarehouse repairWarehouse) {
        repairWarehouseService.add(repairWarehouse);
        return Result.OK("添加成功！");
    }
	
    /**
     *  ç¼–辑
     *
     * @param repairWarehouse
     * @return
     */
    @AutoLog(value = "eam_repair_warehouse-编辑")
    @ApiOperation(value="eam_repair_warehouse-编辑", notes="eam_repair_warehouse-编辑")
    //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody RepairWarehouse repairWarehouse) {
        repairWarehouseService.edit(repairWarehouse);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "eam_repair_warehouse-通过id删除")
    @ApiOperation(value="eam_repair_warehouse-通过id删除", notes="eam_repair_warehouse-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        repairWarehouseService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "eam_repair_warehouse-批量删除")
    @ApiOperation(value="eam_repair_warehouse-批量删除", notes="eam_repair_warehouse-批量删除")
    //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.repairWarehouseService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "eam_repair_warehouse-通过id查询")
    @ApiOperation(value="eam_repair_warehouse-通过id查询", notes="eam_repair_warehouse-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<RepairWarehouse> queryById(@RequestParam(name="id",required=true) String id) {
        RepairWarehouse repairWarehouse = repairWarehouseService.getById(id);
        if(repairWarehouse==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(repairWarehouse);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param repairWarehouse
    */
    //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, RepairWarehouse repairWarehouse) {
        return super.exportXls(request, repairWarehouse, RepairWarehouse.class, "eam_repair_warehouse");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("eam_repair_warehouse:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, RepairWarehouse.class);
    }

}