修改添加项目焊工bug

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

@@ -5,18 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectMaterialDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
-import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
+import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
-import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
-import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.MaterialMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IProjectResourceService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectResourceDto;
@@ -63,6 +62,8 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
     MaterialServiceImpl materialService;
 
     @Autowired
+    MaterialMapper materialMapper;
+    @Autowired
     EquipmentServiceImpl equipmentService;
 
     /**
@@ -153,20 +154,23 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
             //判断资源类型并插入
             if (type.equals(设备资源.getName())) {
                 projectResource.setType(设备资源.getCode());
+                Equipment equipment = equipmentMapper.selectById(select);
+                projectResource.setName(equipment.getName());
             }
             if (type.equals(焊工资源.getName())) {
                 projectResource.setType(焊工资源.getCode());
+                OrgUsr orgUsrById = orgService.getOrgUsrById(select);
+                projectResource.setName(orgUsrById.getBizOrgName());
             }
             if (type.equals(管材资源.getName())) {
                 projectResource.setType(管材资源.getCode());
+                Material material = materialMapper.selectById(select);
+                projectResource.setName(material.getName());
             }
 
             projectResource.setProjectId(SequenceNbr);
             projectResource.setResourceId(Long.valueOf(select));
-            Equipment equipment = equipmentMapper.selectById(Long.valueOf(select));
-            projectResource.setName(equipment.getName());
             BeanUtils.copyProperties(projectResource,Resource);
-
             this.save(projectResource);
         }
         return Resource;