作业服务bug修复

src/main/java/com/mmc/pms/common/ResultEnum.java

@@ -413,7 +413,8 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     THE_NAME_OF_A_CLASS_MUST_BE_UNIQUE("3002", "一级分类名称重复"),
     THE_CURRENT_CATEGORY_IS_ASSOCIATED_WITH_GOODS("3004", "当前分类已经关联商品请先删除商品"),
     THE_NAME_OF_THE_SECONDARY_CLASS_MUST_BE_UNIQUE("3003", "同一级分类下面二级分类不能重复"),
-    NAME_DUPLICATION_ERROR("3005", "名称重复");
+    NAME_DUPLICATION_ERROR("3005", "名称重复"),
+    UNBINDING_ERROR("3006", "有关联下级，删除失败");
     /**
      * 错误码
      *

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

@@ -59,4 +59,11 @@ public class IndustryTypeController {
     public ResultBody<IndustryTypeDTO> listInspectionsByIndustryTypeId(@RequestParam Integer id){
         return industryTypeService.listInspectionsByIndustryTypeId(id);
     }
+
+    @ApiOperation(value = "一级行业详情")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = IndustryTypeDTO.class)})
+    @GetMapping("getIndustryTypeById")
+    public ResultBody<IndustryTypeDTO> getIndustryTypeById(@RequestParam Integer id){
+        return industryTypeService.getIndustryTypeById(id);
+    }
 }

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

@@ -26,4 +26,6 @@ public interface IndustryTypeDao {
     List<IndustryTypeDO> listPages(IndustryTypeQO industryTypeQO);
 
     List<InspectionDO> listInspectionsByIndustryTypeIdId(Integer industryTypeId);
+
+    IndustryTypeDO getIndustryTypeById(Integer id);
 }

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

@@ -19,4 +19,6 @@ public interface IndustryTypeService {
     ResultBody listPages(IndustryTypeQO industryTypeQO);
 
     ResultBody<IndustryTypeDTO> listInspectionsByIndustryTypeId(Integer id);
+
+    ResultBody<IndustryTypeDTO> getIndustryTypeById(Integer id);
 }

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

@@ -52,6 +52,10 @@ public class IndustryTypeServiceImpl implements IndustryTypeService {
     @Override
     public ResultBody remove(Integer id) {
         // 有绑定则不能删除
+        List<InspectionDO> inspectionDOS = industryTypeDao.listInspectionsByIndustryTypeIdId(id);
+        if (CollectionUtils.isNotEmpty(inspectionDOS)) {
+            return ResultBody.error(ResultEnum.UNBINDING_ERROR);
+        }
         industryTypeDao.remove(id);
         return ResultBody.success();
     }
@@ -78,4 +82,13 @@ public class IndustryTypeServiceImpl implements IndustryTypeService {
         }
         return ResultBody.success();
     }
+
+    @Override
+    public ResultBody<IndustryTypeDTO> getIndustryTypeById(Integer id) {
+        IndustryTypeDO industryTypeDO = industryTypeDao.getIndustryTypeById(id);
+        if (industryTypeDO == null) {
+            return ResultBody.success();
+        }
+        return ResultBody.success(industryTypeDO.buildIndustryTypeDTO());
+    }
 }

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

@@ -2,10 +2,13 @@ package com.mmc.pms.service.inspection.impl;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
+import com.mmc.pms.dao.inspection.CompanyInspectionDao;
 import com.mmc.pms.dao.inspection.InspectionDao;
 import com.mmc.pms.entity.inspection.InspectionDO;
 import com.mmc.pms.model.inspection.dto.InspectionDTO;
 import com.mmc.pms.model.inspection.vo.InspectionVO;
+import com.mmc.pms.model.qo.CompanyInspectionQO;
+import com.mmc.pms.service.inspection.CompanyInspectionService;
 import com.mmc.pms.service.inspection.InspectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +22,9 @@ public class InspectionServiceImpl implements InspectionService {
     @Autowired
     private InspectionDao inspectionDao;
 
+    @Autowired
+    private CompanyInspectionDao companyInspectionDao;
+
     @Override
     public ResultBody insert(InspectionVO inspectionVO) {
         InspectionDO inspectionDO = new InspectionDO(inspectionVO);
@@ -43,6 +49,13 @@ public class InspectionServiceImpl implements InspectionService {
 
     @Override
     public ResultBody remove(Integer id) {
+        // 有绑定则不能删除
+        CompanyInspectionQO companyInspectionQO = new CompanyInspectionQO();
+        companyInspectionQO.setInspectionId(id);
+        int count = companyInspectionDao.countListCompanyInspectionPage(companyInspectionQO);
+        if (count > 0) {
+            return ResultBody.error(ResultEnum.UNBINDING_ERROR);
+        }
         inspectionDao.remove(id);
         return ResultBody.success();
     }

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

@@ -2,10 +2,12 @@ package com.mmc.pms.service.inspection.impl;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
+import com.mmc.pms.dao.inspection.CompanyInspectionDao;
 import com.mmc.pms.dao.inspection.InspectionTagDao;
 import com.mmc.pms.entity.inspection.InspectionTagDO;
 import com.mmc.pms.model.inspection.dto.InspectionTagDTO;
 import com.mmc.pms.model.inspection.vo.InspectionTagVO;
+import com.mmc.pms.model.qo.CompanyInspectionQO;
 import com.mmc.pms.service.inspection.InspectionTagService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,9 @@ public class InspectionTagServiceImpl implements InspectionTagService {
     @Autowired
     private InspectionTagDao inspectionTagDao;
 
+    @Autowired
+    private CompanyInspectionDao companyInspectionDao;
+
     @Override
     public ResultBody insert(InspectionTagVO inspectionTagVO) {
         int count = inspectionTagDao.countSameName(inspectionTagVO.getId(), inspectionTagVO.getTagName(), inspectionTagVO.getInspectionId());
@@ -47,6 +52,13 @@ public class InspectionTagServiceImpl implements InspectionTagService {
 
     @Override
     public ResultBody delete(Integer id) {
+        // 有绑定则不能删除
+        CompanyInspectionQO companyInspectionQO = new CompanyInspectionQO();
+        companyInspectionQO.setInspectionTagId(id);
+        int count = companyInspectionDao.countListCompanyInspectionPage(companyInspectionQO);
+        if (count > 0) {
+            return ResultBody.error(ResultEnum.UNBINDING_ERROR);
+        }
         inspectionTagDao.delete(id);
         return ResultBody.success();
     }

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

@@ -26,7 +26,7 @@
             <result property="inspectionName" column="inspection_name"/>
         </association>
         <association property="inspectionTagDO" javaType="com.mmc.pms.entity.inspection.InspectionTagDO">
-            <id property="id" column="inspection_id"/>
+            <id property="id" column="inspection_tag_id"/>
             <result property="tagName" column="tag_name"/>
             <result property="inspectionId" column="inspection_id"/>
         </association>
@@ -126,10 +126,11 @@
         select count(*)
         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 cins.inspection_tag_id = itag.id
+        LEFT JOIN inspection_tag itag ON cins.inspection_tag_id = itag.id
         where cins.is_deleted = 0
         <if test="keyword != null">
-            and ins.inspection_name = #{keyword}
+            and (ins.inspection_name like CONCAT("%",#{keyword},"%") or
+            ins.inspection_no like CONCAT("%",#{keyword},"%") )
         </if>
         <if test="industryTypeId != null">
             and it.id = #{industryTypeId}
@@ -151,11 +152,12 @@
 		 cif.id as company_inspection_file_id, cif.file_type, cif.`first`, cif.file_url
         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 cins.inspection_tag_id = itag.id
-				INNER JOIN company_inspection_file cif ON cif.company_inspection_id = cins.id
+                INNER JOIN company_inspection_file cif ON cif.company_inspection_id = cins.id
+				LEFT JOIN inspection_tag itag ON cins.inspection_tag_id = itag.id
         where cins.is_deleted = 0
         <if test="keyword != null">
-            and ins.inspection_name = #{keyword}
+            and (ins.inspection_name like CONCAT("%",#{keyword},"%") or
+            ins.inspection_no like CONCAT("%",#{keyword},"%") )
         </if>
         <if test="industryTypeId != null">
             and it.id = #{industryTypeId}
@@ -174,10 +176,11 @@
         select count(*)
         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 cins.inspection_tag_id = itag.id
+        LEFT JOIN inspection_tag itag ON cins.inspection_tag_id = itag.id
         where cins.is_deleted = 0 and cins.sale_state = 1
         <if test="keyword != null">
-            and ins.inspection_name = #{keyword}
+            and (ins.inspection_name like CONCAT("%",#{keyword},"%") or
+            ins.inspection_no like CONCAT("%",#{keyword},"%") )
         </if>
         <if test="inspectionId != null">
             and cins.inspection_id = #{inspectionId}
@@ -202,11 +205,12 @@
         cif.id as company_inspection_file_id, cif.file_type, cif.`first`, cif.file_url
         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 cins.inspection_tag_id = itag.id
         INNER JOIN company_inspection_file cif ON cif.company_inspection_id = cins.id
+        INNER JOIN inspection_tag itag ON cins.inspection_tag_id = itag.id
         where cins.is_deleted = 0 and cins.sale_state = 1
         <if test="keyword != null">
-            and ins.inspection_name = #{keyword}
+            and (ins.inspection_name like CONCAT("%",#{keyword},"%") or
+            ins.inspection_no like CONCAT("%",#{keyword},"%") )
         </if>
         <if test="inspectionId != null">
             and cins.inspection_id = #{inspectionId}

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

@@ -88,4 +88,10 @@
         order by it.id DESC
         limit #{pageNo},#{pageSize}
     </select>
+
+    <select id="getIndustryTypeById" resultType="com.mmc.pms.entity.inspection.IndustryTypeDO">
+        select it.id, it.type_name, it.type_img, it.description, it.sale_state, it.is_deleted, it.create_time
+         from industry_type it
+         where it.is_deleted = 0 and it.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file