数据库字段统一修改

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolRecordDTO.java

@@ -61,7 +61,7 @@ public class IcPlacePatrolRecordDTO implements Serializable {
     /**
      * 场所类型【admin库sys_dict_data表九小场所value值】
      */
-	private String ninePlacsVal;
+	private String ninePlaceVal;
 
     /**
      * 场所下的组织Id

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamDTO.java

@@ -61,7 +61,7 @@ public class IcPlacePatrolTeamDTO implements Serializable {
     /**
      * 负责场所类型【admin库sys_dict_data表九小场所value值 多个值逗号分隔】
      */
-	private String ninePlacsVals;
+	private String ninePlaceVals;
 
     /**
      * 分队名称

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java

@@ -40,7 +40,7 @@ public class GetListPlaceOrgFormDTO implements Serializable {
     //场所区域【网格Id】
     private String gridId;
     //场所类型【九小场所Value值】
-    private String ninePlacsVal;
+    private String ninePlaceVal;
     //是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是
     private Boolean isPage = true;
     //页码

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java

@@ -38,7 +38,7 @@ public class GetListPlacePatrolRecordFormDTO implements Serializable {
     //场所区域【网格Id】
     private String gridId;
     //场所类型【九小场所Value值】
-    private String ninePlacsVal;
+    private String ninePlaceVal;
     //最终检查结果【0:合格 1:不合格】
     private String finalResult;
     //页码

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolTeamFormDTO.java

@@ -38,7 +38,7 @@ public class GetListPlacePatrolTeamFormDTO implements Serializable {
     //场所区域【网格Id】
     private String gridId;
     //场所类型【九小场所Value值】
-    private String ninePlacsVal;
+    private String ninePlaceVal;
     //是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是
     private Boolean isPage = true;
     //页码

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java

@@ -54,7 +54,7 @@ public class IcPlaceOrgController {
     @PostMapping("add")
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddPlaceOrgFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AddPlaceOrgFormDTO.Add.class);
-        formDTO.setCustomerId(tokenDto.getToken());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         placeOrgService.add(formDTO);
         return new Result();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java

@@ -54,7 +54,7 @@ public class IcPlacePatrolRecordController {
     @PostMapping("add")
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddPlacePatrolRecordFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AddPlacePatrolRecordFormDTO.Add.class);
-        formDTO.setCustomerId(tokenDto.getToken());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         placePatrolRecordService.add(formDTO);
         return new Result();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolReviewRecordController.java

@@ -54,7 +54,7 @@ public class IcPlacePatrolReviewRecordController {
     @PostMapping("add")
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddPlacePatrolReviewRecordFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AddPlacePatrolReviewRecordFormDTO.Add.class);
-        formDTO.setCustomerId(tokenDto.getToken());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         placePatrolReviewRecordService.add(formDTO);
         return new Result();
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java

@@ -55,7 +55,7 @@ public class IcPlacePatrolTeamController {
     @PostMapping("add")
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddPlacePatrolTeamFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AddPlacePatrolTeamFormDTO.Add.class);
-        formDTO.setCustomerId(tokenDto.getToken());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         placePatrolTeamService.add(formDTO);
         return new Result();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java

@@ -61,7 +61,7 @@ public class IcPlacePatrolRecordEntity extends BaseEpmetEntity {
     /**
      * 场所类型【admin库sys_dict_data表九小场所value值】
      */
-	private String ninePlacsVal;
+	private String ninePlaceVal;
 
     /**
      * 场所下的组织Id

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java

@@ -61,7 +61,7 @@ public class IcPlacePatrolTeamEntity extends BaseEpmetEntity {
     /**
      * 负责场所类型【admin库sys_dict_data表九小场所value值 多个值逗号分隔】
      */
-	private String ninePlacsVals;
+	private String ninePlaceVals;
 
     /**
      * 分队名称

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolRecordExcel.java

@@ -47,7 +47,7 @@ public class IcPlacePatrolRecordExcel {
     private String gridId;
 
     @Excel(name = "场所类型【admin库sys_dict_data表九小场所value值】")
-    private String ninePlacsVal;
+    private String ninePlaceVal;
 
     @Excel(name = "场所下的组织Id")
     private String placeOrgId;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolTeamExcel.java

@@ -47,7 +47,7 @@ public class IcPlacePatrolTeamExcel {
     private String gridIds;
 
     @Excel(name = "负责场所类型【admin库sys_dict_data表九小场所value值 多个值逗号分隔】")
-    private String ninePlacsVals;
+    private String ninePlaceVals;
 
     @Excel(name = "分队名称")
     private String teamName;

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

@@ -80,7 +80,7 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
     public void edit(EditPlaceOrgFormDTO formDTO) {
         IcPlaceOrgEntity entity = baseDao.selectById(formDTO.getPlaceOrgId());
         if (null == entity) {
-            throw new RenException(String.format("修改九小场所下组织信息失败，场所信息不存在，场所Id->%s", formDTO.getPlaceOrgId()));
+            throw new RenException(String.format("修改九小场所下场所信息失败，场所不存在，场所Id->%s", formDTO.getPlaceOrgId()));
         }
         entity = ConvertUtils.sourceToTarget(formDTO, IcPlaceOrgEntity.class);
         entity.setId(formDTO.getPlaceOrgId());
@@ -95,7 +95,7 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
     @Transactional(rollbackFor = Exception.class)
     public void del(String placeOrgId) {
         if (baseDao.deleteById(placeOrgId) < NumConstant.ONE) {
-            throw new RenException(String.format("修改九小场所下组织信息删除失败，场所Id->%s", placeOrgId));
+            throw new RenException(String.format("删除九小场所下场所信息失败，场所Id->%s", placeOrgId));
         }
     }
 

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

@@ -98,7 +98,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
         //1.修改复查记录表数据
         IcPlacePatrolReviewRecordEntity entity = baseDao.selectById(formDTO.getPlacePatrolReviewRecordId());
         if (null == entity) {
-            throw new RenException(String.format("修改巡查复查记录，复查记录不存在，复查记录Id->%s", formDTO.getPlacePatrolReviewRecordId()));
+            throw new RenException(String.format("修改巡查复查记录信息失败，复查记录不存在，复查记录Id->%s", formDTO.getPlacePatrolReviewRecordId()));
         }
         entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolReviewRecordEntity.class);
         entity.setId(formDTO.getPlacePatrolReviewRecordId());

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

@@ -133,7 +133,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
     public void del(String teamId) {
         //1.删除分队主表数据
         if (baseDao.deleteById(teamId) < NumConstant.ONE) {
-            throw new RenException(String.format("修改九小场所下组织信息删除失败，场所Id->%s", teamId));
+            throw new RenException(String.format("删除九小场所下分队信息失败，分队Id->%s", teamId));
         }
         //2.删除分队成员字表数据
         placePatrolTeamStaffService.delByTeamId(teamId);