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

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

@@ -24,4 +24,5 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
 
     void importInsert(@Param("entityList") List<IcCityManagementEntity> entityList);
 
+    void delByAgencyAndName(IcCityManagementEntity entity);
 }

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

@@ -22,4 +22,6 @@ public interface IcDangerousChemicalsDao extends BaseDao<IcDangerousChemicalsEnt
     void del(IcDangerousChemicalsEntity entity);
 
     void importInsert(List<IcDangerousChemicalsEntity> entityList);
+
+    void delByAgencyAndName(IcDangerousChemicalsEntity entity);
 }

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

@@ -23,4 +23,6 @@ public interface IcPublicServiceDao extends BaseDao<IcPublicServiceEntity> {
     void del(IcPublicServiceEntity entity);
 
     void importInsert(@Param("entityList") List<IcPublicServiceEntity> entityList);
+
+    void delByAgencyAndName(IcPublicServiceEntity entity);
 }

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

@@ -23,4 +23,6 @@ public interface IcSuperiorResourceDao extends BaseDao<IcSuperiorResourceEntity>
     void del(IcSuperiorResourceEntity entity);
 
     void importInsert(@Param("entityList") List<IcSuperiorResourceEntity> entityList);
+
+    void delByAgencyAndName(IcSuperiorResourceEntity entity);
 }

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

@@ -170,7 +170,10 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcCityManagementAddEditFormDTO formDTO) {
-        IcCityManagementEntity entity = new IcCityManagementEntity();
+        IcCityManagementEntity entity = baseDao.selectById(formDTO.getIcCityManagementId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcCityManagementId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);

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

@@ -185,7 +185,10 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcDangerousChemicalsAddEditFormDTO formDTO) {
-        IcDangerousChemicalsEntity entity = new IcDangerousChemicalsEntity();
+        IcDangerousChemicalsEntity entity = baseDao.selectById(formDTO.getIcDangerousChemicalsId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcDangerousChemicalsId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);

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

@@ -27,6 +27,7 @@ import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
 import com.epmet.dto.result.IcPublicServiceListResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.IcPublicServiceEntity;
+import com.epmet.entity.IcSuperiorResourceEntity;
 import com.epmet.excel.IcPublicServiceExcel;
 import com.epmet.excel.handler.IcPublicServiceExcelImportListener;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -170,7 +171,10 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcPublicServiceAddEditFormDTO formDTO) {
-        IcPublicServiceEntity entity = new IcPublicServiceEntity();
+        IcPublicServiceEntity entity = baseDao.selectById(formDTO.getIcPublicServiceId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcPublicServiceId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);

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

@@ -170,7 +170,10 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcSuperiorResourceAddEditFormDTO formDTO) {
-        IcSuperiorResourceEntity entity = new IcSuperiorResourceEntity();
+        IcSuperiorResourceEntity entity = baseDao.selectById(formDTO.getIcSuperiorResourceId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcSuperiorResourceId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);

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

@@ -106,4 +106,15 @@
             id = #{id}
         AND del_flag = '0'
     </delete>
+
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_city_management
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>

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

@@ -118,4 +118,14 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_dangerous_chemicals
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>

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

@@ -107,4 +107,14 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_public_service
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>

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

@@ -107,5 +107,15 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_superior_resource
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 
 </mapper>

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -501,4 +501,17 @@ public class IcEventController {
         return new Result();
     }
 
+    /**
+     * 数据分析-个人档案-上报事件列表,根据epmetUserIdList查询
+     * 模仿gov/project/resieventreply/pageuserreported接口重新查询新表接口
+     * @author sun
+     */
+    @PostMapping("icevent-pageuserreported")
+    public Result<PageData<PageUserReportEventResDTO>> pageUserReported(@RequestBody PageUserReportEventFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<PageUserReportEventResDTO>>().ok(icEventService.icEventPageUserReported(formDTO));
+    }
+
+
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@@ -5,6 +5,7 @@ import com.epmet.dto.IcEventDTO;
 import com.epmet.dto.form.IcEventCategoryAnalysisFormDTO;
 import com.epmet.dto.form.IcEventListFormDTO;
 import com.epmet.dto.form.MyReportIcEvFormDTO;
+import com.epmet.dto.form.PageUserReportEventFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcEventEntity;
 import org.apache.ibatis.annotations.MapKey;
@@ -139,4 +140,7 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
     Integer getResiReportEventCount(@Param("reportorIdCard") String reportorIdCard);
 
     List<IcEventDTO> getByEventIds(@Param("icEventIdList") List<String> icEventIdList);
-}
+
+    List<PageUserReportEventResDTO> selectUserReported(PageUserReportEventFormDTO formDTO);
+
+}

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

@@ -222,4 +222,7 @@ public interface IcEventService extends BaseService<IcEventEntity> {
     void govRedDot(String icEventId);
 
     void difficultPointEvent(IcEventListFormDTO formDTO);
-}
+
+    PageData<PageUserReportEventResDTO> icEventPageUserReported(PageUserReportEventFormDTO formDTO);
+
+}

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

@@ -95,6 +95,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     @Autowired
     private ProjectSatisfactionDetailService projectSatisfactionDetailService;
 
+
     public CustomerStaffInfoCacheResult getStaffInfo(String customerId,String staffId){
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
         if (null == staffInfo) {
@@ -1609,4 +1610,14 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
     }
 
-}
+    @Override
+    public PageData<PageUserReportEventResDTO> icEventPageUserReported(PageUserReportEventFormDTO formDTO) {
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
+            return new PageData<PageUserReportEventResDTO>(new ArrayList<>(), NumConstant.ZERO);
+        }
+        PageInfo<PageUserReportEventResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO));
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
+    }
+
+}

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

@@ -937,8 +937,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         List<ProjectDataDTO> projectData=new ArrayList<>();
         for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){
             //当前项目分类一致，排除当前项目，相同分类编码
-            List<ProjectInfoIcData> projectList=projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(),
-                    categoryDictDTO.getCategoryCode(),formDTO.getProjectId(),formDTO.getEpmetUserIdList());
+            List<ProjectInfoIcData> projectList = projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(),
+                        categoryDictDTO.getCategoryCode(), formDTO.getProjectId(), formDTO.getEpmetUserIdList());
             if(!CollectionUtils.isEmpty(projectList)){
                 ProjectDataDTO projectDataDTO=new ProjectDataDTO();
                 projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode());

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -393,4 +393,23 @@
         AND (`status` = 'closed_case' OR difficult_point = '1')<!-- 已结案的或已标记为难点堵点的 -->
     </select>
 
-</mapper>
+
+    <select id="selectUserReported" resultType="com.epmet.dto.result.PageUserReportEventResDTO">
+        SELECT
+            re.id AS resiEventId,
+            re.event_content AS eventContent,
+            if(re.operation_type='1', '1', '0') AS shiftProject,
+            if(re.operation_type='1', re.operation_id, '') AS projectId,
+            re.created_time AS reportTime
+        FROM
+            ic_event re
+        WHERE
+            re.del_flag = '0'
+        <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
+            re.report_user_id = #{epmetUserId}
+        </foreach>
+        ORDER BY re.created_time desc
+    </select>
+
+
+</mapper>