diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java index 0ae2b98..18f8cf4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java @@ -100,6 +100,14 @@ public class DevChangeController extends BaseController { util.exportExcel(response, list, "设备流转台账"); } + @ApiOperation(value = "导出设备流转台账") + @PostMapping("/exportR") + public void exportR(HttpServletResponse response, CsDeviceChange csDeviceChange) { + List list = service.getDevChangeRList(csDeviceChange); + ExcelUtil util = new ExcelUtil(CsDeviceChange.class); + util.exportExcel(response, list, "设备流转台账"); + } + @ApiOperation(value = "设备流转台账记录") @GetMapping("/getDevChangeList") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceChangeVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceChangeVo.java index 064388b..50c020e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceChangeVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceChangeVo.java @@ -28,7 +28,7 @@ public class CsDeviceChangeVo { /** * 变更状前状态 */ - @Excel(name = "流转前状态", width = 20, sort = 4) + //@Excel(name = "流转前状态", width = 20, sort = 4) private String changeStatusName; private String changeStatus; @@ -73,7 +73,7 @@ public class CsDeviceChangeVo { /** * 使用单位 */ - @Excel(name = "使用单位", width = 25, sort = 6) + @Excel(name = "需求单位", width = 25, sort = 6) private String useUint; /** * 省 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java index a4dc415..bb624d7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java @@ -270,4 +270,6 @@ public interface DevChangeMapper { List getDevDetailsInfoTool(CsDeviceDetails dto); List getDevDetailsInfoEquipment(CsDeviceDetails dto); + + List getDevChangeRList(CsDeviceChange vo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java index ab5a3e1..4988350 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java @@ -535,6 +535,16 @@ public class DevChangeServiceImpl implements DevChangeService { } } + @Override + public List getDevChangeRList(CsDeviceChange vo) { + try { + return mapper.getDevChangeRList(vo); + } catch (Exception e) { + log.error(e.getMessage()); + } + return new ArrayList<>(); + } + /** * 获取待出库单子 * diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml index 49f104f..1a09ac9 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml @@ -766,6 +766,92 @@ ORDER BY CAST(voltage AS UNSIGNED); -- 将字符串转换为无符号整数 +