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

# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

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

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/19 4:19 下午
+ * @DESC
+ */
+@Data
+public class DelCommunitySelfOrganizationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 789228513283561471L;
+
+    public interface DelCommunitySelfOrganizationForm{}
+
+    @NotBlank(message = "orgId不能为空",groups = DelCommunitySelfOrganizationForm.class)
+    private String orgId;
+}

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

@@ -31,9 +31,7 @@ import com.epmet.dto.IcCommunitySelfOrganizationDTO;
 import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
 import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO;
 import com.epmet.dto.form.EditCommunitySelfOrganizationFormDTO;
-import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO;
-import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcCommunitySelfOrganizationExcel;
 import com.epmet.service.IcCommunitySelfOrganizationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -140,6 +138,19 @@ public class IcCommunitySelfOrganizationController {
         return new Result<CommunitySelfOrganizationListResultDTO>().ok(icCommunitySelfOrganizationService.communitySelfOrganizationList(tokenDto, formDTO));
     }
 
+    /**
+     * @Description  社区自组织删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 4:22 下午
+     */
+    @PostMapping("delcommunityselforganization")
+    public Result delCommunitySelfOrganization(@RequestBody DelCommunitySelfOrganizationFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, DelCommunitySelfOrganizationFormDTO.DelCommunitySelfOrganizationForm.class);
+        icCommunitySelfOrganizationService.delCommunitySelfOrganization(formDTO);
+        return new Result();
+    }
+
     /**
      * 需求指派，选择社区自组织，调用此接口
      * 返回需求所属社区下的 组织

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

@@ -24,9 +24,7 @@ import com.epmet.dto.IcCommunitySelfOrganizationDTO;
 import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
 import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO;
 import com.epmet.dto.form.EditCommunitySelfOrganizationFormDTO;
-import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO;
-import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcCommunitySelfOrganizationEntity;
 
 import java.util.List;
@@ -127,6 +125,15 @@ public interface IcCommunitySelfOrganizationService extends BaseService<IcCommun
      */
     CommunitySelfOrganizationListResultDTO communitySelfOrganizationList(TokenDto tokenDto, CommunitySelfOrganizationListFormDTO formDTO);
 
+    /**
+     * @Description  社区自组织删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 4:22 下午
+     */
+    void delCommunitySelfOrganization(DelCommunitySelfOrganizationFormDTO formDTO);
+
+
     /**
      * 需求指派，选择社区自组织，调用此接口
      * 返回需求所属社区下的 组织

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

@@ -23,6 +23,7 @@ import com.epmet.dto.IcCommunitySelfOrganizationDTO;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
 import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO;
+import com.epmet.dto.form.DelCommunitySelfOrganizationFormDTO;
 import com.epmet.dto.form.EditCommunitySelfOrganizationFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.CommunitySelfOrganizationListDTO;
@@ -223,6 +224,18 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         return result;
     }
 
+    /**
+     * @Description  社区自组织删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 4:22 下午
+     */
+    @Override
+    public void delCommunitySelfOrganization(DelCommunitySelfOrganizationFormDTO formDTO) {
+        baseDao.deleteById(formDTO.getOrgId());
+        personnelService.deleteByOrgId(formDTO.getOrgId());
+    }
+
     /**
      * 需求指派，选择社区自组织，调用此接口
      * 返回需求所属社区下的 组织

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationPersonnelDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.IcCommunitySelfOrganizationPersonnelDao">
 
     <!-- 根据社区自组织ID删除 -->
-    <delete id="deleteByOrgId">
+    <update id="deleteByOrgId">
         DELETE FROM ic_community_self_organization_personnel WHERE ORG_ID = #{orgId}
-    </delete>
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlaceOrgDTO.java → epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgDTO.java

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlaceOrgDTO implements Serializable {
+public class IcPlaceOrgDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlacePatrolRecordDTO implements Serializable {
+public class IcPlacePatrolRecordDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolReviewRecordDTO.java → epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolReviewRecordDTO.java

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlacePatrolReviewRecordDTO implements Serializable {
+public class IcPlacePatrolReviewRecordDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlacePatrolTeamDTO implements Serializable {
+public class IcPlacePatrolTeamDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolTeamStaffDTO.java → epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamStaffDTO.java

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlacePatrolTeamStaffDTO implements Serializable {
+public class IcPlacePatrolTeamStaffDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,6 +1,6 @@
 package com.epmet.dto.result;
 
-import com.epmet.dto.PlacePatrolTeamStaffDTO;
+import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,6 +33,6 @@ public class PlacePatrolTeamDetailResultDTO implements Serializable {
     //创建时间
     private String time;
     //分队成员信息
-    private List<PlacePatrolTeamStaffDTO> memberList;
+    private List<IcPlacePatrolTeamStaffDTO> memberList;
 
 }

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

@@ -26,7 +26,7 @@ import com.epmet.dto.form.EditPlaceOrgFormDTO;
 import com.epmet.dto.form.GetListPlaceOrgFormDTO;
 import com.epmet.dto.result.GetListPlaceOrgResultDTO;
 import com.epmet.dto.result.PlaceOrgDetailResultDTO;
-import com.epmet.service.PlaceOrgService;
+import com.epmet.service.IcPlaceOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,10 +42,10 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("placeorg")
-public class PlaceOrgController {
+public class IcPlaceOrgController {
     
     @Autowired
-    private PlaceOrgService placeOrgService;
+    private IcPlaceOrgService placeOrgService;
 
     /**
      * @Author sun

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

@@ -25,9 +25,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.dto.PlacePatrolRecordDTO;
-import com.epmet.excel.PlacePatrolRecordExcel;
-import com.epmet.service.PlacePatrolRecordService;
+import com.epmet.dto.IcPlacePatrolRecordDTO;
+import com.epmet.excel.IcPlacePatrolRecordExcel;
+import com.epmet.service.IcPlacePatrolRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,25 +44,25 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("placepatrolrecord")
-public class PlacePatrolRecordController {
+public class IcPlacePatrolRecordController {
     
     @Autowired
-    private PlacePatrolRecordService placePatrolRecordService;
+    private IcPlacePatrolRecordService placePatrolRecordService;
 
     @GetMapping("page")
-    public Result<PageData<PlacePatrolRecordDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PlacePatrolRecordDTO> page = placePatrolRecordService.page(params);
-        return new Result<PageData<PlacePatrolRecordDTO>>().ok(page);
+    public Result<PageData<IcPlacePatrolRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPlacePatrolRecordDTO> page = placePatrolRecordService.page(params);
+        return new Result<PageData<IcPlacePatrolRecordDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<PlacePatrolRecordDTO> get(@PathVariable("id") String id){
-        PlacePatrolRecordDTO data = placePatrolRecordService.get(id);
-        return new Result<PlacePatrolRecordDTO>().ok(data);
+    public Result<IcPlacePatrolRecordDTO> get(@PathVariable("id") String id){
+        IcPlacePatrolRecordDTO data = placePatrolRecordService.get(id);
+        return new Result<IcPlacePatrolRecordDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody PlacePatrolRecordDTO dto){
+    public Result save(@RequestBody IcPlacePatrolRecordDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         placePatrolRecordService.save(dto);
@@ -70,7 +70,7 @@ public class PlacePatrolRecordController {
     }
 
     @PutMapping
-    public Result update(@RequestBody PlacePatrolRecordDTO dto){
+    public Result update(@RequestBody IcPlacePatrolRecordDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         placePatrolRecordService.update(dto);
@@ -87,8 +87,8 @@ public class PlacePatrolRecordController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<PlacePatrolRecordDTO> list = placePatrolRecordService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolRecordExcel.class);
+        List<IcPlacePatrolRecordDTO> list = placePatrolRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPlacePatrolRecordExcel.class);
     }
 
 }

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

@@ -25,9 +25,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.dto.PlacePatrolReviewRecordDTO;
-import com.epmet.excel.PlacePatrolReviewRecordExcel;
-import com.epmet.service.PlacePatrolReviewRecordService;
+import com.epmet.dto.IcPlacePatrolReviewRecordDTO;
+import com.epmet.excel.IcPlacePatrolReviewRecordExcel;
+import com.epmet.service.IcPlacePatrolReviewRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,25 +44,25 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("placepatrolreviewrecord")
-public class PlacePatrolReviewRecordController {
+public class IcPlacePatrolReviewRecordController {
     
     @Autowired
-    private PlacePatrolReviewRecordService placePatrolReviewRecordService;
+    private IcPlacePatrolReviewRecordService placePatrolReviewRecordService;
 
     @GetMapping("page")
-    public Result<PageData<PlacePatrolReviewRecordDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PlacePatrolReviewRecordDTO> page = placePatrolReviewRecordService.page(params);
-        return new Result<PageData<PlacePatrolReviewRecordDTO>>().ok(page);
+    public Result<PageData<IcPlacePatrolReviewRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPlacePatrolReviewRecordDTO> page = placePatrolReviewRecordService.page(params);
+        return new Result<PageData<IcPlacePatrolReviewRecordDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<PlacePatrolReviewRecordDTO> get(@PathVariable("id") String id){
-        PlacePatrolReviewRecordDTO data = placePatrolReviewRecordService.get(id);
-        return new Result<PlacePatrolReviewRecordDTO>().ok(data);
+    public Result<IcPlacePatrolReviewRecordDTO> get(@PathVariable("id") String id){
+        IcPlacePatrolReviewRecordDTO data = placePatrolReviewRecordService.get(id);
+        return new Result<IcPlacePatrolReviewRecordDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody PlacePatrolReviewRecordDTO dto){
+    public Result save(@RequestBody IcPlacePatrolReviewRecordDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         placePatrolReviewRecordService.save(dto);
@@ -70,7 +70,7 @@ public class PlacePatrolReviewRecordController {
     }
 
     @PutMapping
-    public Result update(@RequestBody PlacePatrolReviewRecordDTO dto){
+    public Result update(@RequestBody IcPlacePatrolReviewRecordDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         placePatrolReviewRecordService.update(dto);
@@ -87,8 +87,8 @@ public class PlacePatrolReviewRecordController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<PlacePatrolReviewRecordDTO> list = placePatrolReviewRecordService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolReviewRecordExcel.class);
+        List<IcPlacePatrolReviewRecordDTO> list = placePatrolReviewRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPlacePatrolReviewRecordExcel.class);
     }
 
 }

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

@@ -26,7 +26,7 @@ import com.epmet.dto.form.EditPlacePatrolTeamFormDTO;
 import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
 import com.epmet.dto.result.GetListPlacePatrolTeamResultDTO;
 import com.epmet.dto.result.PlacePatrolTeamDetailResultDTO;
-import com.epmet.service.PlacePatrolTeamService;
+import com.epmet.service.IcPlacePatrolTeamService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,10 +42,10 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("placepatrolteam")
-public class PlacePatrolTeamController {
+public class IcPlacePatrolTeamController {
     
     @Autowired
-    private PlacePatrolTeamService placePatrolTeamService;
+    private IcPlacePatrolTeamService placePatrolTeamService;
 
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolTeamStaffController.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamStaffController.java

@@ -25,9 +25,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.dto.PlacePatrolTeamStaffDTO;
-import com.epmet.excel.PlacePatrolTeamStaffExcel;
-import com.epmet.service.PlacePatrolTeamStaffService;
+import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
+import com.epmet.excel.IcPlacePatrolTeamStaffExcel;
+import com.epmet.service.IcPlacePatrolTeamStaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,25 +44,25 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("placepatrolteamstaff")
-public class PlacePatrolTeamStaffController {
+public class IcPlacePatrolTeamStaffController {
     
     @Autowired
-    private PlacePatrolTeamStaffService placePatrolTeamStaffService;
+    private IcPlacePatrolTeamStaffService placePatrolTeamStaffService;
 
     @GetMapping("page")
-    public Result<PageData<PlacePatrolTeamStaffDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PlacePatrolTeamStaffDTO> page = placePatrolTeamStaffService.page(params);
-        return new Result<PageData<PlacePatrolTeamStaffDTO>>().ok(page);
+    public Result<PageData<IcPlacePatrolTeamStaffDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPlacePatrolTeamStaffDTO> page = placePatrolTeamStaffService.page(params);
+        return new Result<PageData<IcPlacePatrolTeamStaffDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<PlacePatrolTeamStaffDTO> get(@PathVariable("id") String id){
-        PlacePatrolTeamStaffDTO data = placePatrolTeamStaffService.get(id);
-        return new Result<PlacePatrolTeamStaffDTO>().ok(data);
+    public Result<IcPlacePatrolTeamStaffDTO> get(@PathVariable("id") String id){
+        IcPlacePatrolTeamStaffDTO data = placePatrolTeamStaffService.get(id);
+        return new Result<IcPlacePatrolTeamStaffDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody PlacePatrolTeamStaffDTO dto){
+    public Result save(@RequestBody IcPlacePatrolTeamStaffDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         placePatrolTeamStaffService.save(dto);
@@ -70,7 +70,7 @@ public class PlacePatrolTeamStaffController {
     }
 
     @PutMapping
-    public Result update(@RequestBody PlacePatrolTeamStaffDTO dto){
+    public Result update(@RequestBody IcPlacePatrolTeamStaffDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         placePatrolTeamStaffService.update(dto);
@@ -87,8 +87,8 @@ public class PlacePatrolTeamStaffController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<PlacePatrolTeamStaffDTO> list = placePatrolTeamStaffService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolTeamStaffExcel.class);
+        List<IcPlacePatrolTeamStaffDTO> list = placePatrolTeamStaffService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPlacePatrolTeamStaffExcel.class);
     }
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlaceOrgDao.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java

@@ -19,9 +19,8 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.GetListPlaceOrgFormDTO;
-import com.epmet.dto.result.GetListPlaceOrgResultDTO;
 import com.epmet.dto.result.PlaceOrgDetailResultDTO;
-import com.epmet.entity.PlaceOrgEntity;
+import com.epmet.entity.IcPlaceOrgEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -33,7 +32,7 @@ import java.util.List;
  * @since v1.0.0 2021-11-18
  */
 @Mapper
