焊工和焊机bug修改

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/EquipmentServiceImpl.java

@@ -288,17 +288,20 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
     }
 
 
-    @BusinessIdentify
+//    @BusinessIdentify
     public Page<Map<String, Object>> boundWelder(String projectId, Integer current, Integer size, String name, String type) {
-        ReginParams reginParams = orgService.getReginParams();
-        Long companySequenceNbr = reginParams.getBusinessInfo().getCompanySequenceNbr();
+//        ReginParams reginParams = orgService.getReginParams();
+//        Long companySequenceNbr = reginParams.getBusinessInfo().getCompanySequenceNbr();
+        Project project = projectMapper.selectById(projectId);
+        //安装单位ID
+        Long installationUnitId = project.getInstallationUnitId();
         if (!ObjectUtils.isEmpty(current) || !ObjectUtils.isEmpty(size)) {
             Page<Map<String, Object>> result;
             Page<Map<String, Object>> page = new Page<>(current, size);
             if (!ObjectUtils.isEmpty(type) && "all".equals(type)) {
-                result = equipmentMapper.boundWelder(page, projectId, companySequenceNbr, name, null);
+                result = equipmentMapper.boundWelder(page, projectId, installationUnitId, name, null);
             } else {
-                result = equipmentMapper.boundWelder(page, projectId, companySequenceNbr, name, "bound");
+                result = equipmentMapper.boundWelder(page, projectId, installationUnitId, name, "bound");
             }
             result.getRecords().forEach(item -> {
                 List<JSONObject> files = attachmentServiceImpl.getFilesBySourceId(Long.valueOf(String.valueOf(item.get("sequence_nbr"))));
@@ -308,7 +311,7 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
         } else {
             // 不分页时返回全部、定制组件格式统一
             Page<Map<String, Object>> listPage = new Page<>();
-            List<Map<String, Object>> equipmentDtos = equipmentMapper.boundWelderList(projectId, companySequenceNbr, name);
+            List<Map<String, Object>> equipmentDtos = equipmentMapper.boundWelderList(projectId, installationUnitId, name);
             listPage.setRecords(equipmentDtos);
             return listPage;
         }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

@@ -217,7 +217,7 @@ public class WelderServiceImpl {
     }
 
 
-    @BusinessIdentify
+//    @BusinessIdentify
     public Page<Map<String, Object>> getWelderByProjectId(String projectId, Integer current, Integer size, String name, String type) {
         String columnKey = "column";
         String valueKey = "value";
@@ -225,24 +225,24 @@ public class WelderServiceImpl {
         String statusKey = "status";
         Page<Map<String, Object>> mapPage = new Page<>();
         ArrayList<Map<String, Object>> maps = new ArrayList<>();
-        ReginParams reginParams = orgService.getReginParams();
-        Long companySequenceNbr = reginParams.getBusinessInfo().getCompanySequenceNbr();
-
+        Project byId = projectService.getById(projectId);
+        //安装单位ID
+        Long installationUnitId = byId.getInstallationUnitId();
         List<Map<String, Object>> mapList;
         // 分页参数为空时返回全部
         if (!ObjectUtils.isEmpty(current) || !ObjectUtils.isEmpty(size)) {
             Page<Map<String, Object>> page = new Page<>(current, size);
             if (!ObjectUtils.isEmpty(type) && "all".equals(type)) {
-                page = orgUsrService.getWelderByProjectId(page, projectId, companySequenceNbr, name, null);
+                page = orgUsrService.getWelderByProjectId(page, projectId, installationUnitId, name, null);
             } else {
-                page = orgUsrService.getWelderByProjectId(page, projectId, companySequenceNbr, name, "bound");
+                page = orgUsrService.getWelderByProjectId(page, projectId, installationUnitId, name, "bound");
             }
             mapPage.setTotal(page.getTotal());
             mapPage.setSize(page.getSize());
             mapPage.setPages(page.getPages());
             mapList = page.getRecords();
         } else {
-            mapList = orgUsrService.getWelderListByProjectId(projectId, companySequenceNbr, name);
+            mapList = orgUsrService.getWelderListByProjectId(projectId, installationUnitId, name);
         }
 
         mapList.forEach(item -> {