diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java index dfd88c7e96..db6bd2c3d6 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java @@ -206,4 +206,5 @@ public class ScreenProjectDataDTO implements Serializable { private String orgIdPath; private String finishOrgType; + private Date processTime; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java index 043e256c42..988127dab7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java @@ -18,4 +18,8 @@ public interface PingYinConstant { String TEST_PING_YIN_CUSTOMER_ID = "78e2b2227c07de1fe54da14e2b2d9eb6"; String PROD_PING_YIN_CUSTOMER_ID = "6f203e30de1a65aab7e69c058826cd80"; + + String KC = "2fe0065f70ca0e23ce4c26fca5f1d933"; + String YS = "46c55cb862d6d5e6d05d2ab61a1cc07e"; + String JS = "44876154d10d7cb7affd92000f84f833"; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index c2a93796bd..d6a11f8c81 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.OrgTypeConstant; +import com.epmet.constant.PingYinConstant; import com.epmet.constant.ProjectConstant; import com.epmet.dto.basereport.form.EventInfoFormDTO; import com.epmet.dto.basereport.result.EventInfoResultDTO; @@ -319,12 +320,16 @@ public class DataReportingServiceImpl implements DataReportingService { dto.setHappenPlace(project.getProjectAddress()); dto.setEventDescription(project.getProjectContent()); dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N"); - if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) { + dto.setStatus(getProjectStatus(project.getProjectStatusCode())); + dto.setCompleteTime(project.getCloseCaseTime()); + + if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode()) || + ProjectConstant.CLOSED.equals(project.getProjectStatusCode())) { //办结组织是机关时，办结层级为机关的层级 if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) { dto.setWaysOfResolving(ProjectConstant.PROJECT_REPORT); //如果是孔村的项目办结层级需要降一级 - if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) { + if(PingYinConstant.KC.equals(project.getCustomerId())) { if (StringUtils.isNotBlank(project.getFinishOrgLevel())) { switch (project.getFinishOrgLevel()) { case OrgTypeConstant.DISTRICT: @@ -355,9 +360,12 @@ public class DataReportingServiceImpl implements DataReportingService { //办结组织是网格时，办结层级为网格 dto.setCompleteLevel("5"); } + if (ProjectConstant.CLOSED.equals(project.getProjectStatusCode()) &&(PingYinConstant.KC.equals(project.getCustomerId()) || + PingYinConstant.YS.equals(project.getCustomerId()) || PingYinConstant.JS.equals(project.getCustomerId()))) { + dto.setCompleteTime(project.getProcessTime()); + } } - dto.setStatus(getProjectStatus(project.getProjectStatusCode())); - dto.setCompleteTime(project.getCloseCaseTime()); + dto.setLat(project.getLatitude()); dto.setLng(project.getLongitude()); dto.setWaysOfResolving(ProjectConstant.PROJECT_SELF_CLOSED); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml index 64b783c786..6f4ce649b9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml @@ -300,7 +300,8 @@ b.HANDLER_ID AS finishOrg, b.HANDLER_TYPE AS finishOrgType, b.ORG_ID_PATH AS orgIdPath, - c.`LEVEL` AS finishOrgLevel + c.`LEVEL` AS finishOrgLevel, + b.PROCESS_TIME FROM screen_project_data a LEFT JOIN ( @@ -309,12 +310,13 @@ PROJECT_ID, HANDLER_ID, HANDLER_TYPE, - ORG_ID_PATH + ORG_ID_PATH, + PROCESS_TIME FROM screen_project_process spp WHERE (( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' ) - AND OPERATION = 'closed_case') + AND (OPERATION = 'closed_case' OR OPERATION = 'close')) OR (( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' ) AND OPERATION = 'close') diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index 61809bfb26..f88fd01ee9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -244,11 +244,15 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(r); + + JiMuResult>> fResult = jiMuReportOpenFeignClient.fieldTree(r); + String datasourceId = fResult.getResult().get(0).get(0).getDbId(); + + JiMuResult reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(datasourceId); if (!reportDbDataResultDTOJiMuResult.isSuccess()){ throw new EpmetException("获取报表dbData失败："+r); } + JiMuReportResultDTO data = ConvertUtils.mapToEntity(report.getResult(), JiMuReportResultDTO.class); log.info(JSON.toJSONString(reportDbDataResultDTOJiMuResult)); JimuReportDbDataResultDTO.ReportDB reportDb = reportDbDataResultDTOJiMuResult.getResult().getReportDb(); if (null != reportDb){ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java index 98526ad993..f4d0b7c1dc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java @@ -29,5 +29,6 @@ public class DelIcResiUserFormDTO implements Serializable { private String customerId; private String formCode= IcFormCodeEnum.RESI_BASE_INFO.getCode(); + private String currentStaffId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 40e661a63b..3e268bf8d9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -200,6 +200,7 @@ public class IcResiUserController implements ResultDataResolver { @PostMapping("delete") public Result delete(@LoginUser TokenDto tokenDto, @RequestBody DelIcResiUserFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setCurrentStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, DelIcResiUserFormDTO.IdGroup.class); formDTO.getUserIds().forEach(userId -> { formDTO.setIcResiUserId(userId); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index ae94fe4ec2..1fedc84df4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -96,9 +96,9 @@ public interface IcResiUserDao extends BaseDao { @Param("icResiUserId") String icResiUserId, @Param("subTableName") String subTableName); - int updateToDel(String icResiUserId); + int updateToDel(@Param("icResiUserId") String icResiUserId,@Param("currentStaffId") String currentStaffId); - int updateSubTableToDel(@Param("subTalbeName") String subTalbeName, @Param("icResiUserId") String icResiUserId); + int updateSubTableToDel(@Param("subTalbeName") String subTalbeName, @Param("icResiUserId") String icResiUserId,@Param("currentStaffId")String currentStaffId); /** * 接口名称 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java index bee24287c5..4fa9fd0540 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java @@ -40,5 +40,5 @@ public interface IcUserChangeDetailedDao extends BaseDao icUserIds); - int deleteByIcResiUserId(String icResiUserId); + int deleteByIcResiUserId(@Param("icResiUserId")String icResiUserId,@Param("currentStaffId")String currentStaffId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java index 89ee1327f2..9c171f54f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java @@ -50,5 +50,5 @@ public interface IcUserChangeRecordDao extends BaseDao **/ void delByCustomerId(@Param("customerId") String customerId, @Param("type") String type, @Param("icUserIds") List icUserIds); - int deleteByIcResiUserId(String icResiUserId); + int deleteByIcResiUserId(@Param("icResiUserId") String icResiUserId,@Param("currentStaffId")String currentStaffId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java index a869491b26..2042361b4c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java @@ -20,6 +20,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcUserTransferRecordEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 居民调动记录表 @@ -30,5 +31,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface IcUserTransferRecordDao extends BaseDao { - int deleteByIcResiUserId(String icResiUserId); + int deleteByIcResiUserId(@Param("icResiUserId") String icResiUserId, @Param("currentStaffId")String currentStaffId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java index cf305c4b0a..2b164723f8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java @@ -37,5 +37,5 @@ public interface IcUserChangeDetailedService extends BaseService icUserIds); - int deleteByIcResiUserId(String icResiUserId); + int deleteByIcResiUserId(String icResiUserId,String currentStaffId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java index fa68cd34da..620c786e5f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java @@ -55,5 +55,5 @@ public interface IcUserChangeRecordService extends BaseService> subTableRes = operCustomizeOpenFeignClient.queryIcResiSubTables(queryDTO); if (subTableRes.success() && !CollectionUtils.isEmpty(subTableRes.getData())) { for (String subTalbeName : subTableRes.getData()) { - baseDao.updateSubTableToDel(subTalbeName, formDTO.getIcResiUserId()); + baseDao.updateSubTableToDel(subTalbeName, formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); } } //删除ic_user_transfer_record、ic_user_change_record、ic_user_change_detailed - icUserTransferRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId()); - icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId()); - icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId()); + icUserTransferRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); + icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); + icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java index 7cf719e48d..060eab7ba7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java @@ -45,7 +45,7 @@ public class IcUserChangeDetailedServiceImpl extends BaseServiceImpl - - update ic_resi_user set del_flag='1' where id=#{icResiUserId} + + update ic_resi_user + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} + where id = #{icResiUserId} - update ${subTalbeName} set del_flag='1' where IC_RESI_USER=#{icResiUserId} + update ${subTalbeName} + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} + where IC_RESI_USER=#{icResiUserId} update diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml index 6edda514fe..c2a8804395 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml @@ -15,8 +15,11 @@ - - update ic_user_change_detailed set del_flag='1' + + update ic_user_change_detailed + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} where IC_USER_ID=#{icResiUserId} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml index cc865efc81..4b7203f075 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml @@ -73,8 +73,11 @@ - - update ic_user_change_record set del_flag='1' + + update ic_user_change_record + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} where IC_USER_ID = #{icResiUserId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml index d2a829567e..2729a66899 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml @@ -3,8 +3,11 @@ - - update ic_user_transfer_record set del_flag='1' + + update ic_user_transfer_record + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} where IC_USER_ID = #{icResiUserId} \ No newline at end of file