优化 质量问题列表接口

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

@@ -254,4 +254,17 @@ public class OrgServiceImpl {
         }
         return orgUsr;
     }
+
+    /**
+     * 根据id获取OrgUsr表的详细信息
+     */
+    public OrgUsr getOrgUsrById(String sequenceNbr){
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr :: getSequenceNbr,sequenceNbr);
+        OrgUsr orgUsr = orgUsrServiceImpl.getOne(wrapper);
+        if(ValidationUtil.isEmpty(orgUsr)){
+            return  null;
+        }
+        return orgUsr;
+    }
 }

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

@@ -9,6 +9,8 @@ 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;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,6 +25,9 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
     @Autowired
     QualityProblemMapper qualityProblemMapper;
 
+    @Autowired
+    OrgServiceImpl orgService;
+
     /**
      * 分页查询
      */
@@ -39,10 +44,19 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
 
     @Override
     public IPage<QualityProblemDto> getItems(String current, String size,QualityProblemDto qualityProblemDto) {
+        List<QualityProblemDto> list = new ArrayList<>();
         IPage<QualityProblemDto> page = new Page<>();
         page.setCurrent(Long.parseLong(current));
         page.setSize(Long.parseLong(size));
-        qualityProblemMapper.getItems(page,qualityProblemDto);
-        return null;
+        page = qualityProblemMapper.getItems(page,qualityProblemDto);
+        List<QualityProblemDto> qualityProblemDtoList = page.getRecords();
+        for (QualityProblemDto qualityProblemDto1 : qualityProblemDtoList) {
+            qualityProblemDto1.setChargerPersonName(orgService.getOrgUsrById(qualityProblemDto1.getChargerPersonId()).getBizOrgName());
+            qualityProblemDto1.setInspectorName(orgService.getOrgUsrById(qualityProblemDto1.getInspectorId()).getBizOrgName());
+            qualityProblemDto1.setVerifyUnitName(orgService.getOrgUsrById(qualityProblemDto1.getVerifyUnitId()).getBizOrgName());
+            list.add(qualityProblemDto1);
+        }
+        page.setRecords(list);
+        return page;
     }
 }
\ No newline at end of file