志愿者表格字段修改

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java

@@ -15,12 +15,12 @@ public enum KpiResultGridDataEnum {
     /***
      * 群众反映问题网格响应率得分
      */
-    GIRD_PROBLEM_RESPONSE_RATE_SCORE("gird_problem_response_rate_score","群众反映问题网格响应率得分"),
+    GRID_PROBLEM_RESPONSE_RATE_SCORE("grid_problem_response_rate_score","群众反映问题网格响应率得分"),
 
     /***
      * 群众反映问题网格办理满意率得分
      */
-    GIRD_PROBLEM_SATISFACTION_RATE_SCORE("gird_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分");
+    GRID_PROBLEM_SATISFACTION_RATE_SCORE("grid_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分");
 
 
     private String value;

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java

@@ -135,7 +135,7 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
         responseDetail.append(mapBigDecimal.get("peopleReportAmount") + ",");
         responseDetail.append("群众反应问题响应数:" + mapBigDecimal.get("peopleReportRespAmount"));
         dto.setRownum(2);
-        dto.setRule(KpiResultGridDataEnum.GIRD_PROBLEM_RESPONSE_RATE_SCORE.getName());
+        dto.setRule(KpiResultGridDataEnum.GRID_PROBLEM_RESPONSE_RATE_SCORE.getName());
         dto.setDetail(responseDetail.toString());
         listMap.add(dto);
 
@@ -145,7 +145,7 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
         satisfiedDetail.append("调查总数：" + mapBigDecimal.get("total") + ";满意数：" + mapBigDecimal.get("peopleHighEvaluationAmount") + ";基本满意数："
                 + mapBigDecimal.get("peopleMediumEvaluationAmount") + ";不满意数：" + mapBigDecimal.get("peopleLowEvaluationAmount"));
         dto1.setRownum(3);
-        dto1.setRule(KpiResultGridDataEnum.GIRD_PROBLEM_SATISFACTION_RATE_SCORE.getName());
+        dto1.setRule(KpiResultGridDataEnum.GRID_PROBLEM_SATISFACTION_RATE_SCORE.getName());
         dto1.setDetail(satisfiedDetail.toString());
         listMap.add(dto1);
         return listMap;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java

@@ -81,7 +81,7 @@ public class VolunteerInfoDTO implements Serializable {
     /**
      * 网格ID
      */
-    private Long girdId;
+    private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java

@@ -58,7 +58,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable {
     /**
      * 网格ID
      */
-    private Long girdId;
+    private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java

@@ -82,7 +82,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity {
     /**
      * 网格ID
      */
-	private Long girdId;
+	private Long gridId;
 
     /**
      * 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java

@@ -62,7 +62,7 @@ public class VolunteerInfoExcel {
     private Integer points;
 
     @Excel(name = "网格ID")
-    private Long girdId;
+    private Long gridId;
 
     @Excel(name = "父所有部门ID")
     private String parentDeptIds;

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

@@ -247,7 +247,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         volunteerEntity.setAddress(address);      // 居住地址
 
         // 获取部门信息
-        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGirdId()+"");
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGridId()+"");
         ParentAndAllDeptDTO parentAndAllDeptDTO = dtoResult.getData();
 
         volunteerEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());    // 父所有部门ID

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -14,7 +14,7 @@
         <result property="kindnessTime" column="KINDNESS_TIME"/>
         <result property="participationNum" column="PARTICIPATION_NUM"/>
         <result property="points" column="POINTS"/>
-        <result property="girdId" column="GIRD_ID"/>
+        <result property="gridId" column="GRID_ID"/>
         <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
         <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
         <result property="allDeptIds" column="ALL_DEPT_IDS"/>
@@ -112,7 +112,7 @@
             eu.REAL_NAME fullName,
             eu.MOBILE mobile,
             eu.IDENTITY_NO identityNo,
-			eugr.GRID_ID girdId,
+			eugr.GRID_ID gridId,
             eu.PARENT_DEPT_IDS parentDeptIds,
             eu.PARENT_DEPT_NAMES parentDeptNames,
             eu.ALL_DEPT_IDS allDeptIds,