From d899fdf3d3cfa752988b7f977cab6e618322863f Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Fri, 20 Jun 2025 15:57:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(smartfactory):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=92=8C=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=8E=A5=E6=94=B6-=20=E5=9C=A8=20FactoryInfoController=20?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20getList=20=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=8E=B7=E5=8F=96=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E5=92=8C=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8=20-=20=E5=9C=A8?= =?UTF-8?q?=20FactoryInfoService=20=E6=8E=A5=E5=8F=A3=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20getList=20=E6=96=B9=E6=B3=95=20-=20=E5=9C=A8=20Fact?= =?UTF-8?q?oryInfoServiceImpl=20=E4=B8=AD=E5=AE=9E=E7=8E=B0=20getList=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20-=20=E4=BC=98=E5=8C=96=20StaffSalaryApi=20?= =?UTF-8?q?=E4=B8=AD=20updateIsGrant=20=E6=96=B9=E6=B3=95=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8E=A5=E6=94=B6=EF=BC=8C=E5=85=81=E8=AE=B8?= =?UTF-8?q?=20ids=20=E5=8F=82=E6=95=B0=E4=B8=BA=E5=8F=AF=E9=80=89=20-=20?= =?UTF-8?q?=E5=9C=A8=20StaffController=20=E4=B8=AD=E4=B8=BA=20exportStaffE?= =?UTF-8?q?xcel=20=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BB=A5=E7=AD=9B=E9=80=89=E6=9C=89?= =?UTF-8?q?=E6=95=88=E5=91=98=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smartfactory/api/staffSalary/StaffSalaryApi.java | 2 +- .../admin/factoryinfo/FactoryInfoController.java | 9 +++++++++ .../controller/admin/staff/StaffController.java | 1 + .../service/factoryinfo/FactoryInfoService.java | 6 ++++++ .../service/factoryinfo/FactoryInfoServiceImpl.java | 8 ++++++++ 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/zn-module-smartfactory/zn-module-smartfactory-api/src/main/java/cn/iocoder/yudao/module/smartfactory/api/staffSalary/StaffSalaryApi.java b/zn-module-smartfactory/zn-module-smartfactory-api/src/main/java/cn/iocoder/yudao/module/smartfactory/api/staffSalary/StaffSalaryApi.java index 5d7f0753..bfe6027b 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-api/src/main/java/cn/iocoder/yudao/module/smartfactory/api/staffSalary/StaffSalaryApi.java +++ b/zn-module-smartfactory/zn-module-smartfactory-api/src/main/java/cn/iocoder/yudao/module/smartfactory/api/staffSalary/StaffSalaryApi.java @@ -19,6 +19,6 @@ public interface StaffSalaryApi { @PutMapping(PREFIX + "/updateIsGrant") @Operation(summary = "更新是否已发放薪资") - CommonResult updateIsGrant(@RequestParam("ids") Collection ids, + CommonResult updateIsGrant(@RequestParam(value = "ids", required = false) Collection ids, @RequestParam("isGrant") Integer isGrant); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/FactoryInfoController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/FactoryInfoController.java index 3fff6d95..a0491eff 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/FactoryInfoController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/FactoryInfoController.java @@ -96,6 +96,15 @@ public class FactoryInfoController { return success(respVO); } + @GetMapping("/list") + @Operation(summary = "获得工厂以及公司列表 | 用于前端下拉框") + @PreAuthorize("@ss.hasPermission('smartfactory:factory-info:query')") + public CommonResult> getList() { + + List factoryInfo = factoryInfoService.getList(); + return success(BeanUtils.toBean(factoryInfo, FactorySimpleRespVO.class)); + } + @GetMapping("/simple-list") @Operation(summary = "获得工厂列表 | 用于前端下拉框") @PreAuthorize("@ss.hasPermission('smartfactory:factory-info:query')") diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java index 3583433f..40570e71 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java @@ -139,6 +139,7 @@ public class StaffController { public void exportStaffExcel(@Valid StaffPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + pageReqVO.setStatus(1); List list = staffService.getStaffPage(pageReqVO).getList(); // 获取工种字典值 diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java index f2b154b9..bc74939f 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java @@ -158,4 +158,10 @@ public interface FactoryInfoService { * @return 工厂列表 */ List getFactoryListByLoginUser(); + + /** + * 获得工厂以及公司列表 + * @return 工厂列表 + */ + List getList(); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java index f45d0964..26f8821b 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java @@ -422,4 +422,12 @@ public class FactoryInfoServiceImpl implements FactoryInfoService { return factoryInfoMapper.selectListByType(factoryIds); } + + @Override + public List getList() { + + return factoryInfoMapper.selectList(new LambdaQueryWrapperX() + .eq(FactoryInfoDO::getStatus, CommonStatusEnum.ENABLE.getStatus()) + .orderByAsc(FactoryInfoDO::getType)); + } }