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

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;
 }

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";
 }

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);

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')

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<IcCustomerRepor
             if (!report.isSuccess()) {
                 throw new EpmetException("获取jm报表详情失败：" + r);
             }
-            JiMuReportResultDTO data = ConvertUtils.mapToEntity(report.getResult(), JiMuReportResultDTO.class);
-            JiMuResult<JimuReportDbDataResultDTO> reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(r);
+
+            JiMuResult<List<List<JimuReportFieldTreeResultDTO>>> fResult = jiMuReportOpenFeignClient.fieldTree(r);
+            String datasourceId = fResult.getResult().get(0).get(0).getDbId();
+
+            JiMuResult<JimuReportDbDataResultDTO> 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){

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;
 }
 

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);

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -96,9 +96,9 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                     @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);
 
     /**
      * 接口名称

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java

@@ -40,5 +40,5 @@ public interface IcUserChangeDetailedDao extends BaseDao<IcUserChangeDetailedEnt
      **/
     void delByCustomerId(@Param("customerId") String customerId, @Param("type") String type, @Param("icUserIds") List<String> icUserIds);
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(@Param("icResiUserId")String icResiUserId,@Param("currentStaffId")String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java

@@ -50,5 +50,5 @@ public interface IcUserChangeRecordDao extends BaseDao<IcUserChangeRecordEntity>
      **/
     void delByCustomerId(@Param("customerId") String customerId, @Param("type") String type, @Param("icUserIds") List<String> icUserIds);
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(@Param("icResiUserId") String icResiUserId,@Param("currentStaffId")String currentStaffId);
 }

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<IcUserTransferRecordEntity> {
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(@Param("icResiUserId") String icResiUserId, @Param("currentStaffId")String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java

@@ -37,5 +37,5 @@ public interface IcUserChangeDetailedService extends BaseService<IcUserChangeDet
      **/
     void delByCustomerId(String customerId, String type, List<String> icUserIds);
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(String icResiUserId,String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java

@@ -55,5 +55,5 @@ public interface IcUserChangeRecordService extends BaseService<IcUserChangeRecor
      **/
     void icUserChangeRecordInit(IcUserChangeRecordInitFormDTO formDTO) throws ParseException;
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(String icResiUserId,String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java

@@ -48,5 +48,5 @@ public interface IcUserTransferRecordService extends BaseService<IcUserTransferR
      */
     void moveResi(IcResiUserTransferFormDTO formDTO);
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(String icResiUserId,String currentStaffId);
 }

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

@@ -176,18 +176,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(DelIcResiUserFormDTO formDTO) {
-        baseDao.updateToDel(formDTO.getIcResiUserId());
+        baseDao.updateToDel(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
         CustomerFormQueryDTO queryDTO = ConvertUtils.sourceToTarget(formDTO, CustomerFormQueryDTO.class);
         Result<Set<String>> 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());
     }
 
     /**

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

@@ -45,7 +45,7 @@ public class IcUserChangeDetailedServiceImpl extends BaseServiceImpl<IcUserChang
     }
 
     @Override
-    public int deleteByIcResiUserId(String icResiUserId) {
-        return baseDao.deleteByIcResiUserId(icResiUserId);
+    public int deleteByIcResiUserId(String icResiUserId,String currentStaffId) {
+        return baseDao.deleteByIcResiUserId(icResiUserId,currentStaffId);
     }
 }

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

@@ -172,8 +172,8 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
     }
 
     @Override
-    public int deleteByIcResiUserId(String icResiUserId) {
-        return baseDao.deleteByIcResiUserId(icResiUserId);
+    public int deleteByIcResiUserId(String icResiUserId,String currentStaffId) {
+        return baseDao.deleteByIcResiUserId(icResiUserId,currentStaffId);
     }
 
     /**

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

@@ -412,8 +412,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
     }
 
     @Override
-    public int deleteByIcResiUserId(String icResiUserId) {
-        return baseDao.deleteByIcResiUserId(icResiUserId);
+    public int deleteByIcResiUserId(String icResiUserId,String currentStaffId) {
+        return baseDao.deleteByIcResiUserId(icResiUserId,currentStaffId);
     }
 
 

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -221,12 +221,20 @@
         IC_RESI_USER.ID ASC
     </select>
 
-    <update id="updateToDel" parameterType="java.lang.String">
-        update ic_resi_user set del_flag='1' where id=#{icResiUserId}
+    <update id="updateToDel" parameterType="map">
+        update ic_resi_user
+        set del_flag='1',
+            UPDATED_TIME = now(),
+            UPDATED_BY = #{currentStaffId}
+        where id = #{icResiUserId}
     </update>
 
     <update id="updateSubTableToDel" parameterType="map">
-        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>
     <update id="updateIcResiUserByIdCard">
         update

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml

@@ -15,8 +15,11 @@
         </foreach>
     </delete>
 
-    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
-        update ic_user_change_detailed set del_flag='1'
+    <update id="deleteByIcResiUserId" parameterType="map">
+        update ic_user_change_detailed
+        set del_flag='1',
+            UPDATED_TIME = now(),
+            UPDATED_BY = #{currentStaffId}
         where  IC_USER_ID=#{icResiUserId}
     </update>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml

@@ -73,8 +73,11 @@
         </foreach>
     </delete>
 
-    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
-        update ic_user_change_record set del_flag='1'
+    <update id="deleteByIcResiUserId" parameterType="map">
+        update ic_user_change_record
+        set del_flag='1',
+            UPDATED_TIME = now(),
+            UPDATED_BY = #{currentStaffId}
         where IC_USER_ID = #{icResiUserId}
     </update>
 

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml

@@ -3,8 +3,11 @@
 
 <mapper namespace="com.epmet.dao.IcUserTransferRecordDao">
 
-    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
-        update ic_user_transfer_record set del_flag='1'
+    <update id="deleteByIcResiUserId" parameterType="map">
+        update ic_user_transfer_record
+        set del_flag='1',
+            UPDATED_TIME = now(),
+            UPDATED_BY = #{currentStaffId}
         where IC_USER_ID = #{icResiUserId}
     </update>
 </mapper>