调试修改项目资源接口

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

@@ -6,7 +6,6 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
@@ -17,7 +16,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,10 +23,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.Map;
 
 import static com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum.*;
 
@@ -123,13 +119,13 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
      */
     public ProjectResource saveIds(JSONObject jsonObject) {
         JSONArray subForm = jsonObject.getJSONArray("subForm");
-        ProjectResource projectResource = new ProjectResource();
+        ProjectResource Resource = new ProjectResource();
 
         for (Object json2 : subForm) {
+            ProjectResource projectResource = new ProjectResource();
+
             String select = JSON.parseObject(JSON.toJSONString(json2)).getString("select");
-//            if (!jsonObject.getString("sequenceNbr").isEmpty()){
-//                jsonObject.getString("sequenceNbr");
-//            }
+
             Long SequenceNbr = Long.valueOf(jsonObject.getString("sequenceNbr"));
             String type = jsonObject.getString("type");
             //判断资源类型并插入
@@ -142,12 +138,16 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
             if (type.equals(管材资源.getStatus())) {
                 projectResource.setType(管材资源.getState());
             }
+
             projectResource.setProjectId(SequenceNbr);
             projectResource.setResourceId(Long.valueOf(select));
-            this.save(projectResource);
+            Equipment equipment = equipmentMapper.selectById(Long.valueOf(select));
+            projectResource.setName(equipment.getName());
+            BeanUtils.copyProperties(projectResource,Resource);
 
+            this.save(projectResource);
         }
-        return projectResource;
+        return Resource;
 
 
     }