2023-06-29，设备和质量修改3

src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java

@@ -48,9 +48,7 @@ public class EamObjectController {
     @RequestMapping(value = "insertEamObject")
     public R insertEamObject(@RequestBody EamObjectData inData) {
         eamObjectService.insertEamObject(inData);
-        return R.ok()
-                .put("code", 200)
-                .put("msg", "操作成功!");
+        return R.ok().put("code", 200).put("msg", "操作成功!");
     }
 
     /**

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -1078,4 +1078,6 @@ public interface EamMapper {
     void saveMaintenanceWorkOrder(EamWorkOrderInData inData);
 
     EamWorkOrderInData queryOldWorkOrderMessage(EamWorkOrderInData inData);
+
+    List<EamAdminData> getDeptDetail(String site, String adminID);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java

@@ -79,8 +79,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         String locationId = inData.getLocationID();
         String familyId = inData.getFamilyID();
         String groupId = inData.getGroupID();
-        String supplierId = inData.getSupplierID();
-        String manufacturerId = inData.getManufacturerID();
+//        String supplierId = inData.getSupplierID();
+//        String manufacturerId = inData.getManufacturerID();
         String deptID = inData.getDeptID();
         List<Object> params = new ArrayList<>();
         params.add(site);
@@ -88,8 +88,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         params.add(locationId);
         params.add(familyId);
         params.add(groupId);
-        params.add(supplierId);
-        params.add(manufacturerId);
+//        params.add(supplierId);
+//        params.add(manufacturerId);
         params.add(inData.getResourceID());
         params.add(deptID);
         //执行方法
@@ -123,8 +123,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         String locationId = inData.getLocationID();
         String familyId = inData.getFamilyID();
         String groupId = inData.getGroupID();
-        String supplierId = inData.getSupplierID();
-        String manufacturerId = inData.getManufacturerID();
+//        String supplierId = inData.getSupplierID();
+//        String manufacturerId = inData.getManufacturerID();
         String deptID = inData.getDeptID();
         List<Object> params = new ArrayList<>();
         params.add(site);
@@ -132,8 +132,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         params.add(locationId);
         params.add(familyId);
         params.add(groupId);
-        params.add(supplierId);
-        params.add(manufacturerId);
+//        params.add(supplierId);
+//        params.add(manufacturerId);
         params.add(inData.getResourceID());
         params.add(deptID);
         //执行方法

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -271,20 +271,27 @@ public class EamServiceImpl implements EamService {
         IPage<EamAdminData> eamAdminList = this.eamMapper.eamAdminSearch(new Page<EamAdminData>(inData.getPage(), inData.getLimit()), inData);
         // 拼接部门
         for(EamAdminData data : eamAdminList.getRecords()){
-            List<String> deptList = eamMapper.getDeptList(data.getSite(), data.getAdminID());
+            List<EamAdminData> deptList = eamMapper.getDeptDetail(data.getSite(), data.getAdminID());
+            String deptId = "";
             String deptName = "";
-//            if (deptList.size() > 0) {
+            if (deptList.size() > 0) {
                 for (int i = 0; i < deptList.size(); i++) {
                     if (deptList.get(i) != null){
                         if (deptName.equals("")) {
-                            deptName = deptList.get(i);
+                            deptName = deptList.get(i).getDepartmentName();
                         } else {
-                            deptName = deptName + ";" + deptList.get(i);
+                            deptName = deptName + ";" + deptList.get(i).getDepartmentName();
+                        }
+                        if (deptId.equals("")) {
+                            deptId = deptList.get(i).getDepartment();
+                        } else {
+                            deptId = deptId + ";" + deptList.get(i).getDepartment();
                         }
                     }
                 }
-                data.setDepartment(deptName);
-//            }
+                data.setDepartment(deptId);
+                data.setDepartmentName(deptName);
+            }
         }
         return new PageUtils(eamAdminList);
     }
@@ -1015,9 +1022,9 @@ public class EamServiceImpl implements EamService {
             for(EamWorkOrderInData ewoData : resultList.getRecords()){
                 // 查询设备所属部门
                 String objDepartment = eamMapper.selectDeptByObjectID(ewoData.getSite(), ewoData.getObjectID());
-                // 查询用户所属部门
                 String adminID = eamMapper.selectAdminIdByUserName(ewoData.getSite(), inData.getUsername());
                 if (adminID != null){
+                    // 查询用户所属部门
                     List<String> deptList = eamMapper.getDeptList(ewoData.getSite(), adminID);
                     //List<String> nameList = deptList.stream().map(a -> a.getDepartmentName()).collect(Collectors.toList());
                     if (deptList.contains(objDepartment)){

src/main/resources/mapper/pms/EamMapper.xml

@@ -1568,6 +1568,18 @@ b.MinValue,b.ItemRemark,b.ItemType
         VALUES (#{site}, #{adminID}, #{deptId})
     </insert>
 
+    <!-- 查询部门详情 -->
+    <select id="getDeptDetail" resultType="EamAdminData" parameterType="string">
+        SELECT
+            ved.dept_id as department,
+            ved.dept_name as departmentName
+        FROM eam_admin_dept as ead
+        LEFT JOIN view_eam_department as ved
+        ON ead.site = ved.site and ead.dept_id = ved.dept_id
+        WHERE ead.site = #{site}
+        AND ead.admin_id = #{adminID}
+    </select>
+
     <!-- 查询部门列表 -->
     <select id="getDeptList" resultType="string" parameterType="string">
         SELECT