产品管理

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/DepartmentController.java

@@ -165,5 +165,15 @@ public class DepartmentController {
         }
         return httpRespMsg;
     }
+
+    /**
+     * 获取当前用户的班组人员
+     * @param request
+     * @return
+     */
+    @RequestMapping("getMyGroups")
+    public  HttpRespMsg getMyGroups(HttpServletRequest request){
+        return  departmentService.getMyGroups(request);
+    }
 }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/DepartmentService.java

@@ -61,4 +61,6 @@ public interface DepartmentService extends IService<Department> {
     String exportWxDepartment(Department department,List<Department> departmentList);
 
     HttpRespMsg sortList(HttpServletRequest request,List<DepartmentVO> list);
+
+    HttpRespMsg getMyGroups(HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -2,6 +2,7 @@ package com.management.platform.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.entity.*;
@@ -1516,6 +1517,28 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         return msg;
     }
 
+    /**
+     * 获取当前班组人员
+     * @param request
+     * @return
+     */
+    @Override
+    public HttpRespMsg getMyGroups(HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        ArrayList<User> departmentUserList = new ArrayList<>();
+
+        List<User> groupList = userMapper.selectList(new LambdaQueryWrapper<User>()
+                .eq(user.getCompanyId() != null, User::getCompanyId, user.getCompanyId())
+                .eq(user.getDepartmentId() != null, User::getDepartmentId, user.getDepartmentId())
+                .select(User::getId, User::getName,User::getJobNumber)
+
+        );
+        msg.setData(groupList);
+
+        return msg;
+    }
+
     /**
      * 递归对返回的部门数据进行排序
      * @param list

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProductServiceImpl.java

@@ -13,6 +13,7 @@ import com.management.platform.service.ProdMaterialService;
 import com.management.platform.service.ProdProcedureService;
 import com.management.platform.service.ProductService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
 import org.apache.poi.EncryptedDocumentException;
@@ -715,18 +716,25 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                     case 1: item.add("互检");break;
                     case 2: item.add("专检");break;
                 }
+                dataProcedureList.add(item);
             }
 
-        }
+            HttpRespMsg msg=new HttpRespMsg();
+            String fileName = "产品详情"+"_"+System.currentTimeMillis();
+            String sheetOneName="产品基本信息";
+            String sheetTwoName="派工单";
 
 
+            String result = ExcelUtil.exportTwoSheetGeneralExcelByTitleAndList(fileName, dataProductList, dataProcedureList, path, sheetOneName, sheetTwoName);
 
+            msg.setData(result);
 
-     /*       //导出excel
-            String result="系统提示：Excel文件导出成功！";
-            //生成Excel文件
-            String fileName = "产品详情"+System.currentTimeMillis();
-            return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileName,dataList,path);*/
+            return msg;
+        }
+
+
+
+           /* return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileName,dataList,path);*/
         return null;
     }