Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-api/src/main/java/com/qmth/sop/server/api/TBQualityProblemApplyController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.params.FlowApproveParam;
 import com.qmth.sop.business.bean.result.TBQualityProblemApplyResult;
+import com.qmth.sop.business.bean.result.TBQualityProblemViewResult;
 import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBQualityProblemApply;
 import com.qmth.sop.business.service.TBQualityProblemApplyService;
@@ -93,9 +94,7 @@ public class TBQualityProblemApplyController {
 //        return ResultUtil.ok(tBQualityProblemApplyService.getById(id));
 //    }
 
-
     //获取责任人接口
-
     @ApiOperation(value = "质量问题反馈表获取责任人接口")
     @RequestMapping(value = "/user/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "质量问题反馈表获取责任人接口", response = SysUser.class)})
@@ -103,4 +102,10 @@ public class TBQualityProblemApplyController {
         return ResultUtil.ok(tBQualityProblemApplyService.userList());
     }
 
+    @ApiOperation(value = "质量问题反馈详情接口")
+    @RequestMapping(value = "/view", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = TBQualityProblemViewResult.class)})
+    public Result view(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+        return ResultUtil.ok();
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBQualityProblemViewResult.java

@@ -0,0 +1,65 @@
+package com.qmth.sop.business.bean.result;
+
+import com.qmth.sop.business.entity.TBProjectExchange;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 质量问题反馈view result
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2023/2/17
+ */
+public class TBQualityProblemViewResult implements Serializable {
+
+    @ApiModelProperty(value = "crm信息")
+    CrmProjectResult crmInfo;
+
+    @ApiModelProperty(value = "项目变更计划信息")
+    TBProjectExchange tbProjectExchange;
+
+    @ApiModelProperty(value = "流程审批信息")
+    List<TFFlowViewLogResult> flowApproveHistoryList;
+
+    public TBQualityProblemViewResult() {
+
+    }
+
+    public TBQualityProblemViewResult(CrmProjectResult crmInfo, TBProjectExchange tbProjectExchange) {
+        this.crmInfo = crmInfo;
+        this.tbProjectExchange = tbProjectExchange;
+    }
+
+    public TBQualityProblemViewResult(CrmProjectResult crmInfo, TBProjectExchange tbProjectExchange, List<TFFlowViewLogResult> flowApproveHistoryList) {
+        this.crmInfo = crmInfo;
+        this.tbProjectExchange = tbProjectExchange;
+        this.flowApproveHistoryList = flowApproveHistoryList;
+    }
+
+    public List<TFFlowViewLogResult> getFlowApproveHistoryList() {
+        return flowApproveHistoryList;
+    }
+
+    public void setFlowApproveHistoryList(List<TFFlowViewLogResult> flowApproveHistoryList) {
+        this.flowApproveHistoryList = flowApproveHistoryList;
+    }
+
+    public CrmProjectResult getCrmInfo() {
+        return crmInfo;
+    }
+
+    public void setCrmInfo(CrmProjectResult crmInfo) {
+        this.crmInfo = crmInfo;
+    }
+
+    public TBProjectExchange getTbProjectExchange() {
+        return tbProjectExchange;
+    }
+
+    public void setTbProjectExchange(TBProjectExchange tbProjectExchange) {
+        this.tbProjectExchange = tbProjectExchange;
+    }
+}