Merge remote-tracking branch 'remotes/origin/dev_small_adjust_ljj' into 烟台master

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java

@@ -86,4 +86,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     CustomerGridDTO getGridInfo(@Param("gridId") String gridId);
 
     List<ScreenCustomerGridDTO> getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
+    List<ScreenCustomerGridDTO> getAllSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 }

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

@@ -2011,10 +2011,15 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
         }
 
         //2.查询组织信息，判断查询下级组织还是网格数据
-        ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport());
+        //2022.8.17 屏蔽查询组织、网格逻辑，直接以org库的组织网格为准
+        ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId(), formDTO.isExport());
         if (null == agencyGrid) {
             return new CustomerDataManageResultDTO();
         }
+        /*ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport());
+        if (null == agencyGrid) {
+            return new CustomerDataManageResultDTO();
+        }*/
         //组织或网格Id集合
         List<String> idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList());
         formDTO.setDataType(!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) ? OrgTypeEnum.AGENCY.getCode() : OrgTypeEnum.GRID.getCode());
@@ -2329,7 +2334,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
         }
 
         //2.查询组织信息，判断要查询下级是组织还是网格数据
-        ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId());
+        ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId(), false);
         if (null == agencyGrid) {
             return new ArrayList<>();
         }

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

@@ -290,6 +290,6 @@ public interface GovOrgService {
     List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
     Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO);
 
-    ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId);
+    ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid);
 
 }

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

@@ -1473,7 +1473,7 @@ public class GovOrgServiceImpl implements GovOrgService {
     }
 
     @Override
