BJ_FS / urbanops

Commit 99b917a8b570e2eba9438212909cca628f07907c

Authored by 颜惠青
1 parent 8f216789

工作流 底层扩展 支持 app端 pc端 审批附件url功能 修订

Inline Side-by-side
Showing 5 changed files with 25 additions and 1 deletions
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskServiceImpl.java
  View file @99b917a
... ... @@ -1691,7 +1691,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
1691 1691 List<Attachment> attachmentList = taskService.getProcessInstanceAttachments(processInstanceId);
1692 1692 // 空列表直接返回空集合（避免null）
1693 1693 if (CollUtil.isEmpty(attachmentList)) {
1694   - return CollUtil.empty(String.class);
  1694 + return new ArrayList<>();
1695 1695 }
1696 1696  
1697 1697 List<String> targetList = new ArrayList<>();
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java
  View file @99b917a
... ... @@ -39,6 +39,8 @@ public class MainInfoHasTaskPageReqVO extends PageParam {
39 39 private String busiLine;
40 40 @Schema(description = "工单号")
41 41 private String orderNo;
  42 + @Schema(description = "工单类型 Q:快速工单,C:普通工单,O:其他工单")
  43 + private String orderType;
42 44 @Schema(description = "工单名称", example = "张三")
43 45 private String orderName;
44 46 @Schema(description = "工单描述", example = "你说的对")
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java
  View file @99b917a
... ... @@ -351,6 +351,7 @@ public class AppGardenWorkOrderController {
351 351 inspectStartReqVO.setAgree(revokeStatus);
352 352 inspectStartReqVO.setReason(reqVO.getReason());
353 353 inspectStartReqVO.setId(reqVO.getTaskId());
  354 + inspectStartReqVO.setReturnImgs(reqVO.getReturnImgs());
354 355 this.approveTask(inspectStartReqVO);
355 356 log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_FINISH.getDesc()+"<--结束");
356 357 return success(true);
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
  View file @99b917a
... ... @@ -92,6 +92,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
92 92 " <if test='query.curingLevelId != null'>",
93 93 " AND m.curing_level_id = #{query.curingLevelId}",
94 94 " </if>",
  95 + " <if test='query.orderType != null'>",
  96 + " AND m.order_type = #{query.orderType}",
  97 + " </if>",
95 98 " <if test='query.taskId != null'>",
96 99 " AND t.ID_ = #{query.taskId}",
97 100 " </if>",
... ... @@ -208,6 +211,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
208 211 " <if test='query.curingLevelId != null'>",
209 212 " AND m.curing_level_id = #{query.curingLevelId}",
210 213 " </if>",
  214 + " <if test='query.orderType != null'>",
  215 + " AND m.order_type = #{query.orderType}",
  216 + " </if>",
211 217 " <if test='query.taskId != null'>",
212 218 " AND t.ID_ = #{query.taskId}",
213 219 " </if>",
... ... @@ -316,6 +322,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
316 322 " <if test='query.curingLevelId != null'>",
317 323 " AND m.curing_level_id = #{query.curingLevelId}",
318 324 " </if>",
  325 + " <if test='query.orderType != null'>",
  326 + " AND m.order_type = #{query.orderType}",
  327 + " </if>",
319 328 " <if test='query.taskId != null'>",
320 329 " AND t.ID_ = #{query.taskId}",
321 330 " </if>",
... ... @@ -433,6 +442,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
433 442 " <if test='query.curingLevelId != null'>",
434 443 " AND m.curing_level_id = #{query.curingLevelId}",
435 444 " </if>",
  445 + " <if test='query.orderType != null'>",
  446 + " AND m.order_type = #{query.orderType}",
  447 + " </if>",
436 448 " <if test='query.taskId != null'>",
437 449 " AND t.ID_ = #{query.taskId}",
438 450 " </if>",
... ... @@ -544,6 +556,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
544 556 " <if test='query.curingLevelId != null'>",
545 557 " AND m.curing_level_id = #{query.curingLevelId}",
546 558 " </if>",
  559 + " <if test='query.orderType != null'>",
  560 + " AND m.order_type = #{query.orderType}",
  561 + " </if>",
547 562 " <if test='query.taskId != null'>",
548 563 " AND t.ID_ = #{query.taskId}",
549 564 " </if>",
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
  View file @99b917a
... ... @@ -433,6 +433,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
433 433 taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
434 434 //TODO 先写死
435 435 //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
  436 + //需求是APP端 只查普通工单
  437 + taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C);
436 438 //selectWorkOrderUniqueMyPage 个性化 去重 按工单唯一处理
437 439 PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderUniqueMyPage(pageVO,taskBuzReqVO);
438 440 return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper, adminUserApi);
... ... @@ -467,6 +469,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
467 469 taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
468 470 //TODO 先写死
469 471 //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
  472 + //需求是APP端 只查普通工单
  473 + taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C);
470 474 //已办改为获取最新一条数据
471 475 PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderDoneUniquePage(pageVO,taskBuzReqVO);
472 476 return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper, adminUserApi);
... ... @@ -502,6 +506,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
502 506 taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
503 507 //TODO 先写死
504 508 //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
  509 + //需求是APP端 只查普通工单
  510 + taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C);
505 511 PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderTodoPage(pageVO,taskBuzReqVO);
506 512 return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper,adminUserApi);
507 513 }
... ...