新增调拨转移模块

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/controller/DeviceAbnormalItemController.java

@@ -0,0 +1,176 @@
+package org.jeecg.modules.deviceManage.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.apache.shiro.authz.annotation.RequiresPermissions;
+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.deviceManage.entity.DeviceAbnormalItem;
+import org.jeecg.modules.deviceManage.service.IDeviceAbnormalItemService;
+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: 设备关联异常
+ * @Author: jeecg-boot
+ * @Date: 2025-04-15
+ * @Version: V1.0
+ */
+@Api(tags = "设备关联异常")
+@RestController
+@RequestMapping("/deviceInfo/deviceAbnormalItem")
+@Slf4j
+public class DeviceAbnormalItemController extends JeecgController<DeviceAbnormalItem, IDeviceAbnormalItemService> {
+    @Autowired
+    private IDeviceAbnormalItemService deviceAbnormalItemService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param deviceAbnormalItem
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "设备关联异常-分页列表查询")
+    @ApiOperation(value = "设备关联异常-分页列表查询", notes = "设备关联异常-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<DeviceAbnormalItem>> queryPageList(DeviceAbnormalItem deviceAbnormalItem,
+                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                           HttpServletRequest req) {
+        QueryWrapper<DeviceAbnormalItem> queryWrapper = QueryGenerator.initQueryWrapper(deviceAbnormalItem, req.getParameterMap());
+        Page<DeviceAbnormalItem> page = new Page<DeviceAbnormalItem>(pageNo, pageSize);
+        IPage<DeviceAbnormalItem> pageList = deviceAbnormalItemService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param deviceAbnormalItem
+     * @return
+     */
+    @AutoLog(value = "设备关联异常-添加")
+    @ApiOperation(value = "设备关联异常-添加", notes = "设备关联异常-添加")
+    @RequiresPermissions("deviceInfo:device_abnormal_item:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody DeviceAbnormalItem deviceAbnormalItem) {
+        deviceAbnormalItemService.save(deviceAbnormalItem);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param deviceAbnormalItem
+     * @return
+     */
+    @AutoLog(value = "设备关联异常-编辑")
+    @ApiOperation(value = "设备关联异常-编辑", notes = "设备关联异常-编辑")
+    @RequiresPermissions("deviceInfo:device_abnormal_item:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody DeviceAbnormalItem deviceAbnormalItem) {
+        deviceAbnormalItemService.updateById(deviceAbnormalItem);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "设备关联异常-通过id删除")
+    @ApiOperation(value = "设备关联异常-通过id删除", notes = "设备关联异常-通过id删除")
+    @RequiresPermissions("deviceInfo:device_abnormal_item:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        deviceAbnormalItemService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "设备关联异常-批量删除")
+    @ApiOperation(value = "设备关联异常-批量删除", notes = "设备关联异常-批量删除")
+    @RequiresPermissions("deviceInfo:device_abnormal_item:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.deviceAbnormalItemService.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<DeviceAbnormalItem> queryById(@RequestParam(name = "id", required = true) String id) {
+        DeviceAbnormalItem deviceAbnormalItem = deviceAbnormalItemService.getById(id);
+        if (deviceAbnormalItem == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(deviceAbnormalItem);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param deviceAbnormalItem
+     */
+    @RequiresPermissions("deviceInfo:device_abnormal_item:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, DeviceAbnormalItem deviceAbnormalItem) {
+        return super.exportXls(request, deviceAbnormalItem, DeviceAbnormalItem.class, "设备关联异常");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("deviceInfo:device_abnormal_item:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, DeviceAbnormalItem.class);
+    }
+
+    /**
+     * 通过deviceId查询
+     *
+     * @param deviceId
+     * @return
+     */
+    @ApiOperation(value = "关联异常根据设备ID查询", notes = "关联异常根据设备ID查询")
+    @GetMapping(value = "/queryAbnormalByDeviceId")
+    public Result<List<DeviceAbnormalItem>> queryAbnormalByDeviceId(@RequestParam(name = "deviceId", required = true) String deviceId) {
+        List<DeviceAbnormalItem> deviceAbnormalItems = deviceAbnormalItemService.selectByDeviceId(deviceId);
+        return Result.OK(deviceAbnormalItems);
+    }
+
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/entity/DeviceAbnormalItem.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.deviceManage.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 设备关联异常
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+@Data
+@TableName("device_abnormal_item")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="device_abnormal_item对象", description="设备关联异常")
+public class DeviceAbnormalItem implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**日期*/
+	@Excel(name = "日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "日期")
+    private Date createDate;
+	/**设备编号*/
+	@Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+    private String deviceNumber;
+	/**设备名称*/
+	@Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+	/**异常项序号*/
+	@Excel(name = "异常项序号", width = 15)
+    @ApiModelProperty(value = "异常项序号")
+    private Integer abnormalItemNumber;
+	/**异常项目*/
+	@Excel(name = "异常项目", width = 15)
+    @ApiModelProperty(value = "异常项目")
+    private String abnormalItem;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private String description;
+	/**异常状态，如未处理、已报修、已消除等*/
+	@Excel(name = "异常状态，如未处理、已报修、已消除等", width = 15)
+    @ApiModelProperty(value = "异常状态，如未处理、已报修、已消除等")
+    private String abnormalStatus;
+	/**设备id*/
+	@Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private String deviceId;
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/mapper/DeviceAbnormalItemMapper.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.deviceManage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.deviceManage.entity.DeviceAbnormalItem;
+import org.jeecg.modules.purchaseManage.equipmentAccept.entity.EquipmentAccept;
+
+import java.util.List;
+
+/**
+ * @Description: 设备关联异常
+ * @Author: jeecg-boot
+ * @Date: 2025-04-15
+ * @Version: V1.0
+ */
+public interface DeviceAbnormalItemMapper extends BaseMapper<DeviceAbnormalItem> {
+
+    /**
+     * 通过设备id查询异常数据
+     *
+     * @param deviceId 设备id
+     * @return List<DeviceAbnormalItem>
+     */
+     List<DeviceAbnormalItem> selectByDeviceId(@Param("deviceId") String deviceId);
+
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/mapper/xml/DeviceAbnormalItemMapper.xml

@@ -0,0 +1,11 @@
+<?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.deviceManage.mapper.DeviceAbnormalItemMapper">
+
+    <select id="selectByDeviceId" parameterType="java.lang.String"
+            resultType="org.jeecg.modules.deviceManage.entity.DeviceAbnormalItem">
+        SELECT *
+        FROM device_abnormal_item
+        WHERE device_id = #{deviceId}    </select>
+
+</mapper>

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/service/IDeviceAbnormalItemService.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.deviceManage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.deviceManage.entity.DeviceAbnormalItem;
+
+import java.util.List;
+
+/**
+ * @Description: 设备关联异常
+ * @Author: jeecg-boot
+ * @Date: 2025-04-15
+ * @Version: V1.0
+ */
+public interface IDeviceAbnormalItemService extends IService<DeviceAbnormalItem> {
+
+    List<DeviceAbnormalItem> selectByDeviceId(String deviceId);
+
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/service/impl/DeviceAbnormalItemServiceImpl.java

@@ -0,0 +1,29 @@
+package org.jeecg.modules.deviceManage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.deviceManage.entity.DeviceAbnormalItem;
+import org.jeecg.modules.deviceManage.mapper.DeviceAbnormalItemMapper;
+import org.jeecg.modules.deviceManage.service.IDeviceAbnormalItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: 设备关联异常
+ * @Author: jeecg-boot
+ * @Date: 2025-04-15
+ * @Version: V1.0
+ */
+@Service
+public class DeviceAbnormalItemServiceImpl extends ServiceImpl<DeviceAbnormalItemMapper, DeviceAbnormalItem> implements IDeviceAbnormalItemService {
+
+    @Autowired
+    private DeviceAbnormalItemMapper deviceAbnormalItemMapper;
+
+    @Override
+    public List<DeviceAbnormalItem> selectByDeviceId(String deviceId) {
+
+        return deviceAbnormalItemMapper.selectByDeviceId(deviceId);
+    }
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/controller/DeviceTransferController.java

@@ -0,0 +1,341 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.CommonAPI;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.DeviceTransfer;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferAttachments;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferItem;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.service.IDeviceTransferService;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.service.ITransferAttachmentsService;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.service.ITransferItemService;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.vo.DeviceTransferPage;
+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.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 设备调拨转移
+ * @Author: jeecg-boot
+ * @Date: 2025-04-15
+ * @Version: V1.0
+ */
+@Api(tags = "设备调拨转移")
+@RestController
+@RequestMapping("/equipmentDisposal/deviceTransfer")
+@Slf4j
+public class DeviceTransferController {
+
+    @Lazy
+    @Resource
+    private CommonAPI commonApi;
+
+    @Lazy
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Autowired
+    private IDeviceTransferService deviceTransferService;
+    @Autowired
+    private ITransferAttachmentsService transferAttachmentsService;
+    @Autowired
+    private ITransferItemService transferItemService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param deviceTransfer
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "设备调拨转移-分页列表查询")
+    @ApiOperation(value = "设备调拨转移-分页列表查询", notes = "设备调拨转移-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<DeviceTransfer>> queryPageList(DeviceTransfer deviceTransfer,
+                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                       HttpServletRequest req) {
+        QueryWrapper<DeviceTransfer> queryWrapper = QueryGenerator.initQueryWrapper(deviceTransfer, req.getParameterMap());
+        Page<DeviceTransfer> page = new Page<DeviceTransfer>(pageNo, pageSize);
+        IPage<DeviceTransfer> pageList = deviceTransferService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param deviceTransferPage
+     * @return
+     */
+    @AutoLog(value = "设备调拨转移-添加")
+    @ApiOperation(value = "设备调拨转移-添加", notes = "设备调拨转移-添加")
+    @RequiresPermissions("equipmentDisposal:device_transfer:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody DeviceTransferPage deviceTransferPage) {
+        DeviceTransfer deviceTransfer = new DeviceTransfer();
+        BeanUtils.copyProperties(deviceTransferPage, deviceTransfer);
+        deviceTransferService.saveMain(deviceTransfer, deviceTransferPage.getTransferAttachmentsList(), deviceTransferPage.getTransferItemList());
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param deviceTransferPage
+     * @return
+     */
+    @AutoLog(value = "设备调拨转移-编辑")
+    @ApiOperation(value = "设备调拨转移-编辑", notes = "设备调拨转移-编辑")
+    @RequiresPermissions("equipmentDisposal:device_transfer:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody DeviceTransferPage deviceTransferPage) {
+        DeviceTransfer deviceTransfer = new DeviceTransfer();
+        BeanUtils.copyProperties(deviceTransferPage, deviceTransfer);
+        DeviceTransfer deviceTransferEntity = deviceTransferService.getById(deviceTransfer.getId());
+        if (deviceTransferEntity == null) {
+            return Result.error("未找到对应数据");
+        }
+        deviceTransferService.updateMain(deviceTransfer, deviceTransferPage.getTransferAttachmentsList(), deviceTransferPage.getTransferItemList());
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "设备调拨转移-通过id删除")
+    @ApiOperation(value = "设备调拨转移-通过id删除", notes = "设备调拨转移-通过id删除")
+    @RequiresPermissions("equipmentDisposal:device_transfer:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        deviceTransferService.delMain(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "设备调拨转移-批量删除")
+    @ApiOperation(value = "设备调拨转移-批量删除", notes = "设备调拨转移-批量删除")
+    @RequiresPermissions("equipmentDisposal:device_transfer:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.deviceTransferService.delBatchMain(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功！");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "设备调拨转移-通过id查询")
+    @ApiOperation(value = "设备调拨转移-通过id查询", notes = "设备调拨转移-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<DeviceTransfer> queryById(@RequestParam(name = "id", required = true) String id) {
+        DeviceTransfer deviceTransfer = deviceTransferService.getById(id);
+        if (deviceTransfer == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(deviceTransfer);
+
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "调拨详情--相关附件通过主表ID查询")
+    @ApiOperation(value = "调拨详情--相关附件主表ID查询", notes = "调拨详情--相关附件-通主表ID查询")
+    @GetMapping(value = "/queryTransferAttachmentsByMainId")
+    public Result<List<TransferAttachments>> queryTransferAttachmentsListByMainId(@RequestParam(name = "id", required = true) String id) {
+        List<TransferAttachments> transferAttachmentsList = transferAttachmentsService.selectByMainId(id);
+        return Result.OK(transferAttachmentsList);
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "设备调拨转移--调拨列表通过主表ID查询")
+    @ApiOperation(value = "设备调拨转移--调拨列表主表ID查询", notes = "设备调拨转移--调拨列表-通主表ID查询")
+    @GetMapping(value = "/queryTransferItemByMainId")
+    public Result<List<TransferItem>> queryTransferItemListByMainId(@RequestParam(name = "id", required = true) String id) {
+        List<TransferItem> transferItemList = transferItemService.selectByMainId(id);
+        return Result.OK(transferItemList);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param deviceTransfer
+     */
+    @RequiresPermissions("equipmentDisposal:device_transfer:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, DeviceTransfer deviceTransfer) {
+        // Step.1 组装查询条件查询数据
+        QueryWrapper<DeviceTransfer> queryWrapper = QueryGenerator.initQueryWrapper(deviceTransfer, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        //配置选中数据查询条件
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id", selectionList);
+        }
+        //Step.2 获取导出数据
+        List<DeviceTransfer> deviceTransferList = deviceTransferService.list(queryWrapper);
+
+        // Step.3 组装pageList
+        List<DeviceTransferPage> pageList = new ArrayList<DeviceTransferPage>();
+        for (DeviceTransfer main : deviceTransferList) {
+            DeviceTransferPage vo = new DeviceTransferPage();
+            BeanUtils.copyProperties(main, vo);
+            List<TransferAttachments> transferAttachmentsList = transferAttachmentsService.selectByMainId(main.getId());
+            vo.setTransferAttachmentsList(transferAttachmentsList);
+            List<TransferItem> transferItemList = transferItemService.selectByMainId(main.getId());
+            vo.setTransferItemList(transferItemList);
+            pageList.add(vo);
+        }
+
+        // Step.4 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, "设备调拨转移列表");
+        mv.addObject(NormalExcelConstants.CLASS, DeviceTransferPage.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("设备调拨转移数据", "导出人:" + sysUser.getRealname(), "设备调拨转移"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("equipmentDisposal:device_transfer:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            // 获取上传文件对象
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<DeviceTransferPage> list = ExcelImportUtil.importExcel(file.getInputStream(), DeviceTransferPage.class, params);
+                for (DeviceTransferPage page : list) {
+                    DeviceTransfer po = new DeviceTransfer();
+                    BeanUtils.copyProperties(page, po);
+                    deviceTransferService.saveMain(po, page.getTransferAttachmentsList(), page.getTransferItemList());
+                }
+                return Result.OK("文件导入成功！数据行数:" + list.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.OK("文件导入失败！");
+    }
+
+    /**
+     * 分页列表查询(与我相关)
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "设备验收-分页列表查询(与我相关)", notes = "设备验收-分页列表查询(与我相关)")
+    @GetMapping(value = "/listByUser")
+    public Result<IPage<DeviceTransfer>> queryPageListByUser(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest req) {
+
+        LoginUser loginUser = TokenUtils.getLoginUser(req, commonApi, redisUtil);
+        // 构建查询条件
+        LambdaQueryWrapper<DeviceTransfer> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DeviceTransfer::getApplicant, loginUser.getId());
+        QueryGenerator.initQueryWrapper(queryWrapper, req.getParameterMap());
+        Page<DeviceTransfer> page = new Page<DeviceTransfer>(pageNo, pageSize);
+        IPage<DeviceTransfer> pageList = deviceTransferService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 分页列表查询
+     *
+     * @param transferItem
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "设备调拨记录-分页列表查询", notes = "设备调拨记录-分页列表查询")
+    @GetMapping(value = "/transferList")
+    public Result<IPage<TransferItem>> queryPageTransferList(TransferItem transferItem,
+                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     HttpServletRequest req) {
+        QueryWrapper<TransferItem> queryWrapper = QueryGenerator.initQueryWrapper(transferItem, req.getParameterMap());
+        Page<TransferItem> page = new Page<TransferItem>(pageNo, pageSize);
+        IPage<TransferItem> pageList = transferItemService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/entity/DeviceTransfer.java

@@ -0,0 +1,147 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 设备调拨转移
+ * @Author: jeecg-boot
+ * @Date: 2025-04-15
+ * @Version: V1.0
+ */
+@ApiModel(value = "device_transfer对象", description = "设备调拨转移")
+@Data
+@TableName("device_transfer")
+public class DeviceTransfer implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+    /**
+     * 日期
+     */
+    @Excel(name = "日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "日期")
+    private Date createDate;
+    /**
+     * 序号
+     */
+    @Excel(name = "序号", width = 15)
+    @ApiModelProperty(value = "序号")
+    private String serialNumber;
+    /**
+     * 调拨编号
+     */
+    @Excel(name = "调拨编号", width = 15)
+    @ApiModelProperty(value = "调拨编号")
+    private String transferNumber;
+    /**
+     * 申请时间
+     */
+    @Excel(name = "申请时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "申请时间")
+    private Date applicationTime;
+    /**
+     * 调拨类型，如公司内调拨、跨公司调拨
+     */
+    @Excel(name = "调拨类型，如公司内调拨、跨公司调拨", width = 15)
+    @ApiModelProperty(value = "调拨类型，如公司内调拨、跨公司调拨")
+    private String transferType;
+    /**
+     * 调出公司
+     */
+    @Excel(name = "调出公司", width = 15)
+    @ApiModelProperty(value = "调出公司")
+    private String outCompany;
+    /**
+     * 申请人
+     */
+    @Excel(name = "申请人", width = 15)
+    @ApiModelProperty(value = "申请人")
+    private String applicant;
+    /**
+     * 设备编号
+     */
+    @Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+    private String deviceNumber;
+    /**
+     * 设备名称
+     */
+    @Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+    /**
+     * 申请原因
+     */
+    @Excel(name = "申请原因", width = 15)
+    @ApiModelProperty(value = "申请原因")
+    private String applicationReason;
+    /**
+     * 当前节点
+     */
+    @Excel(name = "当前节点", width = 15)
+    @ApiModelProperty(value = "当前节点")
+    private String currentNode;
+    /**
+     * 审批状态，如进行中、已结束、已打回
+     */
+    @Excel(name = "审批状态，如进行中、已结束、已打回", width = 15)
+    @ApiModelProperty(value = "审批状态，如进行中、已结束、已打回")
+    private String approvalStatus;
+    /**
+     * 审批结束时间
+     */
+    @Excel(name = "审批结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "审批结束时间")
+    private Date approvalEndTime;
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/entity/TransferAttachments.java

@@ -0,0 +1,80 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 调拨详情--相关附件
+ * @Author: jeecg-boot
+ * @Date: 2025-04-15
+ * @Version: V1.0
+ */
+@ApiModel(value = "sbsmzq_transfer_attachments对象", description = "调拨详情--相关附件")
+@Data
+@TableName("sbsmzq_transfer_attachments")
+public class TransferAttachments 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 HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+    /**
+     * 文件名称
+     */
+    @Excel(name = "文件名称", width = 15)
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
+    /**
+     * 文件地址
+     */
+    @Excel(name = "文件地址", width = 15)
+    @ApiModelProperty(value = "文件地址")
+    private String fileAddress;
+    /**
+     * 调拨转移id
+     */
+    @ApiModelProperty(value = "调拨转移id")
+    private String transferId;
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/entity/TransferItem.java

@@ -0,0 +1,145 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 设备调拨转移--调拨列表
+ * @Author: jeecg-boot
+ * @Date: 2025-04-15
+ * @Version: V1.0
+ */
+@ApiModel(value = "sbsmzq_transfer_item对象", description = "设备调拨转移--调拨列表")
+@Data
+@TableName("sbsmzq_transfer_item")
+public class TransferItem 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 HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+    /**
+     * 设备编号
+     */
+    @Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+    private String deviceCode;
+    /**
+     * 设备名称
+     */
+    @Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+    /**
+     * 资产编号
+     */
+    @Excel(name = "资产编号", width = 15)
+    @ApiModelProperty(value = "资产编号")
+    private String assetCode;
+    /**
+     * 序列号
+     */
+    @Excel(name = "序列号", width = 15)
+    @ApiModelProperty(value = "序列号")
+    private String serialNumber;
+    /**
+     * 规格型号
+     */
+    @Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private String spec;
+    /**
+     * 调出部门
+     */
+    @Excel(name = "调出部门", width = 15)
+    @ApiModelProperty(value = "调出部门")
+    private String transferOutDept;
+    /**
+     * 调出地点
+     */
+    @Excel(name = "调出地点", width = 15)
+    @ApiModelProperty(value = "调出地点")
+    private String transferOutLocation;
+    /**
+     * 原负责人
+     */
+    @Excel(name = "原负责人", width = 15)
+    @ApiModelProperty(value = "原负责人")
+    private String originalResponsible;
+    /**
+     * 调入部门
+     */
+    @Excel(name = "调入部门", width = 15)
+    @ApiModelProperty(value = "调入部门")
+    private String transferInDept;
+    /**
+     * 调入地点
+     */
+    @Excel(name = "调入地点", width = 15)
+    @ApiModelProperty(value = "调入地点")
+    private String transferInLocation;
+    /**
+     * 新负责人
+     */
+    @Excel(name = "新负责人", width = 15)
+    @ApiModelProperty(value = "新负责人")
+    private String newResponsible;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 调拨转移id
+     */
+    @ApiModelProperty(value = "调拨转移id")
+    private String transferId;
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    private String deviceId;
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/mapper/DeviceTransferMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper;
+
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.DeviceTransfer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 设备调拨转移
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+public interface DeviceTransferMapper extends BaseMapper<DeviceTransfer> {
+
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/mapper/TransferAttachmentsMapper.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper;
+
+import java.util.List;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferAttachments;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: 调拨详情--相关附件
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+public interface TransferAttachmentsMapper extends BaseMapper<TransferAttachments> {
+
+	/**
+	 * 通过主表id删除子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return boolean
+	 */
+	public boolean deleteByMainId(@Param("mainId") String mainId);
+
+  /**
+   * 通过主表id查询子表数据
+   *
+   * @param mainId 主表id
+   * @return List<TransferAttachments>
+   */
+	public List<TransferAttachments> selectByMainId(@Param("mainId") String mainId);
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/mapper/TransferItemMapper.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper;
+
+import java.util.List;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: 设备调拨转移--调拨列表
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+public interface TransferItemMapper extends BaseMapper<TransferItem> {
+
+	/**
+	 * 通过主表id删除子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return boolean
+	 */
+	public boolean deleteByMainId(@Param("mainId") String mainId);
+
+  /**
+   * 通过主表id查询子表数据
+   *
+   * @param mainId 主表id
+   * @return List<TransferItem>
+   */
+	public List<TransferItem> selectByMainId(@Param("mainId") String mainId);
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/mapper/xml/DeviceTransferMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper.DeviceTransferMapper">
+
+</mapper>

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/mapper/xml/TransferAttachmentsMapper.xml

@@ -0,0 +1,16 @@
+<?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.equipmentDisposal.deviceTransfer.mapper.TransferAttachmentsMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  sbsmzq_transfer_attachments 
+		WHERE
+			 transfer_id = #{mainId} 	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferAttachments">
+		SELECT * 
+		FROM  sbsmzq_transfer_attachments
+		WHERE
+			 transfer_id = #{mainId} 	</select>
+</mapper>

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/mapper/xml/TransferItemMapper.xml

@@ -0,0 +1,16 @@
+<?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.equipmentDisposal.deviceTransfer.mapper.TransferItemMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  sbsmzq_transfer_item 
+		WHERE
+			 transfer_id = #{mainId} 	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferItem">
+		SELECT * 
+		FROM  sbsmzq_transfer_item
+		WHERE
+			 transfer_id = #{mainId} 	</select>
+</mapper>

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/service/IDeviceTransferService.java

@@ -0,0 +1,51 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.service;
+
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferAttachments;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferItem;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.DeviceTransfer;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Description: 设备调拨转移
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+public interface IDeviceTransferService extends IService<DeviceTransfer> {
+
+	/**
+	 * 添加一对多
+	 *
+	 * @param deviceTransfer
+	 * @param transferAttachmentsList
+	 * @param transferItemList
+	 */
+	public void saveMain(DeviceTransfer deviceTransfer,List<TransferAttachments> transferAttachmentsList,List<TransferItem> transferItemList) ;
+	
+	/**
+	 * 修改一对多
+	 *
+   * @param deviceTransfer
+   * @param transferAttachmentsList
+   * @param transferItemList
+	 */
+	public void updateMain(DeviceTransfer deviceTransfer,List<TransferAttachments> transferAttachmentsList,List<TransferItem> transferItemList);
+	
+	/**
+	 * 删除一对多
+	 *
+	 * @param id
+	 */
+	public void delMain (String id);
+	
+	/**
+	 * 批量删除一对多
+	 *
+	 * @param idList
+	 */
+	public void delBatchMain (Collection<? extends Serializable> idList);
+	
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/service/ITransferAttachmentsService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.service;
+
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferAttachments;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 调拨详情--相关附件
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+public interface ITransferAttachmentsService extends IService<TransferAttachments> {
+
+	/**
+	 * 通过主表id查询子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return List<TransferAttachments>
+	 */
+	public List<TransferAttachments> selectByMainId(String mainId);
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/service/ITransferItemService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.service;
+
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 设备调拨转移--调拨列表
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+public interface ITransferItemService extends IService<TransferItem> {
+
+	/**
+	 * 通过主表id查询子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return List<TransferItem>
+	 */
+	public List<TransferItem> selectByMainId(String mainId);
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/service/impl/DeviceTransferServiceImpl.java

@@ -0,0 +1,98 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.service.impl;
+
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.DeviceTransfer;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferAttachments;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferItem;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper.TransferAttachmentsMapper;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper.TransferItemMapper;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper.DeviceTransferMapper;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.service.IDeviceTransferService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
+
+/**
+ * @Description: 设备调拨转移
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+@Service
+public class DeviceTransferServiceImpl extends ServiceImpl<DeviceTransferMapper, DeviceTransfer> implements IDeviceTransferService {
+
+	@Autowired
+	private DeviceTransferMapper deviceTransferMapper;
+	@Autowired
+	private TransferAttachmentsMapper transferAttachmentsMapper;
+	@Autowired
+	private TransferItemMapper transferItemMapper;
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void saveMain(DeviceTransfer deviceTransfer, List<TransferAttachments> transferAttachmentsList,List<TransferItem> transferItemList) {
+		deviceTransferMapper.insert(deviceTransfer);
+		if(transferAttachmentsList!=null && transferAttachmentsList.size()>0) {
+			for(TransferAttachments entity:transferAttachmentsList) {
+				//外键设置
+				entity.setTransferId(deviceTransfer.getId());
+				transferAttachmentsMapper.insert(entity);
+			}
+		}
+		if(transferItemList!=null && transferItemList.size()>0) {
+			for(TransferItem entity:transferItemList) {
+				//外键设置
+				entity.setTransferId(deviceTransfer.getId());
+				transferItemMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateMain(DeviceTransfer deviceTransfer,List<TransferAttachments> transferAttachmentsList,List<TransferItem> transferItemList) {
+		deviceTransferMapper.updateById(deviceTransfer);
+		
+		//1.先删除子表数据
+		transferAttachmentsMapper.deleteByMainId(deviceTransfer.getId());
+		transferItemMapper.deleteByMainId(deviceTransfer.getId());
+		
+		//2.子表数据重新插入
+		if(transferAttachmentsList!=null && transferAttachmentsList.size()>0) {
+			for(TransferAttachments entity:transferAttachmentsList) {
+				//外键设置
+				entity.setTransferId(deviceTransfer.getId());
+				transferAttachmentsMapper.insert(entity);
+			}
+		}
+		if(transferItemList!=null && transferItemList.size()>0) {
+			for(TransferItem entity:transferItemList) {
+				//外键设置
+				entity.setTransferId(deviceTransfer.getId());
+				transferItemMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delMain(String id) {
+		transferAttachmentsMapper.deleteByMainId(id);
+		transferItemMapper.deleteByMainId(id);
+		deviceTransferMapper.deleteById(id);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delBatchMain(Collection<? extends Serializable> idList) {
+		for(Serializable id:idList) {
+			transferAttachmentsMapper.deleteByMainId(id.toString());
+			transferItemMapper.deleteByMainId(id.toString());
+			deviceTransferMapper.deleteById(id);
+		}
+	}
+	
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/service/impl/TransferAttachmentsServiceImpl.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.service.impl;
+
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferAttachments;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper.TransferAttachmentsMapper;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.service.ITransferAttachmentsService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 调拨详情--相关附件
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+@Service
+public class TransferAttachmentsServiceImpl extends ServiceImpl<TransferAttachmentsMapper, TransferAttachments> implements ITransferAttachmentsService {
+	
+	@Autowired
+	private TransferAttachmentsMapper transferAttachmentsMapper;
+	
+	@Override
+	public List<TransferAttachments> selectByMainId(String mainId) {
+		return transferAttachmentsMapper.selectByMainId(mainId);
+	}
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/service/impl/TransferItemServiceImpl.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.service.impl;
+
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferItem;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.mapper.TransferItemMapper;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.service.ITransferItemService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 设备调拨转移--调拨列表
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+@Service
+public class TransferItemServiceImpl extends ServiceImpl<TransferItemMapper, TransferItem> implements ITransferItemService {
+	
+	@Autowired
+	private TransferItemMapper transferItemMapper;
+	
+	@Override
+	public List<TransferItem> selectByMainId(String mainId) {
+		return transferItemMapper.selectByMainId(mainId);
+	}
+}

zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/equipmentDisposal/deviceTransfer/vo/DeviceTransferPage.java

@@ -0,0 +1,113 @@
+package org.jeecg.modules.equipmentDisposal.deviceTransfer.vo;
+
+import java.util.List;
+
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferAttachments;
+import org.jeecg.modules.equipmentDisposal.deviceTransfer.entity.TransferItem;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 设备调拨转移
+ * @Author: jeecg-boot
+ * @Date:   2025-04-15
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="device_transferPage对象", description="设备调拨转移")
+public class DeviceTransferPage {
+
+	/**id*/
+	@ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**创建人*/
+	@ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+	@ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+	/**所属部门*/
+	@ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**日期*/
+	@Excel(name = "日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "日期")
+    private java.util.Date createDate;
+	/**序号*/
+	@Excel(name = "序号", width = 15)
+	@ApiModelProperty(value = "序号")
+    private java.lang.String serialNumber;
+	/**调拨编号*/
+	@Excel(name = "调拨编号", width = 15)
+	@ApiModelProperty(value = "调拨编号")
+    private java.lang.String transferNumber;
+	/**申请时间*/
+	@Excel(name = "申请时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "申请时间")
+    private java.util.Date applicationTime;
+	/**调拨类型，如公司内调拨、跨公司调拨*/
+	@Excel(name = "调拨类型，如公司内调拨、跨公司调拨", width = 15)
+	@ApiModelProperty(value = "调拨类型，如公司内调拨、跨公司调拨")
+    private java.lang.String transferType;
+	/**调出公司*/
+	@Excel(name = "调出公司", width = 15)
+	@ApiModelProperty(value = "调出公司")
+    private java.lang.String outCompany;
+	/**申请人*/
+	@Excel(name = "申请人", width = 15)
+	@ApiModelProperty(value = "申请人")
+    private java.lang.String applicant;
+	/**设备编号*/
+	@Excel(name = "设备编号", width = 15)
+	@ApiModelProperty(value = "设备编号")
+    private java.lang.String deviceNumber;
+	/**设备名称*/
+	@Excel(name = "设备名称", width = 15)
+	@ApiModelProperty(value = "设备名称")
+    private java.lang.String deviceName;
+	/**申请原因*/
+	@Excel(name = "申请原因", width = 15)
+	@ApiModelProperty(value = "申请原因")
+    private java.lang.String applicationReason;
+	/**当前节点*/
+	@Excel(name = "当前节点", width = 15)
+	@ApiModelProperty(value = "当前节点")
+    private java.lang.String currentNode;
+	/**审批状态，如进行中、已结束、已打回*/
+	@Excel(name = "审批状态，如进行中、已结束、已打回", width = 15)
+	@ApiModelProperty(value = "审批状态，如进行中、已结束、已打回")
+    private java.lang.String approvalStatus;
+	/**审批结束时间*/
+	@Excel(name = "审批结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "审批结束时间")
+    private java.util.Date approvalEndTime;
+
+	@ExcelCollection(name="调拨详情--相关附件")
+	@ApiModelProperty(value = "调拨详情--相关附件")
+	private List<TransferAttachments> transferAttachmentsList;
+	@ExcelCollection(name="设备调拨转移--调拨列表")
+	@ApiModelProperty(value = "设备调拨转移--调拨列表")
+	private List<TransferItem> transferItemList;
+
+}

zgzt-sbsmzq/pom.xml

@@ -524,7 +524,7 @@
                 <!--当前环境-->
                 <profile.name>test</profile.name>
                 <!--Nacos服务地址-->
-                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
+                <config.server-addr>127.0.0.1:8848</config.server-addr>
 				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
 				<config.namespace></config.namespace>
 				<!--Nacos配置分组名称-->
@@ -542,7 +542,7 @@
                 <!--当前环境-->
                 <profile.name>prod</profile.name>
                 <!--Nacos服务地址-->
-                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
+                <config.server-addr>127.0.0.1:8848</config.server-addr>
 				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
 				<config.namespace></config.namespace>
 				<!--Nacos配置分组名称-->