添加 启用中的部门列表和启用中的供应商列表 的接口

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/DepartmentController.java

@@ -7,6 +7,7 @@ import com.abi.qms.platform.dto.req.ListDeptReq;
 import com.abi.qms.platform.dto.req.SaveDeptReq;
 import com.abi.qms.platform.dto.res.ExcelImportRes;
 import com.abi.qms.platform.dto.res.GetDeptDetailRes;
+import com.abi.qms.platform.dto.res.ListDeptEnableRes;
 import com.abi.qms.platform.dto.res.ListDeptRes;
 import com.abi.qms.platform.service.DepartmentService;
 import com.abi.task.common.api.base.BaseResponse;
@@ -107,6 +108,13 @@ public class DepartmentController {
         return BaseResponse.create(result);
     }
 
+    @ApiOperation("启用中的部门列表")
+    @GetMapping("listDeptEnable")
+    public BaseResponse<ListDeptEnableRes> listDeptEnable() throws Exception {
+        ListDeptEnableRes result = departmentService.listDeptEnable();
+        //包装出参
+        return BaseResponse.create(result);
+    }
 
 }
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/FactoryController.java

@@ -7,6 +7,7 @@ import com.abi.qms.platform.dto.req.ListFactoryReq;
 import com.abi.qms.platform.dto.req.SaveFactoryReq;
 import com.abi.qms.platform.dto.res.ExcelImportRes;
 import com.abi.qms.platform.dto.res.GetFactoryDetailRes;
+import com.abi.qms.platform.dto.res.ListFactoryEnableRes;
 import com.abi.qms.platform.dto.res.ListFactoryRes;
 import com.abi.qms.platform.service.FactoryService;
 import com.abi.task.common.api.base.BaseResponse;
@@ -108,6 +109,14 @@ public class FactoryController {
 
     }
 
+    @ApiOperation("启用中的供应商列表")
+    @GetMapping("listDeptEnable")
+    public BaseResponse<ListFactoryEnableRes> listDeptEnable() throws Exception {
+        ListFactoryEnableRes result = factoryService.listFactoryEnable();
+        //包装出参
+        return BaseResponse.create(result);
+    }
+
 
 }
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListDeptEnableRes.java

