新增serviceCategoryKey字段，发起服务接口修改，查询列表修改

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceRecordV2DTO.java

@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -109,4 +110,6 @@ public class IcServiceRecordV2DTO implements Serializable {
      */
 	private String policyId;
 
+    private String serviceCategoryKey;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java

@@ -37,6 +37,9 @@ public class IcServiceRecordV2AddEditFormDTO implements Serializable {
      */
     @NotBlank(message = "服务名称不能为空", groups = {AddGroup.class})
     private String serviceOrgType;
+
+    @NotBlank(message = "serviceCategoryKey不能为空", groups = {AddGroup.class})
+    private String serviceCategoryKey;
     /**
      * 服务组织Id
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -15,11 +16,16 @@ public class ServiceRecordV2ListFormDTO extends PageFormDTO implements Serializa
 
     private static final long serialVersionUID = 88592831607216246L;
 
+    public interface ServiceRecordV2ListForm{}
+
     /**
      * 服务名称
      */
     private String serviceName;
 
+    @NotBlank(message = "serviceCategoryKey不能为空",groups = ServiceRecordV2ListForm.class)
+    private String serviceCategoryKey;
+
     /**
      * 服务组织ID
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java

@@ -92,6 +92,7 @@ public class IcServiceRecordV2Controller {
      */
     @PostMapping("list")
     public Result<PageData> serviceRecordV2List(@LoginUser TokenDto tokenDto, @RequestBody ServiceRecordV2ListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, ServiceRecordV2ListFormDTO.ServiceRecordV2ListForm.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         return new Result<PageData>().ok(icServiceRecordV2Service.serviceRecordV2List(formDTO));

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordV2Entity.java

@@ -79,4 +79,6 @@ public class IcServiceRecordV2Entity extends BaseEpmetEntity {
      */
 	private String policyId;
 
+	private String serviceCategoryKey;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.26__add_service_v2_category.sql

@@ -0,0 +1 @@
+alter table ic_service_record_v2 add COLUMN SERVICE_CATEGORY_KEY VARCHAR(64) comment '服务类别KEY' AFTER remark;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml

@@ -19,6 +19,7 @@
         left JOIN ic_service_feedback_v2 sf ON sf.SERVICE_RECORD_ID = sr.ID AND sf.DEL_FLAG = 0
         INNER JOIN ic_service_scope_v2 ss ON ss.SERVICE_RECORD_ID = sr.ID AND ss.DEL_FLAG = '0'
         WHERE sr.DEL_FLAG = '0'
+            AND sr.SERVICE_CATEGORY_KEY = #{serviceCategoryKey}
             AND ss.OBJECT_ID_PATH LIKE concat('%',#{orgId},'%')
             AND sr.CUSTOMER_ID = #{customerId}
             <if test='serviceName != null and serviceName != ""'>