作业服务相关修改

src/main/java/com/mmc/pms/controller/inspection/CompanyInspectionController.java

@@ -3,6 +3,7 @@ package com.mmc.pms.controller.inspection;
 import com.mmc.pms.common.Page;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.controller.BaseController;
+import com.mmc.pms.model.inspection.dto.AppCompanyInspectionDTO;
 import com.mmc.pms.model.inspection.dto.CompanyInspectionDTO;
 import com.mmc.pms.model.inspection.dto.IndustryTypeDTO;
 import com.mmc.pms.model.inspection.dto.InspectionDTO;
@@ -19,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @author: zj
@@ -90,11 +92,10 @@ public class CompanyInspectionController extends BaseController {
         return companyInspectionService.listAPPCompanyInspectionPage(companyInspectionQO, this.getUserLoginInfoFromRedis(request));
     }
 
-    @ApiOperation(value = "根据公司id查询服务")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyInspectionDTO.class)})
+    @ApiOperation(value = "批量-根据公司id查询服务")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppCompanyInspectionDTO.class)})
     @PostMapping("listAPPCompanyInspectionPageByCompanyId")
-    public ResultBody<CompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(@Validated(value = {Page.class})
-                                                                    @RequestBody CompanyInspectionQO companyInspectionQO){
-        return companyInspectionService.listAPPCompanyInspectionPageByCompanyId(companyInspectionQO);
+    public ResultBody<AppCompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(@RequestBody List<Integer> companyInfoIds){
+        return companyInspectionService.listAPPCompanyInspectionPageByCompanyId(companyInfoIds);
     }
 }

src/main/java/com/mmc/pms/dao/inspection/CompanyInspectionDao.java

@@ -36,4 +36,6 @@ public interface CompanyInspectionDao {
     void batchDeleteFile(List<Integer> list);
 
     void removeByCompanyInfoId(Integer companyInfoId);
+
+    List<CompanyInspectionDO> listAPPCompanyInspectionPageByCompanyId(List<Integer> list);
 }

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