@@ -0,0 +1,44 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Eurus
+ * @date 2021/5/12 19:41
+ * @Description: 启用中的部门列表出参
+ */
+@Data
+@ApiModel
+public class ListDeptEnableRes implements Serializable {
+
+    @ApiModelProperty("部门bean列表")
+    private List<DeptBean> deptBeanList;
+
+    /**
+     * 部门bean
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "ListDeptEnableRes_DeptBean")
+    public static class DeptBean implements Serializable {
+
+        @ApiModelProperty(value = "id")
+        private Long id;
+
+        @ApiModelProperty(value = "部门code")
+        private String deptCode;
+
+        @ApiModelProperty(value = "部门名称")
+        private String deptName;
+    }
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListFactoryEnableRes.java

@@ -0,0 +1,44 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Eurus
+ * @date 2021/5/12 20:02
+ * @Description: 启用中的供应商列表出参
+ */
+@Data
+@ApiModel
+public class ListFactoryEnableRes implements Serializable {
+
+    @ApiModelProperty("供应商列表")
+    private List<FactoryBean> factoryBeanList;
+
+    /**
+     * 供应商bean
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "ListFactoryEnableRes_FactoryBean")
+    public static class FactoryBean implements Serializable {
+
+        @ApiModelProperty(value = "id")
+        private Long id;
+
+        @ApiModelProperty(value = "供应商code")
+        private String factoryCode;
+
+        @ApiModelProperty(value = "供应商名称")
+        private String factoryName;
+    }
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/DepartmentService.java

@@ -8,6 +8,7 @@ import com.abi.qms.platform.dto.req.ListDeptReq;
 import com.abi.qms.platform.dto.req.SaveDeptReq;
 import com.abi.qms.platform.dto.res.ExcelImportRes;
 import com.abi.qms.platform.dto.res.GetDeptDetailRes;
+import com.abi.qms.platform.dto.res.ListDeptEnableRes;
 import com.abi.qms.platform.dto.res.ListDeptRes;
 import com.abi.task.common.excel.preperties.DepartmentProperty;
 
@@ -40,5 +41,11 @@ public interface DepartmentService {
 
     ExcelImportRes deptExcelImport(List<DepartmentProperty> departmentPropertyList) throws Exception;
 
+    /**
+     * 启用中的部门列表
+     * @return
+     */
+    ListDeptEnableRes listDeptEnable();
+
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/FactoryService.java

@@ -8,6 +8,7 @@ import com.abi.qms.platform.dto.req.ListFactoryReq;
 import com.abi.qms.platform.dto.req.SaveFactoryReq;
 import com.abi.qms.platform.dto.res.ExcelImportRes;
 import com.abi.qms.platform.dto.res.GetFactoryDetailRes;
+import com.abi.qms.platform.dto.res.ListFactoryEnableRes;
 import com.abi.qms.platform.dto.res.ListFactoryRes;
 import com.abi.task.common.excel.preperties.FactoryProperty;
 
@@ -34,5 +35,9 @@ public interface FactoryService {
 
     ExcelImportRes factoryExcelImport(List<FactoryProperty> factoryPropertyList) throws Exception;
 
-
+    /**
+     * 启用中的供应商列表
+     * @return
+     */
+    ListFactoryEnableRes listFactoryEnable();
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/DepartmentServiceImpl.java

@@ -11,6 +11,7 @@ import com.abi.qms.platform.dto.req.ListDeptReq;
 import com.abi.qms.platform.dto.req.SaveDeptReq;
 import com.abi.qms.platform.dto.res.ExcelImportRes;
 import com.abi.qms.platform.dto.res.GetDeptDetailRes;
+import com.abi.qms.platform.dto.res.ListDeptEnableRes;
 import com.abi.qms.platform.dto.res.ListDeptRes;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
@@ -209,6 +210,18 @@ public class DepartmentServiceImpl implements DepartmentService {
 
     }
 
+    @Override
+    public ListDeptEnableRes listDeptEnable() {
+        QueryWrapper<BaseDepartment> param = new QueryWrapper<>();
+        param.eq("is_delete", 0);
+        param.eq("valid", 1);
+        List<BaseDepartment> baseDepartments = baseDepartmentMapper.selectList(param);
+        ListDeptEnableRes listDeptEnableRes = new ListDeptEnableRes();
+        List<ListDeptEnableRes.DeptBean> deptBeans = PojoConverterUtils.copyList(baseDepartments, ListDeptEnableRes.DeptBean.class);
+        listDeptEnableRes.setDeptBeanList(deptBeans);
+        return listDeptEnableRes;
+    }
+
     /**
      * 检查批量导入的内容
      *

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -12,6 +12,7 @@ import com.abi.qms.platform.dto.req.ListFactoryReq;
 import com.abi.qms.platform.dto.req.SaveFactoryReq;
 import com.abi.qms.platform.dto.res.ExcelImportRes;
 import com.abi.qms.platform.dto.res.GetFactoryDetailRes;
+import com.abi.qms.platform.dto.res.ListFactoryEnableRes;
 import com.abi.qms.platform.dto.res.ListFactoryRes;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
@@ -221,6 +222,18 @@ public class FactoryServiceImpl implements FactoryService {
 
     }
 
+    @Override
+    public ListFactoryEnableRes listFactoryEnable() {
+        QueryWrapper<BaseFactory> param = new QueryWrapper<>();
+        param.eq("is_delete", 0);
+        param.eq("valid", 1);
+        List<BaseFactory> baseDepartments = baseFactoryMapper.selectList(param);
+        ListFactoryEnableRes listFactoryEnableRes = new ListFactoryEnableRes();
+        List<ListFactoryEnableRes.FactoryBean> factoryBeans = PojoConverterUtils.copyList(baseDepartments, ListFactoryEnableRes.FactoryBean.class);
+        listFactoryEnableRes.setFactoryBeanList(factoryBeans);
+        return listFactoryEnableRes;
+    }
+
     /**
      * 检查批量导入的内容
      *