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

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

@@ -0,0 +1,20 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class IcResiUserDemandFromDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
+    @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java

@@ -0,0 +1,10 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IcResiUserReportDemandRes implements Serializable {
+    private static final long serialVersionUID = 7043350476644105434L;
+}

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

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -180,4 +181,16 @@ public class IcUserDemandRecController {
         icUserDemandRecService.finish(formDTO);
         return new Result();
     }
+
+
+    /**
+     * 数据分析-个人档案，居民需求列表
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("mydemand")
+    public Result<PageData<IcResiUserReportDemandRes>> queryMyDemand(@RequestBody IcResiUserDemandFromDTO fromDTO){
+        ValidatorUtils.validateEntity(fromDTO,IcResiUserDemandFromDTO.AddUserInternalGroup.class);
+        return null;
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java

@@ -153,7 +153,7 @@ public class CustomerPartyBranchServiceImpl extends BaseServiceImpl<CustomerPart
     @Override
     public List<OptionResultDTO> getBranchOption(String gridId) {
         if (StringUtils.isBlank(gridId)) {
-            log.error("网格ID为空");
+            log.warn("网格ID为空");
             return Collections.emptyList();
         }
         LambdaQueryWrapper<CustomerPartyBranchEntity> wrapper = new LambdaQueryWrapper<>();