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