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

新增了sort字段

Browse Source
This commit is contained in:
guosongrui
2024-05-28 15:21:25 +08:00
parent 738a9497eb
commit 6817b33020
16 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/BpmFormParam.java
View File

@@ -51,6 +51,12 @@ public class BpmFormParam implements Serializable {
@ApiModelProperty("备注")
private String remark;
/**
* 排序
*/
@ApiModelProperty("排序")
private Integer sort = 100;
/**
* 更新操作实体

6
pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/BpmSignParam.java
View File

@@ -51,6 +51,12 @@ public class BpmSignParam extends BaseEntity implements Serializable {
@ApiModelProperty("流程创建表单路径")
private String createPath;
/**
* 排序
*/
@ApiModelProperty("排序")
private Integer sort = 100;
/**
* 更新操作实体

5
pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/po/BpmForm.java
View File

@@ -61,4 +61,9 @@ public class BpmForm extends BaseEntity implements Serializable {
*/
private Integer state;
/**
* 排序
*/
private Integer sort;
}

5
pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/po/BpmSign.java
View File

@@ -52,6 +52,11 @@ public class BpmSign extends BaseEntity implements Serializable {
*/
private Integer state;
/**
* 排序
*/
private Integer sort;
}

2
pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/vo/BpmFormVO.java
View File

@@ -19,6 +19,8 @@ public class BpmFormVO implements Serializable {
private Integer status; // 参见 CommonStatusEnum 枚举
private Integer sort;
private String remark;
private LocalDateTime createTime;

5
pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/vo/BpmSignVO.java
View File

@@ -48,6 +48,11 @@ public class BpmSignVO implements Serializable {
*/
private String createPath;
/**
* 排序
*/
private Integer sort;
/**

3
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/mapper/mapping/BpmCategoryMapper.xml
View File

@@ -10,7 +10,8 @@
bpm_category.code,
bpm_category.status,
bpm_category.create_time,
bpm_category.description
bpm_category.description,
bpm_category.sort
FROM bpm_category bpm_category
WHERE ${ew.sqlSegment}
</select>

3
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/mapper/mapping/BpmFormMapper.xml
View File

@@ -9,7 +9,8 @@
bpm_form.name,
bpm_form.status,
bpm_form.create_time,
bpm_form.remark
bpm_form.remark,
bpm_form.sort
FROM bpm_form bpm_form
WHERE ${ew.sqlSegment}
</select>

3
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/mapper/mapping/BpmSignMapper.xml
View File

@@ -9,7 +9,8 @@
bpm_sign.name,
bpm_sign.sign_key,
bpm_sign.view_path,
bpm_sign.create_time
bpm_sign.create_time,
bpm_sign.sort
FROM bpm_sign bpm_sign
WHERE ${ew.sqlSegment}
</select>

1
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmCategoryServiceImpl.java
View File

@@ -78,6 +78,7 @@ public class BpmCategoryServiceImpl extends ServiceImpl<BpmCategoryMapper, BpmCa
}
categoryVOQueryWrapper.eq("bpm_category.state", DataStateEnum.ENABLE.getCode());
categoryVOQueryWrapper.orderByDesc("bpm_category.update_time");
categoryVOQueryWrapper.orderByAsc("bpm_category.sort");
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(bpmCategoryQueryParam), PageFactory.getPageSize(bpmCategoryQueryParam)), categoryVOQueryWrapper);
}

1
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmFormServiceImpl.java
View File

@@ -39,6 +39,7 @@ public class BpmFormServiceImpl extends ServiceImpl<BpmFormMapper, BpmForm> impl
}
bpmFormVOQueryWrapper.eq("bpm_form.state", DataStateEnum.ENABLE.getCode());
bpmFormVOQueryWrapper.orderByDesc("bpm_form.update_time");
bpmFormVOQueryWrapper.orderByAsc("bpm_form.sort");
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(bpmFormQueryParam), PageFactory.getPageSize(bpmFormQueryParam)), bpmFormVOQueryWrapper);
}

1
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmSignServiceImpl.java
View File

@@ -114,6 +114,7 @@ public class BpmSignServiceImpl extends ServiceImpl<BpmSignMapper, BpmSign> impl
}
bpmSignVOQueryWrapper.eq("bpm_sign.state", DataStateEnum.ENABLE.getCode());
bpmSignVOQueryWrapper.orderByDesc("bpm_sign.update_time");
bpmSignVOQueryWrapper.orderByAsc("bpm_sign.sort");
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(bpmSignQueryParam), PageFactory.getPageSize(bpmSignQueryParam)), bpmSignVOQueryWrapper);
}

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java
View File

@@ -46,8 +46,6 @@ public class SupervisionUserComplaintController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supervisionUserComplaintService.addSupervisionUserComplaint(supervisionUserComplaintParam), methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/initiateWarningLeaflet")
@ApiOperation("针对用户投诉发起告警单")
@@ -59,6 +57,4 @@ public class SupervisionUserComplaintController extends BaseController {
}

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

@@ -122,7 +122,6 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
/*获取直接下属子单位*/
List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData();
queryWrapper.in("supervision_temp_line_report.org_id", data);
}
//添加上时间范围
queryWrapper.between("supervision_temp_line_debug.Create_Time",
@@ -148,14 +147,12 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
supervisionTempLineDebugVO.setMonitoringTerminalName(supervisionTempLineReport.getMonitoringTerminalName());
supervisionTempLineDebugVO.setPowerSubstationName(supervisionTempLineReport.getPowerSubstationName());
supervisionTempLineDebugVO.setLineId(supervisionTempLineReport.getLineId());
supervisionTempLineDebugVO.setLineName(supervisionTempLineReport.getLineName());
supervisionTempLineDebugVO.setReason(supervisionTempLineDebugPO.getReason());
supervisionTempLineDebugVO.setProcessInstanceId(supervisionTempLineDebugPO.getProcessInstanceId());
supervisionTempLineDebugVO.setStatus(supervisionTempLineDebugPO.getStatus());
return supervisionTempLineDebugVO;
}

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

@@ -101,8 +101,6 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
/*获取直接下属子单位*/
List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineReportQuery.getOrgNo()).getData();
queryWrapper.in("supervision_temp_line_report.org_id", data);
}
//添加上时间范围
queryWrapper.between("supervision_temp_line_report.Create_Time",

1
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
View File

@@ -118,7 +118,6 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
@Override
public Page<SupervisionPlanVO> pagePlan(SupervisionPlanParam supvPlanParam) {
QueryWrapper<SupervisionPlanPO> supervisionPlanParamQueryWrapper = new QueryWrapper<>();
LambdaQueryWrapper<SupervisionPlanPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())) {
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getSupvOrgId()).getData();