Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

用户投诉预警单提交

Browse Source
This commit is contained in:
hzj
2024-05-23 10:44:19 +08:00
parent a0b81b1bda
commit 46d647236f
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
View File

@@ -167,7 +167,7 @@ public class SupervisionDevMainReportParam {
public static class SupervisionDevMainReportQuery extends BaseParam { public static class SupervisionDevMainReportQuery extends BaseParam {
@ApiModelProperty(value = "填报部门") @ApiModelProperty(value = "填报部门")
private String orgId; private String orgNo;
} }
} }

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java
View File

@@ -57,7 +57,7 @@ public class SupervisionTempLineDebugParam extends BaseEntity {
public static class SupervisionTempLineDebugQuery extends BaseParam { public static class SupervisionTempLineDebugQuery extends BaseParam {
@ApiModelProperty(value = "填报部门") @ApiModelProperty(value = "填报部门")
private String orgId; private String orgNo;
private List<Integer> statueList; private List<Integer> statueList;

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
View File

@@ -237,7 +237,7 @@ public class SupervisionTempLineReportParam {
public static class SupervisionTempLineReportQuery extends BaseParam { public static class SupervisionTempLineReportQuery extends BaseParam {
@ApiModelProperty(value = "填报部门") @ApiModelProperty(value = "填报部门")
private String orgId; private String orgNo;
private List<Integer> statueList; private List<Integer> statueList;

6
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
View File

@@ -122,10 +122,10 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
queryWrapper.in("supervision_dev_main_report.create_by", CollectionUtil.newArrayList(userIndex)) queryWrapper.in("supervision_dev_main_report.create_by", CollectionUtil.newArrayList(userIndex))
.eq("supervision_dev_main_report.state", DataStateEnum.ENABLE.getCode()); .eq("supervision_dev_main_report.state", DataStateEnum.ENABLE.getCode());
if (StrUtil.isNotBlank(supervisionDevMainReportQuery.getOrgId())) { if (StrUtil.isNotBlank(supervisionDevMainReportQuery.getOrgNo())) {
/*获取直接下属子单位*/ /*获取直接下属子单位*/
List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionDevMainReportQuery.getOrgId()).getData(); List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionDevMainReportQuery.getOrgNo()).getData();
queryWrapper.in("supervision_dev_main_report.org_no", data); queryWrapper.in("supervision_dev_main_report.org_id", data);
} }
//添加上时间范围 //添加上时间范围

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
View File

@@ -88,9 +88,9 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
String userIndex = RequestUtil.getUserIndex(); String userIndex = RequestUtil.getUserIndex();
queryWrapper.in("supervision_temp_line_report.create_by", CollectionUtil.newArrayList(userIndex)) queryWrapper.in("supervision_temp_line_report.create_by", CollectionUtil.newArrayList(userIndex))
.eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode()); .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode());
if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgId())) { if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) {
/*获取直接下属子单位*/ /*获取直接下属子单位*/
List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgId()).getData(); List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData();
queryWrapper.in("supervision_temp_line_report.org_id", data); queryWrapper.in("supervision_temp_line_report.org_id", data);
} }
@@ -112,9 +112,9 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
String userIndex = RequestUtil.getUserIndex(); String userIndex = RequestUtil.getUserIndex();
queryWrapper queryWrapper
.eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode()); .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode());
if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgId())) { if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) {
/*获取直接下属子单位*/ /*获取直接下属子单位*/
List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgId()).getData(); List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData();
queryWrapper.in("supervision_temp_line_debug.org_id", data); queryWrapper.in("supervision_temp_line_debug.org_id", data);
} }

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
View File

@@ -96,9 +96,9 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
queryWrapper.in("supervision_temp_line_report.create_by", CollectionUtil.newArrayList(userIndex)) queryWrapper.in("supervision_temp_line_report.create_by", CollectionUtil.newArrayList(userIndex))
.eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode()) .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode())
.in(CollectionUtil.isNotEmpty(supervisionTempLineReportQuery.getStatueList()),"supervision_temp_line_report.status",supervisionTempLineReportQuery.getStatueList()); .in(CollectionUtil.isNotEmpty(supervisionTempLineReportQuery.getStatueList()),"supervision_temp_line_report.status",supervisionTempLineReportQuery.getStatueList());
if (StrUtil.isNotBlank(supervisionTempLineReportQuery.getOrgId())) { if (StrUtil.isNotBlank(supervisionTempLineReportQuery.getOrgNo())) {
/*获取直接下属子单位*/ /*获取直接下属子单位*/
List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineReportQuery.getOrgId()).getData(); List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineReportQuery.getOrgNo()).getData();
queryWrapper.in("supervision_temp_line_report.org_id", data); queryWrapper.in("supervision_temp_line_report.org_id", data);