pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java
@@ -52,6 +52,10 @@ return buildResult(ResultCodeMsg.RsCode.ERROR_CODE,ResultCodeMsg.RsMsg.ERROR_MESSAGE, obj); } public static BaseResponse buildNonExist(){ return buildResult(ResultCodeMsg.RsCode.NON_EXISTENT_CODE, ResultCodeMsg.RsMsg.NON_EXISTENT_MESSAGE, null); } public static BaseResponse buildResult(String code, String msg, Object data){ return BaseResponse.builder() .code((code == null || "".equals(code)) ? ResultCodeMsg.RsCode.SUCCESS_CODE : code) pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/ResultCodeMsg.java
@@ -9,6 +9,7 @@ public static final String FAIL_CODE = "1002"; public static final String ERROR_CODE = "1003"; public static final String EXCEPTION_CODE = "1004"; public static final String NON_EXISTENT_CODE = "1001"; } public final class RsMsg{ public static final String TOLOGIN_MESSAGE = "请登录"; @@ -18,5 +19,6 @@ public static final String ERROR_MESSAGE = "请求出错"; public static final String EXCEPTION_MESSAGE = "请求异常"; public static final String ERROR_PARAM = "请求参数有误"; public static final String NON_EXISTENT_MESSAGE = "数据不存在"; } } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java
@@ -71,6 +71,17 @@ private Date replyTime; /** * 回复内容 */ private String replyContent; /** * 回复人ID */ @JSONField(serializeUsing= ObjectWriterImplToString.class) private Long replyPersonId; /** * 状态值 */ private Integer stateId; pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java
@@ -70,6 +70,17 @@ private Date replyTime; /** * 回复内容 */ private String replyContent; /** * 回复人ID */ @JSONField(serializeUsing= ObjectWriterImplToString.class) private Long replyPersonId; /** * 状态值 */ private Integer stateId; pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
@@ -214,6 +214,8 @@ rpt.audios, rpt.videos, rpy.reply_time AS replyTime, rpy.reply_content AS replyContent, rpy.replier_id AS replyPersonId, rpt.state AS stateId, CASE WHEN rpt.state = 1 THEN '未受理' pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
@@ -227,7 +227,7 @@ res.report_time AS reportTime, res.state, CASE WHEN res.state = 1 THEN '已上报' WHEN res.state = 1 THEN '待审核' WHEN res.state = 2 THEN '已通过' WHEN res.state = 3 THEN '已驳回' END AS stateName pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -225,13 +225,13 @@ ord.dispatch_time AS dispatchTime, ord.reject_times AS rejectTimes, res.id AS proResultId, res.state AS proResultStateId, IFNULL(res.state,0) AS proResultStateId, CASE WHEN ord.state = 1 THEN '未完成' WHEN ord.state = 2 THEN '已完成' END AS state, CASE WHEN res.state = 0 THEN '未上报' WHEN IFNULL(res.state,0) = 0 THEN '未上报' WHEN res.state = 1 THEN '待审核' WHEN res.state = 2 THEN '已通过' WHEN res.state = 3 THEN '被驳回' @@ -241,7 +241,7 @@ INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id INNER JOIN ba_user us2 ON us2.id = ord.inspector_id INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id WHERE ord.deleted = 0 AND ord.id = #{workOrderId} </select> @@ -268,7 +268,7 @@ INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id INNER JOIN ba_user us2 ON us2.id = ord.inspector_id INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id <where> AND ord.deleted = 0 @@ -314,13 +314,13 @@ ord.complete_time AS completeTime, ord.dispatch_time AS dispatchTime, ord.reject_times AS rejectTimes, res.state AS proResultStateId, IFNULL(res.state,0) AS proResultStateId, CASE WHEN ord.state = 1 THEN '未完成' WHEN ord.state = 2 THEN '已完成' END AS state, CASE WHEN res.state = 0 THEN '未上报' WHEN IFNULL(res.state,0) = 0 THEN '未上报' WHEN res.state = 1 THEN '待审核' WHEN res.state = 2 THEN '已通过' WHEN res.state = 3 THEN '被驳回' @@ -331,7 +331,7 @@ INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id INNER JOIN ba_user us2 ON us2.id = ord.inspector_id INNER JOIN ope_task_type typ ON typ.id = ord.task_type_id LEFT JOIN ope_processing_result res ON res.work_order_id = ord.id LEFT JOIN (SELECT * FROM `ope_processing_result` WHERE deleted = 0) res ON res.work_order_id = ord.id <where> AND ord.deleted = 0
@@ -170,7 +170,11 @@ @SsoAop() public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) { try { return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrderById(workOrderId)); VoWorkOrder workOrder = workOrderSv.getWorkOrderById(workOrderId); if(workOrder == null) { return BaseResponseUtils.buildNonExist(); } return BaseResponseUtils.buildSuccess(workOrder); } catch (Exception e) { log.error("获取工单详情异常", e); return BaseResponseUtils.buildException(e.getMessage());