@@ -2,6 +2,7 @@ package com.mmc.pms.entity.inspection;
 
 import com.mmc.pms.model.inspection.dto.CompanyInspectionDTO;
 import com.mmc.pms.model.inspection.vo.CompanyInspectionVO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -64,6 +65,8 @@ public class CompanyInspectionDO implements Serializable {
      */
     private String remark;
     private Date createTime;
+    private String inspectionFirstImg;
+
 
     IndustryTypeDO industryTypeDO;
     InspectionDO inspectionDO;
@@ -78,7 +81,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) ? null :
+                .inspectionFirstImg(CollectionUtils.isEmpty(this.inspectionFileDOS) ? inspectionFirstImg :
                         this.inspectionFileDOS.stream().filter(i -> i.getFileType().equals(0) && i.getFirst().equals(1))
                                 .findFirst().get().getFileUrl())
                 .inspectionFileDTOS(CollectionUtils.isEmpty(this.inspectionFileDOS) ? null :

src/main/java/com/mmc/pms/model/inspection/dto/AppCompanyInspectionDTO.java

+package com.mmc.pms.model.inspection.dto;
+
+import com.mmc.pms.model.inspection.dto.CompanyInspectionDTO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: zj
+ * @Date: 2023/8/18 18:17
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AppCompanyInspectionDTO implements Serializable {
+    private static final long serialVersionUID = 4264333277454048626L;
+    private Integer companyInfoId;
+    private List<CompanyInspectionDTO> companyInspectionList;
+}

src/main/java/com/mmc/pms/service/inspection/CompanyInspectionService.java

@@ -2,11 +2,14 @@ package com.mmc.pms.service.inspection;
 
 import com.mmc.pms.auth.dto.LoginSuccessDTO;
 import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.model.inspection.dto.AppCompanyInspectionDTO;
 import com.mmc.pms.model.inspection.dto.CompanyInspectionDTO;
 import com.mmc.pms.model.inspection.dto.IndustryTypeDTO;
 import com.mmc.pms.model.inspection.vo.CompanyInspectionVO;
 import com.mmc.pms.model.qo.CompanyInspectionQO;
 
+import java.util.List;
+
 /**
  * @author: zj
  * @Date: 2023/8/7 14:31
@@ -30,5 +33,5 @@ public interface CompanyInspectionService {
 
     void removeCompanyInspectionByCompanyInfoId(Integer companyInfoId);
 
-    ResultBody<CompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(CompanyInspectionQO companyInspectionQO);
+    ResultBody<AppCompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(List<Integer> companyInfoIds);
 }

src/main/java/com/mmc/pms/service/inspection/impl/CompanyInspectionServiceImpl.java

@@ -9,10 +9,13 @@ import com.mmc.pms.entity.inspection.CompanyInspectionDO;
 import com.mmc.pms.enums.CompanyTypeEnums;
 import com.mmc.pms.enums.InspectionPriceUnitEnums;
 import com.mmc.pms.feign.UserAppApi;
+import com.mmc.pms.model.inspection.dto.AppCompanyInspectionDTO;
 import com.mmc.pms.model.inspection.dto.CompanyInspectionDTO;
 import com.mmc.pms.model.inspection.dto.IndustryTypeDTO;
 import com.mmc.pms.model.inspection.vo.CompanyInspectionFileVO;
 import com.mmc.pms.model.inspection.vo.CompanyInspectionVO;
+import com.mmc.pms.model.mall.GoodsListVO;
+import com.mmc.pms.model.mall.MallGoodsVO;
 import com.mmc.pms.model.qo.CompanyInspectionQO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.inspection.CompanyInspectionService;
@@ -152,9 +155,20 @@ public class CompanyInspectionServiceImpl implements CompanyInspectionService {
     }
 
     @Override
-    public ResultBody<CompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(CompanyInspectionQO companyInspectionQO) {
-
-        return null;
+    public ResultBody<AppCompanyInspectionDTO> listAPPCompanyInspectionPageByCompanyId(List<Integer> companyInfoIds) {
+        List<AppCompanyInspectionDTO> companyInspectionDTOS = new ArrayList<AppCompanyInspectionDTO>();
+        List<CompanyInspectionDO> companyInspectionDOS = companyInspectionDao.listAPPCompanyInspectionPageByCompanyId(companyInfoIds);
+        if (CollectionUtils.isNotEmpty(companyInspectionDOS)) {
+            List<CompanyInspectionDTO> collect = companyInspectionDOS.stream().map(CompanyInspectionDO::buildCompanyInspectionDTO).collect(Collectors.toList());
+            Map<Integer, List<CompanyInspectionDTO>> integerListMap = collect.stream().collect(Collectors.groupingBy(item -> item.getCompanyInfoId()));
+            for (Map.Entry<Integer, List<CompanyInspectionDTO>> entry : integerListMap.entrySet()) {
+                AppCompanyInspectionDTO appCompanyInspectionDTO = new AppCompanyInspectionDTO();
+                appCompanyInspectionDTO.setCompanyInfoId(entry.getKey());
+                appCompanyInspectionDTO.setCompanyInspectionList(entry.getValue());
+                companyInspectionDTOS.add(appCompanyInspectionDTO);
+            }
+        }
+        return ResultBody.success(companyInspectionDTOS);
     }
 
     public void setCompanyName(List<CompanyInspectionDTO> companyInspectionDTOS, String token){

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

@@ -122,7 +122,7 @@
         from company_inspection cins INNER JOIN inspection ins ON ins.id = cins.inspection_id
 				INNER JOIN industry_type it ON it.id = ins.industry_type_id
 				INNER JOIN inspection_tag itag ON itag.inspection_id = ins.id
-				INNER JOIN company_inspection_file cif ON cif.company_inspection_id = cins.id
+				LEFT JOIN company_inspection_file cif ON cif.company_inspection_id = cins.id
         where cins.id = #{id} and cins.is_deleted = 0
     </select>
 
@@ -233,4 +233,27 @@
         order by cins.id desc
         limit #{pageNo}, #{pageSize}
     </select>
+
+    <select id="listAPPCompanyInspectionPageByCompanyId"
+            resultType="com.mmc.pms.entity.inspection.CompanyInspectionDO">
+        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
+        FROM
+        (
+        SELECT
+        *,
+        ROW_NUMBER () OVER ( PARTITION BY company_info_id ORDER BY id ) AS row_num
+        FROM
+        company_inspection
+        WHERE
+        company_info_id IN ( <foreach collection="list" separator="," item="item">
+            #{item}
+        </foreach> )
+        ) com_ins
+        INNER JOIN company_inspection_file cif ON com_ins.id = cif.company_inspection_id
+        AND cif.`first` = 1
+        WHERE
+        row_num &lt;= 2
+    </select>
 </mapper>
\ No newline at end of file