-    public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId) {
+    public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid) {
         ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO();
         List<ScreenAgencyOrGridListDTO.AgencyGrid> agencyGridList = new ArrayList<>();
         //1.查询组织信息
@@ -1485,10 +1485,22 @@ public class GovOrgServiceImpl implements GovOrgService {
         //2.根据组织级别判断查询直属组织或网格列表
         List<ScreenCustomerAgencyDTO> agencyList = new ArrayList<>();
         List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
+        //组织级别为街道的查询下级所有网格
+        if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()))) {
+            gridList = customerGridDao.getAllSubGridList(customerId, agencyId);
+            List<ScreenAgencyOrGridListDTO.AgencyGrid> allGridList = new ArrayList<>();
+            gridList.forEach(gr -> {
+                ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
+                org.setOrgId(gr.getGridId());
+                org.setOrgName(gr.getGridName());
+                allGridList.add(org);
+            });
+            resultDTO.setAllGridList(allGridList);
+        }
         if (!"community".equals(dto.getLevel())) {
             //2-1.直属下级组织列表
             agencyList = customerAgencyDao.getSubAgencyListByAgency(customerId, agencyId);
-            agencyList.forEach(gr->{
+            agencyList.forEach(gr -> {
                 ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
                 org.setOrgId(gr.getAgencyId());
                 org.setOrgName(gr.getAgencyName());
@@ -1497,7 +1509,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         } else {
             //2-2.直属下级网格列表
             gridList = customerGridDao.getSubGridList(customerId, agencyId);
-            gridList.forEach(gr->{
+            gridList.forEach(gr -> {
                 ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
                 org.setOrgId(gr.getGridId());
                 org.setOrgName(gr.getGridName());

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@@ -194,6 +194,23 @@
             del_flag = '0'
         AND customer_id = #{customerId}
         AND pid = #{agencyId}
+        ORDER BY pid, grid_name
+    </select>
+
+    <select id="getAllSubGridList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO">
+        SELECT
+            customer_id AS customerId,
+            id AS gridId,
+            grid_name AS gridName,
+            pid AS parentAgencyId,
+            pids AS allParentIds
+        FROM
+            customer_grid
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND pids LIKE concat('%',#{agencyId},'%')
+        ORDER BY pid, grid_name
     </select>
 
 </mapper>

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -171,4 +171,13 @@ public interface EpmetHeartOpenFeignClient {
     @PostMapping("/heart/icpartyunit/editpartyorcommunity")
     Result editPartyOrCommunity(@RequestBody CheckStaffInfoResultDTO formDTO);
 
+    /**
+     * desc:根据来源id 删除需求 只删主表
+     * @param originId
+     * @param origin
+     * @return
+     */
+    @PostMapping("/heart/userdemand/deleteByOriginId/{originId}/{origin}")
+    Result<Integer> deleteUserDemandByOriginId(@PathVariable("originId") String originId, @PathVariable("origin")String origin);
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@@ -13,7 +13,6 @@ import com.epmet.dto.form.IcDemandFormDTO;
 import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.DemandRecId;
 import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO;
-import com.epmet.dto.form.demand.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO;
@@ -21,7 +20,6 @@ import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
 import com.epmet.dto.result.CheckStaffInfoResultDTO;
 import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
-import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 
@@ -172,4 +170,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result editPartyOrCommunity(CheckStaffInfoResultDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "editPartyOrCommunity", formDTO);
     }
+
+    @Override
+    public Result<Integer> deleteUserDemandByOriginId(String originId, String origin) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "deleteUserDemandByOriginId", originId,origin);
+    }
 }

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

@@ -47,10 +47,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -399,5 +396,17 @@ public class IcUserDemandRecController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * desc:根据来源id 删除需求 只删主表
+     * @param originId
+     * @param origin
+     * @return
+     */
+    @PostMapping("deleteByOriginId/{originId}/{origin}")
+    public Result<Integer> deleteByOriginId(@PathVariable("originId") String originId, @PathVariable("origin")String origin) {
+        Integer effectRow = icUserDemandRecService.deleteByOriginId(originId,origin);
+        return new Result().ok(effectRow);
+    }
+
 
-}
+}

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

@@ -265,4 +265,13 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
     Integer selectCountByServerId(String serverId);
 
     ServerInfoDTO queryServiceName(String serverId, String serviceType);
-}
+
+    /**
+     * desc:根据来源id 删除需求 只删主表
+     * @param originId
+     * @param origin
+     * @return
+     */
+    Integer deleteByOriginId(String originId, String origin);
+
+}

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

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -38,6 +39,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
+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.Result;
@@ -113,6 +115,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private String textSyncScanMethod;
     @Autowired
     private GovProjectOpenFeignClient govProjectOpenFeignClient;
+    @Autowired
+    private LoginUserUtil loginUserUtil;
 
 
     @Override
@@ -467,6 +471,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      * @param serviceType
      * @return
      */
+    @Override
     public ServerInfoDTO queryServiceName(String serverId, String serviceType) {
         String serviceName="";
         String mobile="";
@@ -515,6 +520,20 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         return serverInfoDTO;
     }
 
+    @Override
+    public Integer deleteByOriginId(String originId, String origin) {
+        if(StringUtils.isBlank(originId) || StringUtils.isBlank(origin)){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误");
+        }
+        LambdaUpdateWrapper<IcUserDemandRecEntity> wrapper = new LambdaUpdateWrapper();
+        wrapper.eq(IcUserDemandRecEntity::getOriginId, originId)
+                .eq(IcUserDemandRecEntity::getOrigin,origin)
+                .set(IcUserDemandRecEntity::getUpdatedTime,new Date())
+                .set(IcUserDemandRecEntity::getCreatedBy,loginUserUtil.getLoginUserId())
+                .set(IcUserDemandRecEntity::getDelFlag,NumConstant.ONE_STR);
+        return baseDao.update(null, wrapper);
+    }
+
     /**
      * 完成并评价
      *

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java

@@ -0,0 +1,46 @@
+package com.epmet.enums;
+
+/**
+ * 项目来源枚举
+ * @author liujianjun
+ */
+public enum ProjectOriginEnum {
+    /**
+     * 项目来源
+     */
+    ISSUE("issue", "议题上报"),
+    AGENCY("agency", "直接立项"),
+    WORK_EVENT("work_event", "巡查上报"),
+    IC_EVENT("ic_event", "居民上报"),
+    RESI_EVENT("resi_event", "旧的居民上报（已废弃）");
+
+    private String code;
+    private String name;
+
+    ProjectOriginEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    /**
+     * 根据sourceType查询对应的枚举对象
+     * @param code
+     * @return
+     */
+    public static ProjectOriginEnum getEnumByCode(String code) {
+        for (ProjectOriginEnum e : ProjectOriginEnum.values()) {
+            if (e.getCode().equals(code)) {
+                return e;
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -397,4 +397,13 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 
     List<ProjectDTO> staffPendingProject(ProjectListFromDTO fromDTO);
     PageData<OrgProjectListResultDTO> orgProjectList(OrgProjectListFormDTO formDTO);
-}
+
+	/**
+	 * desc:根据来源id和类型 删除项目 （只删了主表）
+	 * @param originId
+	 * @param origin
+	 * @return
+	 */
+	Integer deleteByOriginId(String originId, String origin);
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.*;
@@ -19,6 +20,7 @@ import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.*;
 import com.epmet.dao.IcEventDao;
@@ -29,6 +31,7 @@ import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.enums.EcEventProcessStatusEnum;
+import com.epmet.enums.ProjectOriginEnum;
 import com.epmet.feign.*;
 import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.service.*;
@@ -94,6 +97,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
     @Autowired
     private ProjectSatisfactionDetailService projectSatisfactionDetailService;
+    @Autowired
+    private LoginUserUtil loginUserUtil;
 
 
     public CustomerStaffInfoCacheResult getStaffInfo(String customerId,String staffId){
@@ -407,8 +412,27 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
+        //已立项、已转服务的事件删除时，同时删除关联的服务和项目
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+        for (String id : ids) {
+            IcEventEntity entity = baseDao.selectById(id);
+            if (null == entity){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"数据不存在","数据不存在");
+            }
+            //1:已转项目  2:已转需求
+            if (NumConstant.ONE_STR.equals(entity.getOperationType())){
+                ProjectService projectService = SpringContextUtils.getBean(ProjectService.class);
+                Integer effectRow = projectService.deleteByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode());
+                log.info("delete project effectRow:{},eventId:{}", effectRow, id);
+            } else if (NumConstant.TWO_STR.equals(entity.getOperationType())){
+                Result<Integer> effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode());
+                log.info("delete userDemand result:{},eventId:{}", effectRow, id);
+            }
+            LambdaUpdateWrapper<IcEventEntity> wrapper = new LambdaUpdateWrapper();
+            wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date())
+                    .set(IcEventEntity::getCreatedBy,loginUserUtil.getLoginUserId())
+                    .set(IcEventEntity::getDelFlag,NumConstant.ONE_STR);
+            baseDao.update(null,wrapper);
+        }
     }
 
     /**

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
@@ -3562,5 +3563,16 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return new PageData<>(list, pageInfo.getTotal());
 	}
 
+	@Override
+	public Integer deleteByOriginId(String originId, String origin) {
+		LambdaUpdateWrapper<ProjectEntity> wrapper = new LambdaUpdateWrapper();
+		wrapper.eq(ProjectEntity::getOriginId, originId)
+				.eq(ProjectEntity::getOrigin,origin)
+				.set(ProjectEntity::getUpdatedTime,new Date())
+				.set(ProjectEntity::getCreatedBy,loginUserUtil.getLoginUserId())
+				.set(ProjectEntity::getDelFlag,NumConstant.ONE_STR);
+		return baseDao.update(null, wrapper);
+	}
+
 
 }