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

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

@@ -1069,7 +1069,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务未完成,不可评价", "服务未完成,不可评价");
         }
         //用户输入的完成情况，走内容审核
+        if(StringUtils.isNotBlank(formDTO.getFinishDesc())){
             textScan(formDTO.getFinishDesc());
+        }
         //当前操作用户是工作端用户还是居民端用户
         String userType = "";
         if (AppClientConstant.APP_GOV.equals(formDTO.getApp())) {

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java

@@ -13,6 +13,7 @@ import java.util.List;
 @Data
 public class BlockChainCreateProjectFormDTO implements Serializable {
 
+    private static final long serialVersionUID = 2061989652173136068L;
     @NotNull(message = "项目信息不能为空")
     private BlockChainProjectFormDTO project;
 

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java

@@ -12,6 +12,7 @@ import java.util.List;
 @Data
 public class BlockChainProcessProjectFormDTO implements Serializable {
 
+    private static final long serialVersionUID = -7316616101790749793L;
     @NotNull(message = "处理进展信息不能为空")
     private BlockChainProjectProcessFormDTO process;
 

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java

@@ -11,8 +11,13 @@ import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import feign.codec.Encoder;
 import feign.form.spring.SpringFormEncoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -72,9 +77,13 @@ public interface EpmetThirdOpenFeignClient {
 	Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input);
 
 	class MultipartSupportConfig {
+
+		@Autowired
+		private ObjectFactory<HttpMessageConverters> messageConverters;
+
 		@Bean
 		public Encoder feignFormEncoder() {
-			return new SpringFormEncoder();
+			return new SpringFormEncoder(new SpringEncoder(messageConverters));
 		}
 	}