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

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml

@@ -32,6 +32,7 @@
             AND ORG_ID = #{agencyId}
             AND TYPE = #{category}
             AND MONTH_ID <![CDATA[ >= ]]> #{bottomMonthId}
+            AND MEET_CATEGORY_NAME IS NOT NULL
         ORDER BY
             MONTH_ID DESC ,
             MEET_CATEGORY_NAME

epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java

@@ -15,11 +15,18 @@ import java.io.Serializable;
 public class PublicCustomerGridListFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    public interface AddUserInternalGroup {
+    /**
-    }
+     * 地区码
-
+     * */
-    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    @NotBlank(message = "自动定位地区码不能为空", groups = {AreaCode.class})
-    }
+    private String areaCode;
+    /**
+     * 选定地区编码
+     * */
+    @NotBlank(message = "手动定位地区码不能为空", groups = {SelectedAreaCode.class})
+    private String selectedAreaCode;
+    public interface AddUserInternalGroup {}
+    public interface AddUserShowGroup extends CustomerClientShowGroup {}
 
     /**
      * 小程序appId
@@ -37,15 +44,9 @@ public class PublicCustomerGridListFormDTO implements Serializable {
      * */
     private Integer pageSize = 20;
 
-    /**
+    public interface AreaCode extends CustomerClientShowGroup {}
-     * 地区码
-     * */
-    private String areaCode;
 
-    /**
+    public interface SelectedAreaCode extends CustomerClientShowGroup {}
-     * 选定地区编码
-     * */
-    private String selectedAreaCode;
 
     /**
      *  是否首次位置授权(0:是 1:否)

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java

@@ -117,7 +117,7 @@ public class StrangerResiGuideController {
 	 **/
 	@PostMapping("publiclocationgridlist")
 	Result<List<PublicCustomerGridForStrangerResultDTO>> publicLocationGridList(@RequestBody PublicCustomerGridListFormDTO formDTO){
-		ValidatorUtils.validateEntity(formDTO);
+		ValidatorUtils.validateEntity(formDTO, PublicCustomerGridListFormDTO.AddUserShowGroup.class, PublicCustomerGridListFormDTO.AreaCode.class);
 		return strangerAccessRecordService.thirdCustomerGridList(formDTO);
 	}
 
@@ -128,7 +128,7 @@ public class StrangerResiGuideController {
 	 **/
 	@PostMapping("publiclelectcdgridlist")
 	Result<List<PublicCustomerGridForStrangerResultDTO>> publicLelectcdGridList(@RequestBody PublicCustomerGridListFormDTO formDTO){
-		ValidatorUtils.validateEntity(formDTO);
+		ValidatorUtils.validateEntity(formDTO, PublicCustomerGridListFormDTO.AddUserShowGroup.class, PublicCustomerGridListFormDTO.SelectedAreaCode.class);
 		return strangerAccessRecordService.thirdCustomerGridList(formDTO);
 	}