Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -197,6 +197,17 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonService.equipmentClassification(type));
     }
 
+    /**
+     * 设备管道品种
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equipmentPipeType3ByParentCode")
+    @ApiOperation(httpMethod = "GET", value = "设备管道品种", notes = "设备管道品种")
+    public ResponseModel<List<EquipmentCategoryDto>> equipmentPipeType3ByParentCode(@RequestParam(value = "parentCode", required = false) String parentCode) {
+        return ResponseHelper.buildResponse(commonService.equipmentPipeType3ByParentCode(parentCode));
+    }
+
 
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -190,6 +190,8 @@ public interface ICommonService {
      */
     List<EquipmentCategoryDto> equipmentClassification(String type);
 
+    List<EquipmentCategoryDto> equipmentPipeType3ByParentCode(String parentCode);
+
     List<EquipmentCategoryDto> equipmentClassificationByParentCode(String type, String parentCode);
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -2134,6 +2134,12 @@ public class CommonServiceImpl implements ICommonService {
         return result;
     }
 
+    @Override
+    public List<EquipmentCategoryDto> equipmentPipeType3ByParentCode(String parentCode) {
+        List<EquipmentCategoryDto> categoryList = equipmentCategoryMapper.equipmentPipeType3ByParentCode(parentCode);
+        return categoryList;
+    }
+
     /**
      * 设备分类
      *

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -26,7 +26,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
     @Select("SELECT * FROM tz_equipment_category WHERE code NOT LIKE '7%' ORDER BY parent_id")
     List<EquipmentCategoryDto> selectClassifyNoStart7();
 
-
+    List<EquipmentCategoryDto> equipmentPipeType3ByParentCode(@Param("parentCode") String parentCode);
     List<EquipmentCategoryDto> selectClassifyNoStart7ByParentCode(@Param("parentCode") String parentCode);
 
     @Select("SELECT * FROM tz_equipment_category WHERE code NOT LIKE '7%' AND code NOT LIKE '8%' ORDER BY parent_id")

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -683,6 +683,17 @@
           AND "CLAIM_STATUS" = '已认领';
     </select>
 
+    <select id="equipmentPipeType3ByParentCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto">
+        select * from tz_equipment_category
+        <where>
+            code like '8%' and code NOT LIKE '%00'
+            <if test="parentCode != null and parentCode != ''">
+                and parent_id = (SELECT id FROM tz_equipment_category WHERE code = #{parentCode} )
+            </if>
+        </where>
+        ORDER BY parent_id
+    </select>
+
     <select id="selectClassifyNoStart7ByParentCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto">
         select * from tz_equipment_category
         <where>