Merge remote-tracking branch 'origin/dev_ic_mp' into develop

# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

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

@@ -41,7 +41,7 @@ public class EvaluateDemandFormDTO implements Serializable {
     private String userId;
     @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
-     // 政府端:gov、居民端:resi、运营端:oper
-     @NotBlank(message = "app不能为空", groups = AddUserInternalGroup.class)
+    // 政府端:gov、居民端:resi、运营端:oper
+    @NotBlank(message = "app不能为空", groups = AddUserInternalGroup.class)
     private String app;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -107,7 +107,6 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     @Value("${openapi.scan.method.textSyncScan}")
     private String textSyncScanMethod;
 
-
     @Override
     public IcUserDemandRecDTO get(String id) {
         IcUserDemandRecEntity entity = baseDao.selectById(id);
@@ -1078,26 +1077,6 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         return finishResultDTO;
     }
 
-    /**
-     * 需求内容，服务评价-完成情况走内容审核
-     * @param content
-     */
-    private void textScan(String content) {
-        TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-        TextTaskDTO taskDTO = new TextTaskDTO();
-        taskDTO.setContent(content);
-        taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
-        textScanParamDTO.getTasks().add(taskDTO);
-        Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-        if (!textSyncScanResult.success()) {
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-        } else {
-            if (!textSyncScanResult.getData().isAllPass()) {
-                throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
-            }
-        }
-    }
-
     /**
      * 居民端，我有需求，最近预约，显示最近预约过的五个需求，按照预约时间倒
      * 查询最近预约的5个编码
@@ -1357,6 +1336,25 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         return resultDto;
     }
 
+    /**
+     * 需求内容，服务评价-完成情况走内容审核
+     * @param content
+     */
+    private void textScan(String content) {
+        TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+        TextTaskDTO taskDTO = new TextTaskDTO();
+        taskDTO.setContent(content);
+        taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+        textScanParamDTO.getTasks().add(taskDTO);
+        Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+        if (!textSyncScanResult.success()) {
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        } else {
+            if (!textSyncScanResult.getData().isAllPass()) {
+                throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+            }
+        }
+    }
 
     /**
      * 我的需求被抢单->您提出的需求将由青岛亿联科技有限公司为您解决，请查看。