Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/pms into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: e2fcf6e3d5f73b2f9487514cb1afccb763f4ef3e
+  newTag: 10565fcb8b3e6f7419b2cdd2503f5241c4e5da45

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

 package com.mmc.pms.controller.inspection;
 
 import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.model.inspection.dto.InspectionDTO;
 import com.mmc.pms.model.inspection.vo.InspectionVO;
 import com.mmc.pms.service.inspection.InspectionService;
 import io.swagger.annotations.Api;
@@ -41,4 +42,11 @@ public class InspectionController {
     public ResultBody remove(@RequestParam Integer id){
         return inspectionService.remove(id);
     }
+
+    @ApiOperation(value = "服务详情")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = InspectionDTO.class)})
+    @GetMapping("detail")
+    public ResultBody<InspectionDTO> detail(@RequestParam Integer id){
+        return inspectionService.detail(id);
+    }
 }

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

@@ -16,4 +16,6 @@ public interface InspectionDao {
     void update(InspectionDO inspectionDO);
 
     void remove(Integer id);
+
+    InspectionDO getInspectionById(Integer id);
 }

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

@@ -11,7 +11,7 @@ import java.util.List;
  */
 @Mapper
 public interface InspectionTagDao {
-    int countSameName(String tagName);
+    int countSameName(Integer id, String tagName, Integer inspectionId);
 
     void insert(InspectionTagDO inspectionTagDO);
 

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

 package com.mmc.pms.service.inspection;
 
 import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.model.inspection.dto.InspectionDTO;
 import com.mmc.pms.model.inspection.vo.InspectionVO;
 
 /**
@@ -13,4 +14,6 @@ public interface InspectionService {
     ResultBody update(InspectionVO inspectionVO);
 
     ResultBody remove(Integer id);
+
+    ResultBody<InspectionDTO> detail(Integer id);
 }

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

@@ -4,6 +4,7 @@ import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
 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.service.inspection.InspectionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,4 +46,13 @@ public class InspectionServiceImpl implements InspectionService {
         inspectionDao.remove(id);
         return ResultBody.success();
     }
+
+    @Override
+    public ResultBody<InspectionDTO> detail(Integer id) {
+        InspectionDO inspectionDO = inspectionDao.getInspectionById(id);
+        if (inspectionDO == null) {
+            return ResultBody.success();
+        }
+        return ResultBody.success(inspectionDO.buildInspectionDTO());
+    }
 }

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

@@ -25,7 +25,7 @@ public class InspectionTagServiceImpl implements InspectionTagService {
 
     @Override
     public ResultBody insert(InspectionTagVO inspectionTagVO) {
-        int count = inspectionTagDao.countSameName(inspectionTagVO.getTagName());
+        int count = inspectionTagDao.countSameName(inspectionTagVO.getId(), inspectionTagVO.getTagName(), inspectionTagVO.getInspectionId());
         if (count > 0) {
             return ResultBody.error(ResultEnum.NAME_DUPLICATION_ERROR);
         }
@@ -36,7 +36,7 @@ public class InspectionTagServiceImpl implements InspectionTagService {
 
     @Override
     public ResultBody update(InspectionTagVO inspectionTagVO) {
-        int count = inspectionTagDao.countSameName(inspectionTagVO.getTagName());
+        int count = inspectionTagDao.countSameName(inspectionTagVO.getId(), inspectionTagVO.getTagName(), inspectionTagVO.getInspectionId());
         if (count > 0) {
             return ResultBody.error(ResultEnum.NAME_DUPLICATION_ERROR);
         }

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

@@ -52,4 +52,11 @@
             </if>
         </where>
     </select>
+
+    <select id="getInspectionById" resultType="com.mmc.pms.entity.inspection.InspectionDO">
+        select ins.id , ins.inspection_no, ins.inspection_name, ins.industry_type_id, ins.inspection_img,
+        ins.inspection_description, ins.sale_state as ins_sale_state, ins.case_img, ins.case_video, ins.create_time
+         from inspection ins
+          where ins.is_deleted = 0 and ins.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -22,6 +22,9 @@
         <if test="id != null">
             and id != #{id}
         </if>
+        <if test="inspectionId != null">
+            and inspection_id = #{inspectionId}
+        </if>
     </select>
 
     <select id="listByInspectionId" resultType="com.mmc.pms.entity.inspection.InspectionTagDO">