1.相关实体添加过期注解处理，后期相关业务可删除

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalD.java

@@ -20,6 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_bus_global_d")
+@Deprecated
 public class RDimBusGlobalD {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalM.java

@@ -20,6 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_bus_global_m")
+@Deprecated
 public class RDimBusGlobalM{
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalY.java

@@ -20,6 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_bus_global_y")
+@Deprecated
 public class RDimBusGlobalY {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventD.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_bus_station_event_d")
+@Deprecated
 public class RDimBusStationEventD {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventM.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_bus_station_event_m")
+@Deprecated
 public class RDimBusStationEventM{
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisDPO.java

@@ -17,6 +17,7 @@ import java.time.LocalDate;
  */
 @Data
 @TableName(value = "r_dim_bus_station_event_startis_d")
+@Deprecated
 public class RDimBusStationEventStartisDPO {
     @MppMultiId(value = "Org_Id")
     private String orgId;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisMPO.java

@@ -17,6 +17,7 @@ import java.time.LocalDate;
  */
 @Data
 @TableName(value = "r_dim_bus_station_event_startis_m")
+@Deprecated
 public class RDimBusStationEventStartisMPO {
     @MppMultiId(value = "Org_Id")
     private String orgId;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisYPO.java

@@ -17,6 +17,7 @@ import java.time.LocalDate;
  */
 @Data
 @TableName(value = "r_dim_bus_station_event_startis_y")
+@Deprecated
 public class RDimBusStationEventStartisYPO {
     @MppMultiId(value = "Org_Id")
     private String orgId;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventY.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_bus_station_event_y")
+@Deprecated
 public class RDimBusStationEventY {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetDPO.java

@@ -21,6 +21,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "r_dim_bus_target_d")
+@Deprecated
 public class RDimBusTargetDPO  {
     @MppMultiId(value = "Org_Id")
     private String orgId;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetMPO.java

@@ -21,6 +21,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "r_dim_bus_target_m")
+@Deprecated
 public class RDimBusTargetMPO  {
     @MppMultiId(value = "Org_Id")
     private String orgId;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetYPO.java

@@ -21,6 +21,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "r_dim_bus_target_y")
+@Deprecated
 public class RDimBusTargetYPO {
     @MppMultiId(value = "Org_Id")
     private String orgId;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventD.java

@@ -20,6 +20,7 @@ import lombok.Setter;
  */
 @Data
 @TableName("r_dim_obj_event_d")
+@Deprecated
 public class RDimObjEventD {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventM.java

@@ -20,6 +20,7 @@ import lombok.Setter;
  */
 @Data
 @TableName("r_dim_obj_event_m")
+@Deprecated
 public class RDimObjEventM {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventY.java

@@ -20,6 +20,7 @@ import lombok.Setter;
  */
 @Data
 @TableName("r_dim_obj_event_y")
+@Deprecated
 public class RDimObjEventY {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalD.java

@@ -19,6 +19,7 @@ import java.time.LocalDate;
 @Getter
 @Setter
 @TableName("r_dim_obj_global_d")
+@Deprecated
 public class RDimObjGlobalD {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalM.java

@@ -20,6 +20,7 @@ import java.time.LocalDate;
 @Getter
 @Setter
 @TableName("r_dim_obj_global_m")
+@Deprecated
 public class RDimObjGlobalM {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalY.java

@@ -20,6 +20,7 @@ import java.time.LocalDate;
 @Getter
 @Setter
 @TableName("r_dim_obj_global_y")
+@Deprecated
 public class RDimObjGlobalY {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateD.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_obj_rate_d")
+@Deprecated
 public class RDimObjRateD{
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateM.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_obj_rate_m")
+@Deprecated
 public class RDimObjRateM{
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateY.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_obj_rate_y")
+@Deprecated
 public class RDimObjRateY{
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetD.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_obj_target_d")
+@Deprecated
 public class RDimObjTargetD  {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java

@@ -18,6 +18,7 @@ import java.time.LocalDate;
 @Getter
 @Setter
 @TableName("r_dim_obj_target_m")
+@Deprecated
 public class RDimObjTargetM  {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java

@@ -18,6 +18,7 @@ import java.time.LocalDate;
 @Getter
 @Setter
 @TableName("r_dim_obj_target_y")
+@Deprecated
 public class RDimObjTargetY  {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationBaseD.java

@@ -20,6 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_station_base_d")
+@Deprecated
 public class RDimStationBaseD extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalD.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_station_global_d")
+@Deprecated
 public class RDimStationGlobalD extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalM.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_station_global_m")
+@Deprecated
 public class RDimStationGlobalM extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalY.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_station_global_y")
+@Deprecated
 public class RDimStationGlobalY extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationHarmnicDPO.java

@@ -19,6 +19,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "r_dim_station_harmnic_d")
+@Deprecated
 public class RDimStationHarmnicDPO {
     /**
      * 单位code

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetD.java

@@ -19,6 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_station_target_d")
+@Deprecated
 public class RDimStationTargetD extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetM.java

@@ -20,6 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_station_target_m")
+@Deprecated
 public class RDimStationTargetM extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetY.java

@@ -20,6 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_station_target_y")
+@Deprecated
 public class RDimStationTargetY extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java

@@ -6,12 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.harmonic.mapper.upload.PmsTemUserMapper;
 import com.njcn.harmonic.pojo.param.upload.PmsTemProcessApprovalParam;
 import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO;
+import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO;
+import com.njcn.user.api.DeptFeignClient;
 import com.njcn.web.enums.GWSendEnum;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.pojo.param.SendParam;
 import com.njcn.web.utils.GwSendUtil;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -33,8 +37,13 @@ import com.njcn.harmonic.service.upload.PmsTemProcessApprovalService;
  * @version V1.0.0
  */
 @Service
+@RequiredArgsConstructor
 public class PmsTemProcessApprovalServiceImpl extends ServiceImpl<PmsTemProcessApprovalMapper, PmsTemProcessApproval> implements PmsTemProcessApprovalService{
 
+    private final DeptFeignClient deptFeignClient;
+
+    private final PmsTemUserMapper pmsTemUserMapper;
+
     @Override
     public Boolean createOrUpdate(PmsTemProcessApprovalParam param) {
         PmsTemProcessApproval pmsTemProcessApproval = new PmsTemProcessApproval();
@@ -47,8 +56,15 @@ public class PmsTemProcessApprovalServiceImpl extends ServiceImpl<PmsTemProcessA
 
     @Override
     public Page<PmsTemProcessApproval> pageList(PmsTemProcessApprovalParam.QueryPmsTemProcessApprovalParam param) {
+        List<String> deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(param.getMaintOrg()).getData();
+        List<String> objIds = pmsTemUserMapper.selectList(new LambdaQueryWrapper<PmsTemUserPO>().select(PmsTemUserPO::getObjId).in(PmsTemUserPO::getMaintOrg,deptCodes)).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
+
+        if(CollUtil.isEmpty(objIds)){
+            return new Page<>(param.getPageNum(),param.getPageSize());
+        }
         LambdaQueryWrapper<PmsTemProcessApproval> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.between(StringUtils.isNotBlank(param.getSearchBeginTime())&&StringUtils.isNotBlank(param.getSearchEndTime()),PmsTemProcessApproval::getCreateTime,param.getSearchBeginTime(),param.getSearchEndTime());
+        lambdaQueryWrapper
+                .between(StringUtils.isNotBlank(param.getSearchBeginTime())&&StringUtils.isNotBlank(param.getSearchEndTime()),PmsTemProcessApproval::getCreateTime,param.getSearchBeginTime(),param.getSearchEndTime()).in(PmsTemProcessApproval::getTempUserDossierId,objIds);
 
         return this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper);
     }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java

@@ -2,6 +2,7 @@ package com.njcn.harmonic.service.upload.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -96,7 +97,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
     public List<PmsTemProcessReport> getList(PmsTemUserParam.QueryPmsTemUserParam param) {
 
         LambdaQueryWrapper<PmsTemProcessReport> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate,param.getSearchBeginTime());
+        lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate,DateUtil.format(DateUtil.parse(param.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_MONTH_PATTERN));
         return this.list(lambdaQueryWrapper);
     }
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.harmonic.mapper.upload.PmsTemProcessTrackMapper;
+import com.njcn.harmonic.mapper.upload.PmsTemUserMapper;
 import com.njcn.harmonic.pojo.param.upload.PmsTemProcessTrackParam;
 import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO;
 import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO;
@@ -42,6 +43,10 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
 
     private final IPmsTemUserService iPmsTemUserService;
 
+    private final DeptFeignClient deptFeignClient;
+
+    private final PmsTemUserMapper pmsTemUserMapper;
+
 
     @Override
     public Boolean addTemProcessTrack(PmsTemProcessTrackParam param) {
@@ -74,7 +79,15 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
 
     @Override
     public Page<PmsTemProcessTrackPO> pageList(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam parkQuery) {
+        List<String> deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(parkQuery.getMaintOrg()).getData();
+        List<String> objIds = pmsTemUserMapper.selectList(new LambdaQueryWrapper<PmsTemUserPO>().select(PmsTemUserPO::getObjId).in(PmsTemUserPO::getMaintOrg,deptCodes)).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
+
+        if(CollUtil.isEmpty(objIds)){
+            return new Page<>(parkQuery.getPageNum(),parkQuery.getPageSize());
+        }
         LambdaQueryWrapper<PmsTemProcessTrackPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(PmsTemProcessTrackPO::getTempUserDossierId,objIds);
+
         return this.page(new Page<>(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper);
     }
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java

@@ -101,7 +101,7 @@ public class RUploadCommPointBusServiceImpl extends ServiceImpl<RUploadCommPoint
             Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT);
             List<String> ids = list.get(i).stream().map(RUploadCommPointBus::getObjId).collect(Collectors.toList());
             int count = GwSendUtil.returnInfoMsg(ids,sendRes);
-            System.out.println("上送成功,上送成功返回"+count+"条");
+            System.out.println("上送成功,上送成功返回"+count+"条,上传数据"+list.get(i).size()+"条");
             if(count == list.get(i).size()){
                 LambdaUpdateWrapper<RUploadCommPointBus> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
                 lambdaUpdateWrapper.set(RUploadCommPointBus::getUploadStatus,1).in(RUploadCommPointBus::getObjId,ids);

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java

@@ -20,6 +20,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "r_dim_station_target_d")
+@Deprecated
 public class RDimStationTargetDPO extends BaseEntity {
     @MppMultiId(value = "Org_Id")
     private String orgId;

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java

@@ -21,6 +21,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "r_dim_station_target_m")
+@Deprecated
 public class RDimStationTargetMPO extends BaseEntity {
     @MppMultiId(value = "Org_Id")
     private String orgId;

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java

@@ -21,6 +21,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "r_dim_station_target_y")
+@Deprecated
 public class RDimStationTargetYPO extends BaseEntity {
 
     @MppMultiId(value = "Org_Id")