质量问题反馈详情

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

@@ -4,7 +4,6 @@ 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;
@@ -101,11 +100,4 @@ public class TBQualityProblemApplyController {
     public Result userList() {
         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

@@ -1,65 +0,0 @@
-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;
-    }
-}

sop-business/src/main/resources/mapper/TBProjectExchangeMapper.xml

@@ -24,7 +24,7 @@
             IF(tffa.status = 'FINISH','APPROVE','UN_APPROVE') as projectExchangeFlowStatus,
             tffa.setup,
             tfcf.version,
-            art.PROC_INST_ID_ as flowId,
+            tfcfe as flowId,
             art.NAME_ as taskName,
             art.TASK_DEF_KEY_ as taskDefKey,
             art.ID_ as taskId,

sop-business/src/main/resources/mapper/TBQualityProblemApplyMapper.xml

@@ -13,7 +13,7 @@
         fa.create_time submissionTime,
         fa.update_time updateDateTime,
         cu.real_name submitter ,
-        cast(art.PROC_INST_ID_ as char) as flowId,
+        fe.flow_id as flowId,
         (select group_concat(art.NAME_) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskName,
         (select group_concat(art.TASK_DEF_KEY_) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskDefKey,
         (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskId,

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -58,6 +58,7 @@
                tbp.name as productName,
                tbc.exam_start_time as examStartTime,
                tbc.exam_end_time as examEndTime,
+               tfcfe.flow_id as flowId,
                cast(tfcfe.create_id as char) as flowCreateId,
                su2.real_name as flowCreateName,
                tffa.create_time as flowCreateTime,
@@ -72,7 +73,6 @@
                IF(tfcf.type = 'OFFICE_SOP_FLOW','教务处SOP','研究生SOP') as typeStr,
                tfcf.version,
                cast(tfcf.flow_deployment_id as char) as flowDeploymentId,
-               cast(art.PROC_INST_ID_ as char) as flowId,
                art.NAME_ as taskName,
                art.TASK_DEF_KEY_ as taskDefKey,
                (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId,