Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -157,6 +157,7 @@ public enum EpmetErrorCode {
 
 	COMMUNITY_SELF_ORGANIZATION_LIST_REPART_ERROR(8530, "%s社区自组织名称已存在"),
 	MATTER_NAME_EXISTS_APPOINTMENT_ERROR(8532, "存在重复预约事项"),
+	ERROR_DATE(8533, "不合理日期"),
 
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@@ -59,7 +59,8 @@ public class CustomerOrgRedis {
             throw new RenException("查询网格信息失败...");
         }
         if (null == gridInfoResult.getData()){
-            throw new RenException("没有此网格信息...");
+            //throw new RenException("没有此网格信息...");
+            return null;
         }
         Map<String, Object> map = BeanUtil.beanToMap(gridInfoResult.getData(), false, true);
         customerOrgRedis.redisUtils.hMSet(key, map);

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -945,4 +945,127 @@ public class DateUtils {
         return result;
     }
 
+    /**
+     * @Description  获取工作日时间【没有排除节假日】
+     * @param startDate
+     * @param num
+     * @author zxc
+     * @date 2022/1/7 10:51 上午
+     */
+    public static Date getWorkDay(Date startDate, int num) {
+        Date tomorrow = null;
+        int delay = 1;
+        while (delay <= num) {
+            tomorrow = getTomorrow(startDate);
+            if (!isWeekend(tomorrow)) {
+                delay++;
+            }
+            startDate = tomorrow;
+        }
+        return startDate;
+    }
+
+    /**
+     * @Description  根据开始时间计算出 当前日期后n个工作日【没有排除节假日】包括今天
+     * @param startDate
+     * @param num
+     * @author zxc
+     * @date 2022/1/7 10:20 上午
+     */
+    public static List<String> getWorkDayList(Date startDate, int num) {
+        List<String> result = new ArrayList<>();
+        Calendar rightNow = Calendar.getInstance();
+        rightNow.setTime(startDate);
+        rightNow.add(Calendar.DATE,-1);
+        startDate = rightNow.getTime();
+        Date tomorrow;
+        Integer tag = 1;
+        while (tag <= num){
+            tomorrow = getTomorrow(startDate);
+            // 返回工作日
+            if (!isWeekend(tomorrow)) {
+                result.add(new SimpleDateFormat(DATE_PATTERN).format(tomorrow));
+                tag++;
+            }
+            startDate = tomorrow;
+        }
+        return result;
+    }
+
+    /**
+     * @Description  根据开始时间计算出 当前日期后n个周末【没有排除节假日】包括今天
+     * @param startDate
+     * @param num
+     * @author zxc
+     * @date 2022/1/7 10:20 上午
+     */
+    public static List<String> getWeekendDayList(Date startDate, int num) {
+        List<String> result = new ArrayList<>();
+        Calendar rightNow = Calendar.getInstance();
+        rightNow.setTime(startDate);
+        rightNow.add(Calendar.DATE,-1);
+        startDate = rightNow.getTime();
+        Date tomorrow;
+        Integer tag = 1;
+        while (tag <= num){
+            tomorrow = getTomorrow(startDate);
+            // 返回周末
+            if (isWeekend(tomorrow)) {
+                result.add(new SimpleDateFormat(DATE_PATTERN).format(tomorrow));
+                tag++;
+            }
+            startDate = tomorrow;
+        }
+        return result;
+    }
+
+    /**
+     * @Description  根据开始时间计算出 当前日期后n天【没有排除节假日】包括今天
+     * @param startDate
+     * @param num
+     * @author zxc
+     * @date 2022/1/7 10:20 上午
+     */
+    public static List<String> getEveryDayList(Date startDate, int num) {
+        List<String> result = new ArrayList<>();
+        Calendar rightNow = Calendar.getInstance();
+        rightNow.setTime(startDate);
+        rightNow.add(Calendar.DATE,-1);
+        startDate = rightNow.getTime();
+        Date tomorrow;
+        Integer tag = 1;
+        while (tag <= num){
+            tomorrow = getTomorrow(startDate);
+            result.add(new SimpleDateFormat(DATE_PATTERN).format(tomorrow));
+            tag++;
+            startDate = tomorrow;
+        }
+        return result;
+    }
+
+    /**
+     * @Description  判断日期字符串是否为周末
+     * @param date  eg:yyyy-MM-dd
+     * @author zxc
+     * @date 2022/1/7 10:50 上午
+     */
+    private static boolean isWeekend(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY;
+    }
+
+    /**
+     * @Description  获取tomorrow的日期
+     * @param startDate
+     * @author zxc
+     * @date 2022/1/7 10:50 上午
+     */
+    private static Date getTomorrow(Date startDate) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(startDate);
+        cal.add(Calendar.DAY_OF_MONTH, +1);
+        return cal.getTime();
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java

@@ -47,8 +47,8 @@ public class GridMemberDataAnalysisExcelExportBean {
     @ExcelProperty(value = {"巡查次数"})
     private int patrolTimes;
 
-    @ExcelProperty(value = {"巡查时长(小时)"})
-    private double totalTime;
+    @ExcelProperty(value = {"巡查时长"})
+    private String totalTime;
 
     @ExcelProperty(value = {"例行工作次数"})
     private int patrolRoutineWorkTimes;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -15,7 +16,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean;
@@ -30,7 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,7 +40,6 @@ import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -302,11 +300,11 @@ public class GovOrgController {
 
             PageData<GridMemberDataAnalysisResultDTO> page;
 
-            int pageNo = 0;
-            int pageSize = 1000;
+            int pageNo = NumConstant.ZERO;
+            int pageSize = NumConstant.ONE_THOUSAND;
 
             do {
-                page = aggreGridService.getGridMemberDataAnalysis4PcWork(orgId, orgType, pageNo, pageSize, startTime, endTime, false);
+                page = aggreGridService.getGridMemberDataAnalysis4PcWork(orgId, orgType, pageNo++, pageSize, startTime, endTime, false);
                 List<GridMemberDataAnalysisResultDTO> pageList = page.getList();
 
                 List<GridMemberDataAnalysisExcelExportBean> exportBeans = ConvertUtils.sourceToTarget(pageList, GridMemberDataAnalysisExcelExportBean.class);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -2172,6 +2172,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
         //    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "【pcwork查询网格员数据统计列表】传入时间条件有误");
         //}
 
+        PageHelper.startPage(pageNo, pageSize, needCount);
         return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID,  endDateID);
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -342,7 +342,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             re.setTotalTime(totalTime == "" ? "0分钟" : totalTime);
             //re.setTotalTime(re.getTimeNum() < 1 ? BigDecimal.ZERO + "h" : new BigDecimal(numberFormat.format((float) re.getTimeNum() / (float) 3600)) + "h");
             //re.setTotalTime(re.getTimeNum() / 60 + "分钟");
-            list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
+            //list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
         });
 
         return resultList;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -20,7 +20,6 @@ import com.epmet.dataaggre.dto.govorg.form.SubOrgFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
-import com.epmet.dataaggre.entity.govorg.CustomerGridEntity;
 import com.epmet.dataaggre.service.commonservice.AreaCodeService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -151,13 +150,14 @@ public class GovOrgServiceImpl implements GovOrgService {
         List<NextAreaCodeResultDTO> allList = areaCodeService.queryNextLevelAreaCodeList(formDTO);
         if (CollectionUtils.isNotEmpty(allList)) {
             //内部客户: 已经被使用过的areaCode
-            List<String> usedAreaCodeList1 = customerAgencyDao.selectUsedAreaCodeList(formDTO.getAreaCode());
+            // 组织编辑可以修改区域编码，所以不排除了，注释掉
+            // List<String> usedAreaCodeList1 = customerAgencyDao.selectUsedAreaCodeList(formDTO.getAreaCode());
             //外部子客户：
             List<String> usedAreaCodeList2 = customerRelation.selectUsedAreaCodeList(formDTO.getAreaCode());
             List<String> list=new ArrayList<>();
-            if(CollectionUtils.isNotEmpty(usedAreaCodeList1)){
+            /*if(CollectionUtils.isNotEmpty(usedAreaCodeList1)){
                 list.addAll(usedAreaCodeList1);
-            }
+            }*/
             if(CollectionUtils.isNotEmpty(usedAreaCodeList2)){
                 list.addAll(usedAreaCodeList2);
             }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java

@@ -19,11 +19,14 @@ import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import sun.rmi.runtime.Log;
 
 import java.util.*;
 
+@Slf4j
 @Service
 public class AggreGridServiceImpl implements AggreGridService {
 
@@ -101,6 +104,10 @@ public class AggreGridServiceImpl implements AggreGridService {
         for (GridMemberDataAnalysisResultDTO data : datas) {
             // 填充gridName
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(data.getGridId());
+            if (gridInfo == null) {
+                log.warn("未找到网格信息:{}", data.getGridId());
+                continue;
+            }
             Optional.ofNullable(gridInfo).ifPresent((d) -> data.setOrgName(d.getGridName()));
 
             // 生成结构化map

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import sun.jvm.hotspot.memory.ContiguousSpace;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -397,6 +398,10 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
                     l.setGridName(agencyInfo.getOrganizationName());
                 }else {
                     GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getOrgId());
+                    if (gridInfo == null) {
+                        log.warn("未找到网格信息:{}", l.getOrgId());
+                        return;
+                    }
                     l.setGridName(gridInfo.getGridNamePath());
                 }
             });

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -126,7 +126,12 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                 if (null != gridInfo) {
                     user.setGridName(gridInfo.getGridName());
                     user.setOrgId(gridInfo.getAgencyId());
-                    user.setOrgName(gridInfo.getOrgName());
+                    if(StringUtils.isNotBlank(gridInfo.getOrgName())){
+                        user.setOrgName(gridInfo.getOrgName());
+                    }else{
+                        GridInfoDTO gridInfoDTO = customerGridService.queryGridInfoDTO(user.getGridId());
+                        user.setOrgName(gridInfoDTO.getOrgName());
+                    }
                     //原始数据Pid使用英文:隔开，大屏数据要求按照英文,隔开
                     user.setAllParentIds(gridInfo.getPids().replaceAll(StrConstant.COLON, StrConstant.COMMA));
                 }else{

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@@ -110,8 +110,7 @@
             LEFT JOIN customer_agency ca
             ON (cg.PID = CA.ID)
         WHERE
-            CG.CUSTOMER_ID =#{customerId}
-            and cg.id = #{gridId}
+             cg.id = #{gridId}
     </select>
 
     <select id="getCustomerStaffGridList" resultType="com.epmet.dto.org.CustomerStaffGridDTO">

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

@@ -54,5 +54,7 @@ public class GetListSocietyOrgFormDTO implements Serializable {
     private String staffId;
     //token中userId所属组织的pid
     private String pids;
+    //token中userId所属组织Id
+    private String agencyId;
 
 }

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

@@ -117,7 +117,9 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
     public GetListSocietyOrgResultDTO getList(GetListSocietyOrgFormDTO formDTO) {
         GetListSocietyOrgResultDTO resultDTO = new GetListSocietyOrgResultDTO();
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        formDTO.setPids(staffInfoCache.getAgencyPIds());
+        //2022.1.7 应产品要求 当前组织只能看到自己组织添加的社会组织数据，不允许看其他下级的
+        //formDTO.setPids(staffInfoCache.getAgencyPIds());
+        formDTO.setAgencyId(staffInfoCache.getAgencyId());
         //1.根据查询条件分页查询社会组织数据
         PageInfo<SocietyOrgListResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO));

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

@@ -1069,7 +1069,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务未完成,不可评价", "服务未完成,不可评价");
         }
         //用户输入的完成情况，走内容审核
-        textScan(formDTO.getFinishDesc());
+        if(StringUtils.isNotBlank(formDTO.getFinishDesc())){
+            textScan(formDTO.getFinishDesc());
+        }
         //当前操作用户是工作端用户还是居民端用户
         String userType = "";
         if (AppClientConstant.APP_GOV.equals(formDTO.getApp())) {

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

@@ -24,8 +24,11 @@
         <if test="customerId != null and customerId.trim() != ''">
             AND customer_id = #{customerId}
         </if>
-        <if test="pids != null and pids.trim() != ''">
+       <!-- <if test="pids != null and pids.trim() != ''">
             AND pids LIKE CONCAT('%', #{pids}, '%')
+        </if>-->
+        <if test="agencyId != null and agencyId.trim() != ''">
+            AND agency_id = #{agencyId}
         </if>
         <if test="societyName != null and societyName.trim() != ''">
             AND society_name LIKE CONCAT('%', #{societyName}, '%')

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

@@ -47,6 +47,11 @@ public class AllMattersResultDTO implements Serializable {
     @JsonIgnore
     private String endTime;
 
+    /**
+     * 预约类型，每天：everyDay，工作日：workDay，周末：weekend
+     */
+    private String appointmentType;
+
     public AllMattersResultDTO() {
         this.matterName = "";
         this.allowTime = "";
@@ -55,5 +60,6 @@ public class AllMattersResultDTO implements Serializable {
         this.address = "";
         this.workPhone = "";
         this.centerName = "";
+        this.appointmentType="";
     }
 }

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

@@ -27,8 +27,11 @@ public class AppointmentTimeResultDTO implements Serializable {
      */
     private List<TimeDTO> timeDetail;
 
+    private List<String> dateList;
+
     public AppointmentTimeResultDTO() {
         this.appointmentType = "";
         this.timeDetail = new ArrayList<>();
+        this.dateList = new ArrayList<>();
     }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/PartyServiceCenterConstant.java

@@ -13,4 +13,8 @@ public interface PartyServiceCenterConstant {
     String APPOINTMENT_STATUS_APPOINTING = "appointing";
     String APPOINTMENT_STATUS_CANCEL = "cancel";
 
+    String APPOINTMENT_TYPE_EVERY_DAY = "everyDay";
+    String APPOINTMENT_TYPE_WORK_DAY = "workDay";
+    String APPOINTMENT_TYPE_WEEKEND = "weekend";
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -306,5 +306,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     OrgMobileResultDTO getAgencyMobile(@Param("gridId") String gridId);
 
     int updateSubAgencyAreaCode(@Param("customerId") String customerId, @Param("originalParentAreaCode")String originalParentAreaCode,@Param("operateUserId") String operateUserId);
+
+    int updateSubAgencyAreaCodeById(@Param("customerId")String customerId, @Param("agencyId")String agencyId, @Param("operateUserId") String operateUserId);
 }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java

@@ -101,4 +101,10 @@ public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity>
      * @Date 2020/12/15 10:05
      **/
     int delDeptById(@Param("deptId")String deptId,@Param("operateUserId") String operateUserId);
+
+    int updateSubDeptAreaCode(@Param("customerId") String customerId,
+                              @Param("areaCode")String areaCode,
+                              @Param("operateUserId") String operateUserId);
+
+    int updateDeptAreaCode(@Param("agencyId")String agencyId, @Param("areaCode")String areaCode);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -351,4 +351,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Description 网格组织信息
      **/
     CustomerGridDTO gridAgencyByGrid(@Param("gridId") String gridId);
+
+    int updateSubGridAreaCode(@Param("customerId") String customerId,
+                              @Param("agencyId")String agencyId,
+                              @Param("operateUserId") String operateUserId);
+
+    int updateGridAreaCode(@Param("agencyId")String agencyId, @Param("areaCode")String areaCode);
 }

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

@@ -33,6 +33,7 @@ import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.constant.OrgInfoConstant;
 import com.epmet.constant.RoleKeyConstants;
 import com.epmet.dao.CustomerAgencyDao;
+import com.epmet.dao.CustomerDepartmentDao;
 import com.epmet.dao.CustomerGridDao;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.CustomerAgencyDTO;
@@ -93,7 +94,8 @@ public class AgencyServiceImpl implements AgencyService {
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
     private IcBuildingDao icBuildingDao;
-
+    @Autowired
+    private CustomerDepartmentDao customerDepartmentDao;
 
     /**
      * @param formDTO
@@ -152,32 +154,46 @@ public class AgencyServiceImpl implements AgencyService {
         originalEntity.setCode(formDTO.getCode());
         originalEntity.setContacts(formDTO.getContacts());
         originalEntity.setMobile(formDTO.getMobile());
-        if(StringUtils.isNotBlank(formDTO.getAreaCode())&&formDTO.getAreaCode().equals(originalEntity.getAreaCode())){
+        if (StringUtils.isNotBlank(formDTO.getAreaCode()) && !formDTO.getAreaCode().equals(originalEntity.getAreaCode())) {
+            CustomerAgencyEntity parent = customerAgencyDao.selectById(originalEntity.getPid());
             //如果修改了areaCode。
-            customerAgencyDao.updateSubAgencyAreaCode(originalEntity.getCustomerId(),originalEntity.getAreaCode(),formDTO.getUserId());
-        }
-        //判断areaCodeSwitch：open: 选择地区编码必填；closed:  无需选择地区编码
-        if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
-            //校验areaCode是否被使用过
-            if (!"other".equals(formDTO.getAreaCode())) {
-                List<String> agencyIds = customerAgencyDao.selectAgencyIdsByAreaCode(formDTO.getAreaCode(),formDTO.getAgencyId());
-                if (CollectionUtils.isNotEmpty(agencyIds)) {
-                    //已经被占用，提示
-                    throw new RenException(EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getCode(), EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getMsg());
-                }
-                originalEntity.setAreaCode(formDTO.getAreaCode());
-            }else{
-                //如果选择的是other,需要自定义一个编码
-                AddAreaCodeFormDTO addAreaCodeFormDTO = new AddAreaCodeFormDTO();
-                addAreaCodeFormDTO.setCurrentAreaLevel(formDTO.getLevel());
-                addAreaCodeFormDTO.setParentAreaCode(formDTO.getAreaCode());
-                addAreaCodeFormDTO.setName(formDTO.getAgencyName());
-                Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
-                if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
-                    throw new RenException("自定义area_code异常" + addAreaCodeResult.getInternalMsg());
+            if(StringUtils.isNotBlank(originalEntity.getAreaCode())){
+                //如果原来这个组织有area_code再去更新,没有其实应该按照pids去更新。
+                // customerAgencyDao.updateSubAgencyAreaCode(originalEntity.getCustomerId(), originalEntity.getAreaCode(), formDTO.getUserId());
+                customerAgencyDao.updateSubAgencyAreaCodeById(originalEntity.getCustomerId(), originalEntity.getId(), formDTO.getUserId());
+                //网格的
+                customerGridDao.updateSubGridAreaCode(originalEntity.getCustomerId(), originalEntity.getId(), formDTO.getUserId());
+                //部门的
+                customerDepartmentDao.updateSubDeptAreaCode(originalEntity.getCustomerId(), originalEntity.getAreaCode(), formDTO.getUserId());
+            }
+
+            //判断areaCodeSwitch：open: 选择地区编码必填；closed:  无需选择地区编码
+            if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
+                //校验areaCode是否被使用过
+                if (!"other".equals(formDTO.getAreaCode())) {
+                    List<String> agencyIds = customerAgencyDao.selectAgencyIdsByAreaCode(formDTO.getAreaCode(),formDTO.getAgencyId());
+                    if (CollectionUtils.isNotEmpty(agencyIds)) {
+                        //已经被占用，提示
+                        throw new RenException(EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getCode(), EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getMsg());
+                    }
+                    originalEntity.setAreaCode(formDTO.getAreaCode());
+                    originalEntity.setParentAreaCode(parent.getAreaCode());
+                }else{
+                    //如果选择的是other,需要自定义一个编码
+                    AddAreaCodeFormDTO addAreaCodeFormDTO = new AddAreaCodeFormDTO();
+                    addAreaCodeFormDTO.setCurrentAreaLevel(formDTO.getLevel());
+                    addAreaCodeFormDTO.setParentAreaCode(formDTO.getAreaCode());
+                    addAreaCodeFormDTO.setName(formDTO.getAgencyName());
+                    Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
+                    if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
+                        throw new RenException("自定义area_code异常" + addAreaCodeResult.getInternalMsg());
+                    }
+                    originalEntity.setAreaCode(addAreaCodeResult.getData());
+                    originalEntity.setParentAreaCode(parent.getAreaCode());
                 }
-                originalEntity.setAreaCode(addAreaCodeResult.getData());
             }
+            customerGridDao.updateGridAreaCode(originalEntity.getId(),formDTO.getAreaCode());
+            customerDepartmentDao.updateDeptAreaCode(originalEntity.getId(),formDTO.getAreaCode());
         }
 
         //1:更新当前组织信息
@@ -314,19 +330,19 @@ public class AgencyServiceImpl implements AgencyService {
         if (null != entity && StringUtils.isNotBlank(entity.getAreaCode())) {
             switch (entity.getLevel()) {
                 case CustomerAgencyConstant.PROVINCE_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getProvince() ? StrConstant.EPMETY_STR : entity.getProvince());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getProvince()) ?  entity.getProvince():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.CITY_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getCity() ? StrConstant.EPMETY_STR : entity.getCity());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getCity()) ? entity.getCity():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.DISTRICT:
-                    agencysResultDTO.setAreaName(null == entity.getDistrict() ? StrConstant.EPMETY_STR : entity.getDistrict());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getDistrict()) ?  entity.getDistrict():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.STREET_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getStreet() ? StrConstant.EPMETY_STR : entity.getStreet());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getStreet()) ?  entity.getStreet():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.COMMUNITY_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getCommunity() ? StrConstant.EPMETY_STR : entity.getCommunity());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getCommunity()) ? entity.getCommunity():entity.getOrganizationName());
                     break;
                 default:
                     agencysResultDTO.setAreaName(StrConstant.EPMETY_STR);

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

@@ -275,6 +275,20 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void appointment(AppointmentFormDTO formDTO, TokenDto tokenDto) {
+        IcPartyServiceCenterMatterEntity entity = matterService.selectById(formDTO.getMatterId());
+        if (null == entity){
+            throw new EpmetException("不存在此预约事项");
+        }
+        List<String> dateList = getDateList(entity.getAppointmentType());
+        Boolean s = false;
+        for (String d : dateList) {
+            if (d.equals(formDTO.getAppointmentDate())){
+                s = true;
+            }
+        }
+        if (!s){
+            throw new EpmetException(EpmetErrorCode.ERROR_DATE.getCode());
+        }
         String customerId = tokenDto.getCustomerId();
         LambdaQueryWrapper<IcMatterAppointmentRecordEntity> l = new LambdaQueryWrapper<>();
         l.eq(IcMatterAppointmentRecordEntity::getMatterId,formDTO.getMatterId())
@@ -322,6 +336,20 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void appointmentMini(AppointmentMiniFormDTO formDTO, TokenDto tokenDto) {
+        IcPartyServiceCenterMatterEntity entity = matterService.selectById(formDTO.getMatterId());
+        if (null == entity){
+            throw new EpmetException("不存在此预约事项");
+        }
+        List<String> dateList = getDateList(entity.getAppointmentType());
+        Boolean s = false;
+        for (String d : dateList) {
+            if (d.equals(formDTO.getAppointmentDate())){
+                s = true;
+            }
+        }
+        if (!s){
+            throw new EpmetException(EpmetErrorCode.ERROR_DATE.getCode());
+        }
         String customerId = tokenDto.getCustomerId();
         LambdaQueryWrapper<IcMatterAppointmentRecordEntity> l = new LambdaQueryWrapper<>();
         l.eq(IcMatterAppointmentRecordEntity::getMatterId,formDTO.getMatterId())
@@ -423,6 +451,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
             throw new RenException("事项不存在...");
         }
         result.setAppointmentType(matter.getAppointmentType());
+        result.setDateList(getDateList(result.getAppointmentType()));
         LambdaQueryWrapper<IcMatterAppointmentRecordEntity> l = new LambdaQueryWrapper<>();
         l.eq(IcMatterAppointmentRecordEntity::getMatterId,formDTO.getMatterId())
                 .eq(IcMatterAppointmentRecordEntity::getAppointmentDate,formDTO.getDate())
@@ -487,6 +516,18 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         return result;
     }
 
+    public List<String> getDateList(String type) {
+        List<String> result = new ArrayList<>();
+        if (type.equals(PartyServiceCenterConstant.APPOINTMENT_TYPE_EVERY_DAY)){
+            result = DateUtils.getEveryDayList(new Date(),NumConstant.SEVEN);
+        }else if (type.equals(PartyServiceCenterConstant.APPOINTMENT_TYPE_WORK_DAY)){
+            result = DateUtils.getWorkDayList(new Date(),NumConstant.SEVEN);
+        }else {
+            result = DateUtils.getWeekendDayList(new Date(),NumConstant.SEVEN);
+        }
+        return result;
+    }
+
     /**
      * @Description 【党群服务中心】预约记录
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -735,11 +735,23 @@
         UPDATE customer_agency
         SET AREA_CODE = '',
         PARENT_AREA_CODE = '',
-        UPDATED_BY=#{operateUserId}
+        UPDATED_BY=#{operateUserId},
         UPDATED_TIME = NOW()
         WHERE
             DEL_FLAG = '0'
             AND CUSTOMER_ID = #{customerId}
             AND PARENT_AREA_CODE LIKE concat( #{originalParentAreaCode}, '%' )
     </update>
+
+    <update id="updateSubAgencyAreaCodeById" parameterType="map">
+        UPDATE customer_agency
+        SET AREA_CODE = '',
+        PARENT_AREA_CODE = '',
+        UPDATED_BY=#{operateUserId},
+        UPDATED_TIME = NOW()
+        WHERE
+            DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
+            AND pids LIKE concat('%',#{agencyId}, '%' )
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -87,4 +87,21 @@
             UPDATED_TIME=NOW()
         where id=#{deptId}
     </update>
+
+    <update id="updateSubDeptAreaCode" parameterType="map">
+        update customer_department
+            SET AREA_CODE = '',
+            UPDATED_BY=#{operateUserId},
+            UPDATED_TIME = NOW()
+            where customer_id=#{customerId}
+            AND AREA_CODE LIKE concat(#{areaCode}, '%' )
+    </update>
+
+    <update id="updateDeptAreaCode" parameterType="map">
+         update customer_department
+            SET AREA_CODE = #{areaCode},
+            UPDATED_TIME = NOW()
+            where del_flag='0'
+            and agency_id=#{agencyId}
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -755,4 +755,20 @@
         AND cg.id = #{gridId}
     </select>
 
+    <update id="updateSubGridAreaCode" parameterType="map">
+        update customer_grid
+        SET AREA_CODE = '',
+        UPDATED_BY=#{operateUserId},
+        UPDATED_TIME = NOW()
+        where customer_id=#{customerId}
+        AND pids LIKE concat('%',#{agencyId}, '%' )
+    </update>
+
+    <update id="updateGridAreaCode" parameterType="map">
+        update customer_grid
+        SET AREA_CODE = #{areaCode},
+        UPDATED_TIME = NOW()
+        where del_flag='0'
+        and pid=#{agencyId}
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml

@@ -64,7 +64,8 @@
             IFNULL(cm.MATTER_IMG,'') AS matterImg,
             c.ADDRESS,
             c.WORK_PHONE,
-            c.CENTER_NAME
+            c.CENTER_NAME,
+            cm.APPOINTMENT_TYPE as appointmentType
         FROM ic_party_service_center c
         INNER JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = c.ID AND cm.DEL_FLAG = 0)
             AND c.DEL_FLAG = 0

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -100,6 +100,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         dtoList.forEach(item -> {
             if (StringUtils.isNotBlank(item.getGridId())) {
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if(gridInfo == null) {
+                    log.warn("未找到网格信息:{}", item.getGridId());
+                    return;
+                }
                 item.setGridName(gridInfo.getGridName());
             }
         });
@@ -191,6 +195,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         dtoList.forEach(item -> {
             if (StringUtils.isNotBlank(item.getGridId())) {
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if (gridInfo == null) {
+                    log.warn("未找到网格信息:{}", item.getGridId());
+                    return;
+                }
                 item.setGridName(gridInfo.getGridName());
             }
         });

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -218,12 +218,14 @@ public class CustomerStaffController {
         Result<CustomerStaffDTO> result = customerStaffService.addStaff(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
-        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
-        mq.setCustomerId(fromDTO.getCustomerId());
-        mq.setOrgId(result.getData().getUserId());
-        mq.setOrgType("staff");
-        mq.setType("staff_create");
-        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        if (result.success()) {
+            OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+            mq.setCustomerId(fromDTO.getCustomerId());
+            mq.setOrgId(result.getData().getUserId());
+            mq.setOrgType("staff");
+            mq.setType("staff_create");
+            SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        }
         //2021-10-18  end
 
         return result;
@@ -240,12 +242,14 @@ public class CustomerStaffController {
         Result result = customerStaffService.editStaff(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
-        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
-        mq.setCustomerId(fromDTO.getCustomerId());
-        mq.setOrgId(fromDTO.getStaffId());
-        mq.setOrgType("staff");
-        mq.setType("staff_change");
-        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        if (result.success()) {
+            OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+            mq.setCustomerId(fromDTO.getCustomerId());
+            mq.setOrgId(fromDTO.getStaffId());
+            mq.setOrgType("staff");
+            mq.setType("staff_change");
+            SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        }
         //2021-10-18  end
 
         return result;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -491,6 +491,11 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		//2.查询网格信息并赋值
 		Map<String, CustomerGridDTO> map = new HashMap<>();
 		for (PcworkRecordListResultDTO.StaffPatrol r : result.getList()) {
+			//秒变小时分钟
+			Integer minutes = r.getTotalTimeNum() / 60;
+			String patrolDuration = (minutes / 60 > 0 ? minutes / 60 + "小时" : "") + (minutes % 60 > 0 ? minutes % 60 + "分钟" : "0分钟");
+			r.setTotalTime(patrolDuration);
+
 			if (map.containsKey(r.getGridId())) {
 				r.setGridName(map.get(r.getGridId()).getGridName());
 				continue;
@@ -512,12 +517,6 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 				r.setGridName(resultGrid.getData().getGridName());
 				map.put(r.getGridId(), resultGrid.getData());
 			}
-
-			//秒变小时分钟
-			Integer minutes = r.getTotalTimeNum() / 60;
-			String patrolDuration = (minutes / 60 > 0 ? minutes / 60 + "小时" : "") + (minutes % 60 > 0 ? minutes % 60 + "分钟" : "0分钟");
-			r.setTotalTime(patrolDuration);
-
 		}
 		//3.封装数据并返回
 		resultDTO.setTotal((int)result.getTotal());