From 3ef85be49d031fc3256918454aa75350451bc9dd Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Thu, 16 May 2024 13:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=80=E5=8C=97=E5=8F=B0=E8=B4=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/pojo/param/user/UserReportParam.java   |  7 +++++--
 .../njcn/supervision/pojo/po/user/UserReportPO.java    | 10 ++++++++--
 .../service/user/impl/UserReportPOServiceImpl.java     |  8 +++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
index e055defa3..2108e0dc4 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
@@ -18,7 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/4/25  10:07【需求编号】
  *
@@ -141,7 +141,10 @@ public class UserReportParam extends BaseEntity {
         @ApiModelProperty(value="所属区域")
         private String city;
 
+        @ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入")
+        private Integer dataType;
+
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
index b87db3eb0..7378d28d7 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
 import java.time.LocalDate;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/4/25  10:07【需求编号】
  *
@@ -114,6 +114,12 @@ public class UserReportPO extends BaseEntity {
     @TableField(value = "process_instance_id")
     private String processInstanceId;
 
+    /**
+     * 数据来源类型 0.正常流程审核入库 1.批量导入
+     */
+    @TableField(value = "data_type")
+    private Integer dataType;
+
 
     /**
      * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消
@@ -129,4 +135,4 @@ public class UserReportPO extends BaseEntity {
     private Integer state;
 
 
-}
\ No newline at end of file
+}
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
index 03deb5e8f..734101308 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
@@ -75,6 +75,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         BeanUtils.copyProperties(userReportParam, userReportPO);
         userReportPO.setState(DataStateEnum.ENABLE.getCode());
         userReportPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        userReportPO.setDataType(0);
         this.save(userReportPO);
         if (
                 CollectionUtil.newArrayList(
@@ -259,13 +260,18 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     public Page<UserReportVO> getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam) {
         QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
         userReportVOQueryWrapper
-                .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()).eq("supervision_user_report.status",FlowStatusEnum.APPROVE.getCode());
+                .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode())
+                .eq("supervision_user_report.status",FlowStatusEnum.APPROVE.getCode())
+                ;
         //TODO
         if (Objects.nonNull(userReportQueryParam)) {
             if (StrUtil.isNotBlank(userReportQueryParam.getCity())) {
                 //查询所有区域下的数据
                 userReportVOQueryWrapper.in("supervision_user_report.city", userReportQueryParam.getCity());
             }
+            if(Objects.nonNull(userReportQueryParam.getDataType())){
+                userReportVOQueryWrapper.eq("data_type",userReportQueryParam.getDataType());
+            }
         }
         userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time");
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper);