作业服务相关修改

src/main/java/com/mmc/pms/entity/inspection/CompanyInspectionDO.java

@@ -65,7 +65,6 @@ public class CompanyInspectionDO implements Serializable {
      */
     private String remark;
     private Date createTime;
-    private String inspectionFirstImg;
 
 
     IndustryTypeDO industryTypeDO;
@@ -81,7 +80,7 @@ public class CompanyInspectionDO implements Serializable {
                 .industryTypeDTO(this.industryTypeDO == null ? null : this.industryTypeDO.buildIndustryTypeDTO())
                 .inspectionDTO(this.inspectionDO == null ? null : this.inspectionDO.buildInspectionDTO())
                 .inspectionTagDTO(this.inspectionTagDO == null ? null : this.inspectionTagDO.buildInspectionTagDTO())
-                .inspectionFirstImg(CollectionUtils.isEmpty(this.inspectionFileDOS) ? inspectionFirstImg :
+                .inspectionFirstImg(CollectionUtils.isEmpty(this.inspectionFileDOS) ? null :
                         this.inspectionFileDOS.stream().filter(i -> i.getFileType().equals(0) && i.getFirst().equals(1))
                                 .findFirst().get().getFileUrl())
                 .inspectionFileDTOS(CollectionUtils.isEmpty(this.inspectionFileDOS) ? null :

src/main/resources/mapper/inspection/CompanyInspectionDao.xml

@@ -233,10 +233,12 @@
     </select>
 
     <select id="listAPPCompanyInspectionPageByCompanyId"
-            resultType="com.mmc.pms.entity.inspection.CompanyInspectionDO">
+            resultMap="companyInspectionResultMap">
         select com_ins.id, com_ins.company_info_id, com_ins.service_area, com_ins.inspection_id, com_ins.inspection_tag_id, com_ins.price,
         com_ins.price_remark, com_ins.inspection_price_unit_id,com_ins.detail_page, com_ins.sale_state, com_ins.remark, com_ins.create_time,
-        cif.file_url as inspectionFirstImg
+        it.id as industry_type_id, it.type_name,
+        ins.id as inspection_id, ins.inspection_no, ins.inspection_name,
+        itag.id as inspection_tag_id, itag.tag_name
         FROM
         (
         SELECT
@@ -250,6 +252,9 @@
         </foreach> )
         ) com_ins
         INNER JOIN company_inspection_file cif ON com_ins.id = cif.company_inspection_id
+        INNER JOIN inspection ins ON ins.id = com_ins.inspection_id
+        INNER JOIN industry_type it ON it.id = ins.industry_type_id
+        LEFT JOIN inspection_tag itag ON com_ins.inspection_tag_id = itag.id
         AND cif.`first` = 1
         WHERE
         row_num &lt;= 2