zhangherong
2025-05-15 8fb8d37784ce6c466f7142275e1eace2cb012e44
art: 设备管理-设备处置 报废 基础代码修改
已重命名2个文件
已添加4个文件
已删除4个文件
458 ■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentDisposeController.java 167 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java 167 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentDisposeMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentDisposeService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentDisposeServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentDisposeController.java
ÎļþÒÑɾ³ý
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,167 @@
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.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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
 /**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Author: jeecg-boot
 * @Date:   2025-05-15
 * @Version: V1.0
 */
@Slf4j
@Api(tags="设备报废(转让)")
@RestController
@RequestMapping("/eam/eamEquipmentScrap")
public class EamEquipmentScrapController extends JeecgController<EamEquipmentScrap, IEamEquipmentScrapService> {
    @Autowired
    private IEamEquipmentScrapService eamEquipmentScrapService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamEquipmentScrap
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "设备报废(转让)-分页列表查询")
    @ApiOperation(value="设备报废(转让)-分页列表查询", notes="设备报废(转让)-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamEquipmentScrap eamEquipmentScrap,
                                   @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);
        return Result.OK(pageList);
    }
    /**
     * æ·»åŠ 
     *
     * @param eamEquipmentScrap
     * @return
     */
    @AutoLog(value = "设备报废(转让)-添加")
    @ApiOperation(value="设备报废(转让)-添加", notes="设备报废(转让)-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamEquipmentScrap eamEquipmentScrap) {
        eamEquipmentScrapService.save(eamEquipmentScrap);
        return Result.OK("添加成功!");
    }
    /**
     * ç¼–辑
     *
     * @param eamEquipmentScrap
     * @return
     */
    @AutoLog(value = "设备报废(转让)-编辑")
    @ApiOperation(value="设备报废(转让)-编辑", notes="设备报废(转让)-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamEquipmentScrap eamEquipmentScrap) {
        eamEquipmentScrapService.updateById(eamEquipmentScrap);
        return Result.OK("编辑成功!");
    }
    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备报废(转让)-通过id删除")
    @ApiOperation(value="设备报废(转让)-通过id删除", notes="设备报废(转让)-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        eamEquipmentScrapService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "设备报废(转让)-批量删除")
    @ApiOperation(value="设备报废(转让)-批量删除", notes="设备报废(转让)-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamEquipmentScrapService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备报废(转让)-通过id查询")
    @ApiOperation(value="设备报废(转让)-通过id查询", notes="设备报废(转让)-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamEquipmentScrap eamEquipmentScrap = eamEquipmentScrapService.getById(id);
        return Result.OK(eamEquipmentScrap);
    }
  /**
   * å¯¼å‡º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
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamEquipmentScrap.class);
  }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
ÎļþÃû´Ó lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentDispose.java ÐÞ¸Ä
@@ -13,17 +13,17 @@
import java.io.Serializable;
import java.util.Date;
/**
 * @Description: è®¾å¤‡å¤„ç½®(转让报废)
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Date:   2025-05-15
 * @Version: V1.0
 */
@Data
@TableName("eam_equipment_dispose")
@TableName("eam_equipment_scrap")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="eam_equipment_dispose对象", description="设备处置(转让报废)")
public class EamEquipmentDispose implements Serializable {
@ApiModel(value="eam_equipment_scrap对象", description="设备报废(转让)")
public class EamEquipmentScrap implements Serializable {
    
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
@@ -58,26 +58,30 @@
    /**转让/报废*/
    @Excel(name = "转让/报废", width = 15)
    @ApiModelProperty(value = "转让/报废")
    private String disposeType;
    private String scrapType;
    /**申请人*/
    @Excel(name = "申请人", width = 15)
    @ApiModelProperty(value = "申请人")
    private String reportUser;
    /**处置时间*/
    @ApiModelProperty(value = "处置时间")
    private Date disposeTime;
    private Date scrapTime;
    /**处置理由*/
    @Excel(name = "处置理由", width = 15)
    @ApiModelProperty(value = "处置理由")
    private String disposeReason;
    private String scrapReason;
    /**处置金额*/
    @Excel(name = "处置金额", width = 15)
    @ApiModelProperty(value = "处置金额")
    private java.math.BigDecimal disposeAmount;
    private java.math.BigDecimal scrapAmount;
    /**审核人*/
    @Excel(name = "审核人", width = 15)
    @ApiModelProperty(value = "审核人")
    private String approvalUser;
    /**审核意见*/
    @Excel(name = "审核意见", width = 15)
    @ApiModelProperty(value = "审核意见")
    private String approvalComment;
    /**审核时间*/
    @ApiModelProperty(value = "审核时间")
    private Date approvalTime;
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentDisposeMapper.java
ÎļþÒÑɾ³ý
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.eam.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Author: jeecg-boot
 * @Date:   2025-05-15
 * @Version: V1.0
 */
public interface EamEquipmentScrapMapper extends BaseMapper<EamEquipmentScrap> {
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml
ÎļþÃû´Ó lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentDisposeMapper.xml ÐÞ¸Ä
@@ -1,5 +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.EamEquipmentDisposeMapper">
<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentScrapMapper">
</mapper>
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentDisposeService.java
ÎļþÒÑɾ³ý
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.service;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Author: jeecg-boot
 * @Date:   2025-05-15
 * @Version: V1.0
 */
public interface IEamEquipmentScrapService extends IService<EamEquipmentScrap> {
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentDisposeServiceImpl.java
ÎļþÒÑɾ³ý
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.eam.service.impl;
import org.jeecg.modules.eam.entity.EamEquipmentScrap;
import org.jeecg.modules.eam.mapper.EamEquipmentScrapMapper;
import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
 * @Description: è®¾å¤‡æŠ¥åºŸ(转让)
 * @Author: jeecg-boot
 * @Date:   2025-05-15
 * @Version: V1.0
 */
@Service
public class EamEquipmentScrapServiceImpl extends ServiceImpl<EamEquipmentScrapMapper, EamEquipmentScrap> implements IEamEquipmentScrapService {
}