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

3 years ago · e1c80bd1aa
13 changed files with 83 additions and 8 deletions
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
@ -57,7 +57,8 @@ public class IcPartyActivityDTO implements Serializable {
     */
    @JsonIgnore
 	private String agencyId;
-
+    private String gridId;
+    private String gridName;
    /**
     * 组织的所有上级
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
@ -19,6 +19,7 @@ public class PartyActivityFormDTO implements Serializable {
    private static final long serialVersionUID = -2510068555703677L;
    @NotBlank(message = "组织Id不能为空" )
    private String agencyId;
+    private String gridId;
    private String unitId;
    private String title;
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java
@ -36,7 +36,7 @@ public class PublishActInfoFormDTO implements Serializable {
     * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的
     */
    private String actDraftId;
-
+    private String gridId;
    /**
     * 客户id
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java
@ -36,6 +36,8 @@ public class RePublishFormDTO implements Serializable {
     */
    private String actDraftId;

+    private String gridId;
+
    /**
     * 活动id
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java
@ -153,6 +153,8 @@ public class CanceledActDetailResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java
@ -142,6 +142,9 @@ public class FinishedActDetailResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
+
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java
@ -137,6 +137,9 @@ public class InProgressActDetailResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
+
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java
@ -154,6 +154,9 @@ public class ReEditActInfoResultDTO implements Serializable {
     */
    private String actType;

+    private String gridId;
+    private String gridName;
+
    /**
     * 联建单位
     */
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java
@ -47,7 +47,7 @@ public class IcPartyActivityEntity extends BaseEpmetEntity {
     * 组织ID
     */
 	private String agencyId;
-
+	private String gridId;
    /**
     * 组织的所有上级
     */
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
@ -28,7 +28,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
@ -123,6 +125,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                List<String> unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA));
                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
            });
        }

@ -150,6 +158,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                List<String> unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA));
                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
            });
        }

@ -171,6 +185,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
        List<String> serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList());
        dto.setServiceMatterList(services);
        dto.setServiceMatterNameList(serviceNames);
+        if (StringUtils.isNotEmpty(dto.getGridId())) {
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+            if (null != gridInfo) {
+                dto.setGridName(gridInfo.getGridName());
+            }
+        }

        //获取单位
        //获取组织下联建单位
@ -547,6 +567,14 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                List<String> services = Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA));
                List<String> serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList());
                dto.setServiceMatterName(StringUtils.join(serviceNames, StrConstant.SEMICOLON));
+
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
+
            });
        }
        PageInfo<IcPartyActivityDTO> pageInfo = new PageInfo<>(dtoList);
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
@ -9,6 +9,8 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@ -832,6 +834,14 @@ public class WorkActServiceImpl implements WorkActService {
                    List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                    canceledActDetailResultDTO.setUnitIdList(unitIds);
                    canceledActDetailResultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        canceledActDetailResultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            canceledActDetailResultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                }
            }
        }
@ -897,6 +907,14 @@ public class WorkActServiceImpl implements WorkActService {
                    List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                    resultDTO.setUnitIdList(unitIds);
                    resultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        resultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            resultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                }
            }
        }
@ -986,6 +1004,14 @@ public class WorkActServiceImpl implements WorkActService {
                    List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                    resultDTO.setUnitIdList(unitIds);
                    resultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        resultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            resultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                }
            }
        }
@ -1390,6 +1416,14 @@ public class WorkActServiceImpl implements WorkActService {
                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                resultDTO.setUnitIdList(unitIds);
                resultDTO.setUnitNameList(unitNames);
+
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    resultDTO.setGridId(dto.getGridId());
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        resultDTO.setGridName(gridInfo.getGridName());
+                    }
+                }
            }
        }

--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@ -95,6 +95,9 @@
        WHERE
            a.DEL_FLAG = '0'
            AND a.AGENCY_ID = #{agencyId}
+            <if test='null != gridId and "" != gridId'>
+                AND a.GRID_ID = #{gridId}
+            </if>
            <if test='null != title and "" != title'>
                AND TITLE LIKE concat('%', #{title}, '%')
            </if>
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java
@ -85,10 +85,5 @@ public class ListIcNeighborHoodFormDTO implements Serializable{
     */
    private String keyword;

-    /**
-     * 1：出租 0：自住  2：闲置
-     */
-    private String rentFlag;
-

 }