jiangping
2025-04-10 1bcb56cdad058478be0d9687d8a8a445de17b6a3
代码初始化
已修改5个文件
48 ■■■■ 文件已修改
admin/src/api/business/workorder.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaWorkorderDetailSheWindow.vue 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/api/business/WorkorderController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/core/constants/Constants.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/business/workorder.js
@@ -26,6 +26,9 @@
}
// 删除
export function getById (id) {
  return request.get(`/business/workorder/${id}`)
}
export function deleteById (id) {
  return request.get(`/business/workorder/delete/${id}`)
}
admin/src/components/business/OperaWorkorderDetailSheWindow.vue
@@ -155,6 +155,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import {getById } from '@/api/business/workorder'
export default {
  name: 'OperaWorkorderWindow',
  extends: BaseOpera,
@@ -186,34 +187,27 @@
      this.title = title
      this.visible = true
      this.info = target
      this.getDetail()
      this.type = this.info.type
    },
    close () {
      this.visible = false
    },
    getDetail () {
      const { id, type } = this
      switch (type) {
      case 0:
        getVisitedDetail({ id }).then(res => {
          this.info = res
          if (this.info.approveDateVO && this.info.approveDateVO.approveList.length > 0) {
            this.info.approveDateVO.approveList.forEach(item => {
              if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
                item.title = item.approveList[0].title
                item.faceImg = item.approveList[0].faceImg
                item.memberName = item.approveList[0].memberName
                item.statusInfo = item.approveList[0].statusInfo
                item.approveList = []
              }
            })
          }
        })
        break
      default:
        break
      }
      getById(this.info.id).then(res => {
        this.info = res
        if (this.info.logList && this.info.logList.length > 0) {
          this.info.logList.forEach(item => {
            if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
              item.title = item.approveList[0].title
              item.faceImg = item.approveList[0].faceImg
              item.memberName = item.approveList[0].memberName
              item.statusInfo = item.approveList[0].statusInfo
              item.approveList = []
            }
          })
        }
      })
    },
    reject () { },
    handleAvatarSuccess () { },
server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -80,6 +80,6 @@
    @GetMapping("/{id}")
    @RequiresPermissions("business:workorder:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(workorderService.findById(id));
        return ApiResponse.success(workorderService.getDetail(id));
    }
}
server/src/main/java/com/doumee/core/constants/Constants.java
@@ -199,7 +199,7 @@
//        int dcaWorkOrder= 7;
        //0工单上报 1工单处理 2工单转交
        int upload = 0;
        int  upload = 0;
        int deal = 1;
        int passOn = 2;
    }
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -93,7 +93,6 @@
        return workorder.getId();
    }
    public void dealLogData(Workorder workorder){
        //处理上报日志 DCA工单 日志存储至子业务 不存在于父级
        if(!Constants.equalsInteger(workorder.getType(),Constants.ONE)){
@@ -284,7 +283,7 @@
                        .selectAll(Workorder.class)
                        .selectAs(Member::getPhone,Workorder::getMemberPhone)
                        .selectAs(Member::getName,Workorder::getMemberName)
                        .selectAs(Workorder::getCompanyName,Workorder::getCompanyName)
                        .selectAs(Member::getCompanyName,Workorder::getCompanyName)
                        .select(" c3.name ",Workorder::getTypeName)
                        .select(" c4.name ",Workorder::getProblemName)
                        .leftJoin(Member.class,Member::getId,Workorder::getMemberId)