-public interface PlaceOrgDao extends BaseDao<PlaceOrgEntity> {
+public interface IcPlaceOrgDao extends BaseDao<IcPlaceOrgEntity> {
 
     /**
      * @Author sun

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolRecordDao.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolRecordDao.java

@@ -18,7 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.PlacePatrolRecordEntity;
+import com.epmet.entity.IcPlacePatrolRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2021-11-18
  */
 @Mapper
-public interface PlacePatrolRecordDao extends BaseDao<PlacePatrolRecordEntity> {
+public interface IcPlacePatrolRecordDao extends BaseDao<IcPlacePatrolRecordEntity> {
 	
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolReviewRecordDao.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolReviewRecordDao.java

@@ -18,7 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.PlacePatrolReviewRecordEntity;
+import com.epmet.entity.IcPlacePatrolReviewRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2021-11-18
  */
 @Mapper
-public interface PlacePatrolReviewRecordDao extends BaseDao<PlacePatrolReviewRecordEntity> {
+public interface IcPlacePatrolReviewRecordDao extends BaseDao<IcPlacePatrolReviewRecordEntity> {
 	
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolTeamDao.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamDao.java

@@ -20,7 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
 import com.epmet.dto.result.PlacePatrolTeamDetailResultDTO;
-import com.epmet.entity.PlacePatrolTeamEntity;
+import com.epmet.entity.IcPlacePatrolTeamEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -32,7 +32,7 @@ import java.util.List;
  * @since v1.0.0 2021-11-18
  */
 @Mapper
-public interface PlacePatrolTeamDao extends BaseDao<PlacePatrolTeamEntity> {
+public interface IcPlacePatrolTeamDao extends BaseDao<IcPlacePatrolTeamEntity> {
 
     /**
      * @Author sun

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolTeamStaffDao.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamStaffDao.java

@@ -18,8 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.PlacePatrolTeamStaffDTO;
-import com.epmet.entity.PlacePatrolTeamStaffEntity;
+import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
+import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -32,7 +32,7 @@ import java.util.List;
  * @since v1.0.0 2021-11-18
  */
 @Mapper
-public interface PlacePatrolTeamStaffDao extends BaseDao<PlacePatrolTeamStaffEntity> {
+public interface IcPlacePatrolTeamStaffDao extends BaseDao<IcPlacePatrolTeamStaffEntity> {
 
     /**
      * @Author sun
@@ -44,5 +44,5 @@ public interface PlacePatrolTeamStaffDao extends BaseDao<PlacePatrolTeamStaffEnt
      * @Author sun
      * @Description 删除分队下成员信息
      **/
-    List<PlacePatrolTeamStaffDTO> getByTeamId(@Param("teamId") String teamId);
+    List<IcPlacePatrolTeamStaffDTO> getByTeamId(@Param("teamId") String teamId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlaceOrgEntity.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java

@@ -34,7 +34,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("place_org")
-public class PlaceOrgEntity extends BaseEpmetEntity {
+public class IcPlaceOrgEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -34,7 +34,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("place_patrol_record")
-public class PlacePatrolRecordEntity extends BaseEpmetEntity {
+public class IcPlacePatrolRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolReviewRecordEntity.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java

@@ -34,7 +34,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("place_patrol_review_record")
-public class PlacePatrolReviewRecordEntity extends BaseEpmetEntity {
+public class IcPlacePatrolReviewRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -34,7 +34,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("place_patrol_team")
-public class PlacePatrolTeamEntity extends BaseEpmetEntity {
+public class IcPlacePatrolTeamEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamStaffEntity.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java

@@ -34,7 +34,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("place_patrol_team_staff")
-public class PlacePatrolTeamStaffEntity extends BaseEpmetEntity {
+public class IcPlacePatrolTeamStaffEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlaceOrgExcel.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlaceOrgExcel.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlaceOrgExcel {
+public class IcPlaceOrgExcel {
 
     @Excel(name = "唯一标识")
     private String id;

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

@@ -29,7 +29,7 @@ import java.util.Date;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlacePatrolRecordExcel {
+public class IcPlacePatrolRecordExcel {
 
     @Excel(name = "唯一标识")
     private String id;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolReviewRecordExcel.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolReviewRecordExcel.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlacePatrolReviewRecordExcel {
+public class IcPlacePatrolReviewRecordExcel {
 
     @Excel(name = "唯一标识")
     private String id;

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

@@ -29,7 +29,7 @@ import java.util.Date;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlacePatrolTeamExcel {
+public class IcPlacePatrolTeamExcel {
 
     @Excel(name = "唯一标识")
     private String id;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolTeamStaffExcel.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolTeamStaffExcel.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class PlacePatrolTeamStaffExcel {
+public class IcPlacePatrolTeamStaffExcel {
 
     @Excel(name = "唯一标识")
     private String id;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlaceOrgService.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java

@@ -23,7 +23,7 @@ import com.epmet.dto.form.EditPlaceOrgFormDTO;
 import com.epmet.dto.form.GetListPlaceOrgFormDTO;
 import com.epmet.dto.result.GetListPlaceOrgResultDTO;
 import com.epmet.dto.result.PlaceOrgDetailResultDTO;
-import com.epmet.entity.PlaceOrgEntity;
+import com.epmet.entity.IcPlaceOrgEntity;
 
 /**
  * 九小场所下组织管理
@@ -31,7 +31,7 @@ import com.epmet.entity.PlaceOrgEntity;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-18
  */
-public interface PlaceOrgService extends BaseService<PlaceOrgEntity> {
+public interface IcPlaceOrgService extends BaseService<IcPlaceOrgEntity> {
 
     /**
      * @Author sun

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolRecordService.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java

@@ -19,8 +19,8 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.PlacePatrolRecordDTO;
-import com.epmet.entity.PlacePatrolRecordEntity;
+import com.epmet.dto.IcPlacePatrolRecordDTO;
+import com.epmet.entity.IcPlacePatrolRecordEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -31,7 +31,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-18
  */
-public interface PlacePatrolRecordService extends BaseService<PlacePatrolRecordEntity> {
+public interface IcPlacePatrolRecordService extends BaseService<IcPlacePatrolRecordEntity> {
 
     /**
      * 默认分页
@@ -41,7 +41,7 @@ public interface PlacePatrolRecordService extends BaseService<PlacePatrolRecordE
      * @author generator
      * @date 2021-11-18
      */
-    PageData<PlacePatrolRecordDTO> page(Map<String, Object> params);
+    PageData<IcPlacePatrolRecordDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
@@ -51,7 +51,7 @@ public interface PlacePatrolRecordService extends BaseService<PlacePatrolRecordE
      * @author generator
      * @date 2021-11-18
      */
-    List<PlacePatrolRecordDTO> list(Map<String, Object> params);
+    List<IcPlacePatrolRecordDTO> list(Map<String, Object> params);
 
     /**
      * 单条查询
@@ -61,7 +61,7 @@ public interface PlacePatrolRecordService extends BaseService<PlacePatrolRecordE
      * @author generator
      * @date 2021-11-18
      */
-    PlacePatrolRecordDTO get(String id);
+    IcPlacePatrolRecordDTO get(String id);
 
     /**
      * 默认保存
@@ -71,7 +71,7 @@ public interface PlacePatrolRecordService extends BaseService<PlacePatrolRecordE
      * @author generator
      * @date 2021-11-18
      */
-    void save(PlacePatrolRecordDTO dto);
+    void save(IcPlacePatrolRecordDTO dto);
 
     /**
      * 默认更新
@@ -81,7 +81,7 @@ public interface PlacePatrolRecordService extends BaseService<PlacePatrolRecordE
      * @author generator
      * @date 2021-11-18
      */
-    void update(PlacePatrolRecordDTO dto);
+    void update(IcPlacePatrolRecordDTO dto);
 
     /**
      * 批量删除

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolReviewRecordService.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolReviewRecordService.java

@@ -19,8 +19,8 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.PlacePatrolReviewRecordDTO;
-import com.epmet.entity.PlacePatrolReviewRecordEntity;
+import com.epmet.dto.IcPlacePatrolReviewRecordDTO;
+import com.epmet.entity.IcPlacePatrolReviewRecordEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -31,7 +31,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-18
  */
-public interface PlacePatrolReviewRecordService extends BaseService<PlacePatrolReviewRecordEntity> {
+public interface IcPlacePatrolReviewRecordService extends BaseService<IcPlacePatrolReviewRecordEntity> {
 
     /**
      * 默认分页
@@ -41,7 +41,7 @@ public interface PlacePatrolReviewRecordService extends BaseService<PlacePatrolR
      * @author generator
      * @date 2021-11-18
      */
-    PageData<PlacePatrolReviewRecordDTO> page(Map<String, Object> params);
+    PageData<IcPlacePatrolReviewRecordDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
@@ -51,7 +51,7 @@ public interface PlacePatrolReviewRecordService extends BaseService<PlacePatrolR
      * @author generator
      * @date 2021-11-18
      */
-    List<PlacePatrolReviewRecordDTO> list(Map<String, Object> params);
+    List<IcPlacePatrolReviewRecordDTO> list(Map<String, Object> params);
 
     /**
      * 单条查询
@@ -61,7 +61,7 @@ public interface PlacePatrolReviewRecordService extends BaseService<PlacePatrolR
      * @author generator
      * @date 2021-11-18
      */
-    PlacePatrolReviewRecordDTO get(String id);
+    IcPlacePatrolReviewRecordDTO get(String id);
 
     /**
      * 默认保存
@@ -71,7 +71,7 @@ public interface PlacePatrolReviewRecordService extends BaseService<PlacePatrolR
      * @author generator
      * @date 2021-11-18
      */
-    void save(PlacePatrolReviewRecordDTO dto);
+    void save(IcPlacePatrolReviewRecordDTO dto);
 
     /**
      * 默认更新
@@ -81,7 +81,7 @@ public interface PlacePatrolReviewRecordService extends BaseService<PlacePatrolR
      * @author generator
      * @date 2021-11-18
      */
-    void update(PlacePatrolReviewRecordDTO dto);
+    void update(IcPlacePatrolReviewRecordDTO dto);
 
     /**
      * 批量删除

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolTeamService.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamService.java

@@ -18,17 +18,12 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.PlacePatrolTeamDTO;
 import com.epmet.dto.form.AddPlacePatrolTeamFormDTO;
 import com.epmet.dto.form.EditPlacePatrolTeamFormDTO;
 import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
 import com.epmet.dto.result.GetListPlacePatrolTeamResultDTO;
 import com.epmet.dto.result.PlacePatrolTeamDetailResultDTO;
-import com.epmet.entity.PlacePatrolTeamEntity;
-
-import java.util.List;
-import java.util.Map;
+import com.epmet.entity.IcPlacePatrolTeamEntity;
 
 /**
  * 场所分队管理
@@ -36,7 +31,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-18
  */
-public interface PlacePatrolTeamService extends BaseService<PlacePatrolTeamEntity> {
+public interface IcPlacePatrolTeamService extends BaseService<IcPlacePatrolTeamEntity> {
 
     /**
      * @Author sun

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolTeamStaffService.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java

@@ -19,8 +19,8 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.PlacePatrolTeamStaffDTO;
-import com.epmet.entity.PlacePatrolTeamStaffEntity;
+import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
+import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -31,7 +31,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-18
  */
-public interface PlacePatrolTeamStaffService extends BaseService<PlacePatrolTeamStaffEntity> {
+public interface IcPlacePatrolTeamStaffService extends BaseService<IcPlacePatrolTeamStaffEntity> {
 
     /**
      * 默认分页
@@ -41,7 +41,7 @@ public interface PlacePatrolTeamStaffService extends BaseService<PlacePatrolTeam
      * @author generator
      * @date 2021-11-18
      */
-    PageData<PlacePatrolTeamStaffDTO> page(Map<String, Object> params);
+    PageData<IcPlacePatrolTeamStaffDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
@@ -51,7 +51,7 @@ public interface PlacePatrolTeamStaffService extends BaseService<PlacePatrolTeam
      * @author generator
      * @date 2021-11-18
      */
-    List<PlacePatrolTeamStaffDTO> list(Map<String, Object> params);
+    List<IcPlacePatrolTeamStaffDTO> list(Map<String, Object> params);
 
     /**
      * 单条查询
@@ -61,7 +61,7 @@ public interface PlacePatrolTeamStaffService extends BaseService<PlacePatrolTeam
      * @author generator
      * @date 2021-11-18
      */
-    PlacePatrolTeamStaffDTO get(String id);
+    IcPlacePatrolTeamStaffDTO get(String id);
 
     /**
      * 默认保存
@@ -71,7 +71,7 @@ public interface PlacePatrolTeamStaffService extends BaseService<PlacePatrolTeam
      * @author generator
      * @date 2021-11-18
      */
-    void save(PlacePatrolTeamStaffDTO dto);
+    void save(IcPlacePatrolTeamStaffDTO dto);
 
     /**
      * 默认更新
@@ -81,7 +81,7 @@ public interface PlacePatrolTeamStaffService extends BaseService<PlacePatrolTeam
      * @author generator
      * @date 2021-11-18
      */
-    void update(PlacePatrolTeamStaffDTO dto);
+    void update(IcPlacePatrolTeamStaffDTO dto);
 
     /**
      * 批量删除

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

@@ -25,18 +25,15 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dao.PlaceOrgDao;
+import com.epmet.dao.IcPlaceOrgDao;
 import com.epmet.dto.form.AddPlaceOrgFormDTO;
 import com.epmet.dto.form.EditPlaceOrgFormDTO;
 import com.epmet.dto.form.GetListPlaceOrgFormDTO;
-import com.epmet.dto.form.UserIdsFormDTO;
 import com.epmet.dto.result.GetListPlaceOrgResultDTO;
-import com.epmet.dto.result.GetListSocietyOrgResultDTO;
 import com.epmet.dto.result.PlaceOrgDetailResultDTO;
-import com.epmet.dto.result.StaffSinGridResultDTO;
-import com.epmet.entity.PlaceOrgEntity;
+import com.epmet.entity.IcPlaceOrgEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
-import com.epmet.service.PlaceOrgService;
+import com.epmet.service.IcPlaceOrgService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
@@ -47,7 +44,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 九小场所下组织管理
@@ -56,8 +52,8 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2021-11-18
  */
 @Service
-public class PlaceOrgServiceImpl extends BaseServiceImpl<PlaceOrgDao, PlaceOrgEntity> implements PlaceOrgService {
-    private static final Logger log = LoggerFactory.getLogger(PlaceOrgServiceImpl.class);
+public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlaceOrgEntity> implements IcPlaceOrgService {
+    private static final Logger log = LoggerFactory.getLogger(IcPlaceOrgServiceImpl.class);
     @Autowired
     private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
 
@@ -68,7 +64,7 @@ public class PlaceOrgServiceImpl extends BaseServiceImpl<PlaceOrgDao, PlaceOrgEn
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void add(AddPlaceOrgFormDTO formDTO) {
-        PlaceOrgEntity entity = ConvertUtils.sourceToTarget(formDTO, PlaceOrgEntity.class);
+        IcPlaceOrgEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPlaceOrgEntity.class);
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         entity.setAgencyId(staffInfoCache.getAgencyId());
         entity.setPids(staffInfoCache.getAgencyPIds());
@@ -82,11 +78,11 @@ public class PlaceOrgServiceImpl extends BaseServiceImpl<PlaceOrgDao, PlaceOrgEn
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void edit(EditPlaceOrgFormDTO formDTO) {
-        PlaceOrgEntity entity = baseDao.selectById(formDTO.getPlaceOrgId());
+        IcPlaceOrgEntity entity = baseDao.selectById(formDTO.getPlaceOrgId());
         if (null == entity) {
             throw new RenException(String.format("修改九小场所下组织信息失败，场所信息不存在，场所Id->%s", formDTO.getPlaceOrgId()));
         }
-        entity = ConvertUtils.sourceToTarget(formDTO, PlaceOrgEntity.class);
+        entity = ConvertUtils.sourceToTarget(formDTO, IcPlaceOrgEntity.class);
         baseDao.updateById(entity);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolRecordServiceImpl.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java

@@ -23,10 +23,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.dao.PlacePatrolRecordDao;
-import com.epmet.dto.PlacePatrolRecordDTO;
-import com.epmet.entity.PlacePatrolRecordEntity;
-import com.epmet.service.PlacePatrolRecordService;
+import com.epmet.dao.IcPlacePatrolRecordDao;
+import com.epmet.dto.IcPlacePatrolRecordDTO;
+import com.epmet.entity.IcPlacePatrolRecordEntity;
+import com.epmet.service.IcPlacePatrolRecordService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,51 +42,51 @@ import java.util.Map;
  * @since v1.0.0 2021-11-18
  */
 @Service
-public class PlacePatrolRecordServiceImpl extends BaseServiceImpl<PlacePatrolRecordDao, PlacePatrolRecordEntity> implements PlacePatrolRecordService {
+public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatrolRecordDao, IcPlacePatrolRecordEntity> implements IcPlacePatrolRecordService {
 
 
     @Override
-    public PageData<PlacePatrolRecordDTO> page(Map<String, Object> params) {
-        IPage<PlacePatrolRecordEntity> page = baseDao.selectPage(
+    public PageData<IcPlacePatrolRecordDTO> page(Map<String, Object> params) {
+        IPage<IcPlacePatrolRecordEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, PlacePatrolRecordDTO.class);
+        return getPageData(page, IcPlacePatrolRecordDTO.class);
     }
 
     @Override
-    public List<PlacePatrolRecordDTO> list(Map<String, Object> params) {
-        List<PlacePatrolRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+    public List<IcPlacePatrolRecordDTO> list(Map<String, Object> params) {
+        List<IcPlacePatrolRecordEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, PlacePatrolRecordDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, IcPlacePatrolRecordDTO.class);
     }
 
-    private QueryWrapper<PlacePatrolRecordEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<IcPlacePatrolRecordEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<PlacePatrolRecordEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<IcPlacePatrolRecordEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public PlacePatrolRecordDTO get(String id) {
-        PlacePatrolRecordEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PlacePatrolRecordDTO.class);
+    public IcPlacePatrolRecordDTO get(String id) {
+        IcPlacePatrolRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcPlacePatrolRecordDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(PlacePatrolRecordDTO dto) {
-        PlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolRecordEntity.class);
+    public void save(IcPlacePatrolRecordDTO dto) {
+        IcPlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolRecordEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(PlacePatrolRecordDTO dto) {
-        PlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolRecordEntity.class);
+    public void update(IcPlacePatrolRecordDTO dto) {
+        IcPlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolRecordEntity.class);
         updateById(entity);
     }
 

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

@@ -23,10 +23,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.dao.PlacePatrolReviewRecordDao;
-import com.epmet.dto.PlacePatrolReviewRecordDTO;
-import com.epmet.entity.PlacePatrolReviewRecordEntity;
-import com.epmet.service.PlacePatrolReviewRecordService;
+import com.epmet.dao.IcPlacePatrolReviewRecordDao;
+import com.epmet.dto.IcPlacePatrolReviewRecordDTO;
+import com.epmet.entity.IcPlacePatrolReviewRecordEntity;
+import com.epmet.service.IcPlacePatrolReviewRecordService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,51 +42,51 @@ import java.util.Map;
  * @since v1.0.0 2021-11-18
  */
 @Service
-public class PlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<PlacePatrolReviewRecordDao, PlacePatrolReviewRecordEntity> implements PlacePatrolReviewRecordService {
+public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlacePatrolReviewRecordDao, IcPlacePatrolReviewRecordEntity> implements IcPlacePatrolReviewRecordService {
 
 
     @Override
-    public PageData<PlacePatrolReviewRecordDTO> page(Map<String, Object> params) {
-        IPage<PlacePatrolReviewRecordEntity> page = baseDao.selectPage(
+    public PageData<IcPlacePatrolReviewRecordDTO> page(Map<String, Object> params) {
+        IPage<IcPlacePatrolReviewRecordEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, PlacePatrolReviewRecordDTO.class);
+        return getPageData(page, IcPlacePatrolReviewRecordDTO.class);
     }
 
     @Override
-    public List<PlacePatrolReviewRecordDTO> list(Map<String, Object> params) {
-        List<PlacePatrolReviewRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+    public List<IcPlacePatrolReviewRecordDTO> list(Map<String, Object> params) {
+        List<IcPlacePatrolReviewRecordEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, PlacePatrolReviewRecordDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, IcPlacePatrolReviewRecordDTO.class);
     }
 
-    private QueryWrapper<PlacePatrolReviewRecordEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<IcPlacePatrolReviewRecordEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<PlacePatrolReviewRecordEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<IcPlacePatrolReviewRecordEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public PlacePatrolReviewRecordDTO get(String id) {
-        PlacePatrolReviewRecordEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PlacePatrolReviewRecordDTO.class);
+    public IcPlacePatrolReviewRecordDTO get(String id) {
+        IcPlacePatrolReviewRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcPlacePatrolReviewRecordDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(PlacePatrolReviewRecordDTO dto) {
-        PlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolReviewRecordEntity.class);
+    public void save(IcPlacePatrolReviewRecordDTO dto) {
+        IcPlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolReviewRecordEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(PlacePatrolReviewRecordDTO dto) {
-        PlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolReviewRecordEntity.class);
+    public void update(IcPlacePatrolReviewRecordDTO dto) {
+        IcPlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolReviewRecordEntity.class);
         updateById(entity);
     }
 

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

@@ -26,26 +26,20 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerGridDao;
-import com.epmet.dao.PlacePatrolTeamDao;
+import com.epmet.dao.IcPlacePatrolTeamDao;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.PlacePatrolTeamStaffDTO;
 import com.epmet.dto.form.AddPlacePatrolTeamFormDTO;
 import com.epmet.dto.form.EditPlacePatrolTeamFormDTO;
-import com.epmet.dto.form.GetListPlaceOrgFormDTO;
 import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
-import com.epmet.dto.result.GetListPlaceOrgResultDTO;
 import com.epmet.dto.result.GetListPlacePatrolTeamResultDTO;
-import com.epmet.dto.result.PlaceOrgDetailResultDTO;
 import com.epmet.dto.result.PlacePatrolTeamDetailResultDTO;
-import com.epmet.entity.PlaceOrgEntity;
-import com.epmet.entity.PlacePatrolTeamEntity;
-import com.epmet.entity.PlacePatrolTeamStaffEntity;
+import com.epmet.entity.IcPlacePatrolTeamEntity;
+import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
-import com.epmet.service.PlacePatrolTeamService;
-import com.epmet.service.PlacePatrolTeamStaffService;
+import com.epmet.service.IcPlacePatrolTeamService;
+import com.epmet.service.IcPlacePatrolTeamStaffService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,12 +58,12 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2021-11-18
  */
 @Service
-public class PlacePatrolTeamServiceImpl extends BaseServiceImpl<PlacePatrolTeamDao, PlacePatrolTeamEntity> implements PlacePatrolTeamService {
-    private static final Logger log = LoggerFactory.getLogger(PlacePatrolTeamServiceImpl.class);
+public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolTeamDao, IcPlacePatrolTeamEntity> implements IcPlacePatrolTeamService {
+    private static final Logger log = LoggerFactory.getLogger(IcPlacePatrolTeamServiceImpl.class);
     @Autowired
     private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
     @Autowired
-    private PlacePatrolTeamStaffService placePatrolTeamStaffService;
+    private IcPlacePatrolTeamStaffService placePatrolTeamStaffService;
     @Autowired
     private CustomerGridDao customerGridDao;
 
@@ -81,15 +75,15 @@ public class PlacePatrolTeamServiceImpl extends BaseServiceImpl<PlacePatrolTeamD
     @Transactional(rollbackFor = Exception.class)
     public void add(AddPlacePatrolTeamFormDTO formDTO) {
         //1.分队主表新增数据
-        PlacePatrolTeamEntity entity = ConvertUtils.sourceToTarget(formDTO, PlacePatrolTeamEntity.class);
+        IcPlacePatrolTeamEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolTeamEntity.class);
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         entity.setAgencyId(staffInfoCache.getAgencyId());
         entity.setPids(staffInfoCache.getAgencyPIds());
         insert(entity);
         //2.分队成员表新增数据
-        List<PlacePatrolTeamStaffEntity> entityList = new ArrayList<>();
+        List<IcPlacePatrolTeamStaffEntity> entityList = new ArrayList<>();
         formDTO.getMemberList().forEach(m -> {
-            PlacePatrolTeamStaffEntity entity1 = new PlacePatrolTeamStaffEntity();
+            IcPlacePatrolTeamStaffEntity entity1 = new IcPlacePatrolTeamStaffEntity();
             entity1.setCustomerId(formDTO.getCustomerId());
             entity1.setPlacePatrolTeamId(entity.getId());
             entity1.setName(m.getName());
@@ -108,16 +102,16 @@ public class PlacePatrolTeamServiceImpl extends BaseServiceImpl<PlacePatrolTeamD
     @Transactional(rollbackFor = Exception.class)
     public void edit(EditPlacePatrolTeamFormDTO formDTO) {
         //1.修改分队主表信息
-        PlacePatrolTeamEntity entity = baseDao.selectById(formDTO.getTeamId());
+        IcPlacePatrolTeamEntity entity = baseDao.selectById(formDTO.getTeamId());
         if (null == entity) {
             throw new RenException(String.format("修改九小场所下巡查分队人员信息失败，分队信息不存在，分队Id->%s", formDTO.getTeamId()));
         }
-        entity = ConvertUtils.sourceToTarget(formDTO, PlacePatrolTeamEntity.class);
+        entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolTeamEntity.class);
         baseDao.updateById(entity);
         //2.全删全增分队成员字表数据
-        List<PlacePatrolTeamStaffEntity> entityList = new ArrayList<>();
+        List<IcPlacePatrolTeamStaffEntity> entityList = new ArrayList<>();
         for (EditPlacePatrolTeamFormDTO.Member m : formDTO.getMemberList()) {
-            PlacePatrolTeamStaffEntity entity1 = new PlacePatrolTeamStaffEntity();
+            IcPlacePatrolTeamStaffEntity entity1 = new IcPlacePatrolTeamStaffEntity();
             entity1.setCustomerId(entity.getCustomerId());
             entity1.setPlacePatrolTeamId(entity.getId());
             entity1.setName(m.getName());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolTeamStaffServiceImpl.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java

@@ -23,10 +23,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.dao.PlacePatrolTeamStaffDao;
-import com.epmet.dto.PlacePatrolTeamStaffDTO;
-import com.epmet.entity.PlacePatrolTeamStaffEntity;
-import com.epmet.service.PlacePatrolTeamStaffService;
+import com.epmet.dao.IcPlacePatrolTeamStaffDao;
+import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
+import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
+import com.epmet.service.IcPlacePatrolTeamStaffService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,51 +42,51 @@ import java.util.Map;
  * @since v1.0.0 2021-11-18
  */
 @Service
-public class PlacePatrolTeamStaffServiceImpl extends BaseServiceImpl<PlacePatrolTeamStaffDao, PlacePatrolTeamStaffEntity> implements PlacePatrolTeamStaffService {
+public class IcPlacePatrolTeamStaffServiceImpl extends BaseServiceImpl<IcPlacePatrolTeamStaffDao, IcPlacePatrolTeamStaffEntity> implements IcPlacePatrolTeamStaffService {
 
 
     @Override
-    public PageData<PlacePatrolTeamStaffDTO> page(Map<String, Object> params) {
-        IPage<PlacePatrolTeamStaffEntity> page = baseDao.selectPage(
+    public PageData<IcPlacePatrolTeamStaffDTO> page(Map<String, Object> params) {
+        IPage<IcPlacePatrolTeamStaffEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, PlacePatrolTeamStaffDTO.class);
+        return getPageData(page, IcPlacePatrolTeamStaffDTO.class);
     }
 
     @Override
-    public List<PlacePatrolTeamStaffDTO> list(Map<String, Object> params) {
-        List<PlacePatrolTeamStaffEntity> entityList = baseDao.selectList(getWrapper(params));
+    public List<IcPlacePatrolTeamStaffDTO> list(Map<String, Object> params) {
+        List<IcPlacePatrolTeamStaffEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, PlacePatrolTeamStaffDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, IcPlacePatrolTeamStaffDTO.class);
     }
 
-    private QueryWrapper<PlacePatrolTeamStaffEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<IcPlacePatrolTeamStaffEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<PlacePatrolTeamStaffEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<IcPlacePatrolTeamStaffEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public PlacePatrolTeamStaffDTO get(String id) {
-        PlacePatrolTeamStaffEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PlacePatrolTeamStaffDTO.class);
+    public IcPlacePatrolTeamStaffDTO get(String id) {
+        IcPlacePatrolTeamStaffEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcPlacePatrolTeamStaffDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(PlacePatrolTeamStaffDTO dto) {
-        PlacePatrolTeamStaffEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolTeamStaffEntity.class);
+    public void save(IcPlacePatrolTeamStaffDTO dto) {
+        IcPlacePatrolTeamStaffEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolTeamStaffEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(PlacePatrolTeamStaffDTO dto) {
-        PlacePatrolTeamStaffEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolTeamStaffEntity.class);
+    public void update(IcPlacePatrolTeamStaffDTO dto) {
+        IcPlacePatrolTeamStaffEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolTeamStaffEntity.class);
         updateById(entity);
     }
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlaceOrgDao.xml → epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PlaceOrgDao">
+<mapper namespace="com.epmet.dao.IcPlaceOrgDao">
 
     <select id="getList" resultType="com.epmet.dto.result.PlaceOrgDetailResultDTO">
         SELECT
@@ -15,7 +15,7 @@
             a.person_in_charge personInCharge,
             a.mobile mobile
         FROM
-            place_org a
+            ic_place_org a
         LEFT JOIN customer_grid b ON a.GRID_ID = b.ID
         WHERE
             a.del_flag = '0'

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlacePatrolRecordDao.xml → epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PlacePatrolRecordDao">
+<mapper namespace="com.epmet.dao.IcPlacePatrolRecordDao">
 
 
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlacePatrolReviewRecordDao.xml → epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PlacePatrolReviewRecordDao">
+<mapper namespace="com.epmet.dao.IcPlacePatrolReviewRecordDao">
 
 
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlacePatrolTeamDao.xml → epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PlacePatrolTeamDao">
+<mapper namespace="com.epmet.dao.IcPlacePatrolTeamDao">
 
     <resultMap id="teamList" type="com.epmet.dto.result.PlacePatrolTeamDetailResultDTO">
         <result property="teamId" column="id"/>
@@ -12,7 +12,7 @@
         <result property="time" column="time"/>
         <result property="personInCharge" column="person_in_charge"/>
         <result property="mobile" column="mobile"/>
-        <association property="memberList" column="id" select="com.epmet.dao.PlacePatrolTeamStaffDao.getByTeamId"/>
+        <association property="memberList" column="id" select="com.epmet.dao.IcPlacePatrolTeamStaffDao.getByTeamId"/>
     </resultMap>
     <select id="getList" resultMap="teamList">
         SELECT

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlacePatrolTeamStaffDao.xml → epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamStaffDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PlacePatrolTeamStaffDao">
+<mapper namespace="com.epmet.dao.IcPlacePatrolTeamStaffDao">
 
     <delete id="delByTeamId">
         DELETE
@@ -11,7 +11,7 @@
             place_patrol_team_id = #{teamId}
     </delete>
 
-    <select id="getByTeamId" resultType="com.epmet.dto.PlacePatrolTeamStaffDTO">
+    <select id="getByTeamId" resultType="com.epmet.dto.IcPlacePatrolTeamStaffDTO">
         SELECT
             *
         FROM