From c44c76ea3e1f6b70bb84bdde85ffd1b389e5b8f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/main.js | 4
h5/utils/http.api.js | 20 +++---
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 5 +
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 67 ++++++++++++++++------
h5/pages/chart_details/chart_details.vue | 6 +
h5/utils/http.interceptor.js | 22 ++++---
h5/pages/details_dca/details_dca.vue | 3 +
server/src/main/resources/application.yml | 2
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 1
server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 2
h5/pages/workOrder/workOrder.vue | 6 +
h5/App.vue | 17 +++--
h5/utils/decryption.js | 8 +-
h5/pages/report/report.vue | 8 +-
14 files changed, 107 insertions(+), 64 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 8840678..85703fe 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -11,13 +11,14 @@
},
methods: {
async init() {
- // if (!this.$store.state.userInfo) {
- // let res = await this.$u.api.login({ code: 'ShiXuHui' })
- // if (res.code === 200) {
- // this.$store.commit('setUserInfo', res.data)
- // }
- // }
- // return
+ // ShiXuHui GuoJiWenWu
+ if (!this.$store.state.userInfo) {
+ let res = await this.$u.api.login({ code: 'GuoJiWenWu' })
+ if (res.code === 200) {
+ this.$store.commit('setUserInfo', res.data)
+ }
+ }
+ return
let code = this.getQueryVariable('code')
if (code) {
if (!uni.getStorageSync('code')) {
@@ -81,7 +82,7 @@
}
}
}
-
+
} else {
let loc_href = encodeURIComponent("https://dmtest.ahapp.net/lianhelihua_web/")
diff --git a/h5/main.js b/h5/main.js
index 0b4bd45..13eca89 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -10,8 +10,8 @@
App.mpType = 'app'
Vue.use(uView);
-Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/lianhelihua_interface'
-// Vue.prototype.$baseUrl = 'http://192.168.0.131:10040'
+// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/lianhelihua_interface'
+Vue.prototype.$baseUrl = 'http://192.168.0.134:10040'
Vue.prototype.$store = store;
Vue.prototype.$ww = ww;
Vue.prototype.$vConsole= new Vconsole()
diff --git a/h5/pages/chart_details/chart_details.vue b/h5/pages/chart_details/chart_details.vue
index 656fc41..5ed67c1 100644
--- a/h5/pages/chart_details/chart_details.vue
+++ b/h5/pages/chart_details/chart_details.vue
@@ -7,11 +7,11 @@
</view>
<view class="search_item" v-if="['2'].includes(this.type)" @click="$refs.pengTree._show()">
<view class="search_item_label">浣嶇疆</view>
- <view class="search_item_value">{{ model.localtionName ? model.localtionName : '鍏ㄩ儴' }}</view>
+ <view class="search_item_value">{{ model.localtionId ? model.localtionName : '鍏ㄩ儴' }}</view>
</view>
<view class="search_item" v-if="['2'].includes(this.type)" @click="openZT">
<view class="search_item_label">涓婚</view>
- <view class="search_item_value">{{ model.typeName ? model.typeName : '鍏ㄩ儴' }}</view>
+ <view class="search_item_value">{{ model.typeId ? model.typeName : '鍏ㄩ儴' }}</view>
</view>
<view class="search_item" @click="openRQ">
<view class="search_item_label">鏃ユ湡</view>
@@ -230,6 +230,7 @@
async getLocation() {
let res = await this.$u.api.categoryTree({ categoryType: 3 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address = res.data
}
},
@@ -237,6 +238,7 @@
async getZhuti() {
let res = await this.$u.api.categoryList({ categoryType: 4, isRoot: 1 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.theme = [res.data]
}
},
diff --git a/h5/pages/details_dca/details_dca.vue b/h5/pages/details_dca/details_dca.vue
index 5436cb9..68184e5 100644
--- a/h5/pages/details_dca/details_dca.vue
+++ b/h5/pages/details_dca/details_dca.vue
@@ -62,6 +62,9 @@
<view class="dca_wt_list_item_btn" v-if="item.closeButton === 1">
<view class="btn" @click="handle(item.id)">澶勭悊</view>
</view>
+ <view class="dca_wt_list_item_btn" v-else>
+ <view class="btn" @click="handle(item.id)">鏌ョ湅</view>
+ </view>
</view>
</view>
</view>
diff --git a/h5/pages/report/report.vue b/h5/pages/report/report.vue
index b481c41..32fbeed 100644
--- a/h5/pages/report/report.vue
+++ b/h5/pages/report/report.vue
@@ -10,11 +10,11 @@
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
<view class="report_search_row" @click="$refs.pengTree._show()" v-if="['3'].includes(typeId)">
- <text>{{locationName ? locationName : '鍙戠敓鍦扮偣'}}</text>
+ <text>{{localtionId ? locationName : '鍙戠敓鍦扮偣'}}</text>
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
<view class="report_search_row" @click="$refs.pengTree1._show()" v-if="['1'].includes(typeId)">
- <text>{{locationName ? locationName : '浣嶇疆'}}</text>
+ <text>{{localtionId ? locationName : '浣嶇疆'}}</text>
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
</view>
@@ -150,7 +150,7 @@
this.$refs.pengTree._hide()
},
// 浣嶇疆
- selectAddress(e) {
+ selectAddress1(e) {
this.localtionId = e[0].id
this.locationName = e[0].name
this.search.page = 1
@@ -163,6 +163,7 @@
async getLocation() {
let res = await this.$u.api.categoryTree({ categoryType: 2 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address = res.data
}
},
@@ -170,6 +171,7 @@
async getLocation1() {
let res = await this.$u.api.categoryTree({ categoryType: 3 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address1 = res.data
}
},
diff --git a/h5/pages/workOrder/workOrder.vue b/h5/pages/workOrder/workOrder.vue
index d89a3cb..eaf750a 100644
--- a/h5/pages/workOrder/workOrder.vue
+++ b/h5/pages/workOrder/workOrder.vue
@@ -10,11 +10,11 @@
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
<view class="report_search_row" @click="$refs.pengTree._show()" v-if="['3'].includes(typeId)">
- <text>{{locationName ? locationName : '鍙戠敓鍦扮偣'}}</text>
+ <text>{{localtionId ? locationName : '鍙戠敓鍦扮偣'}}</text>
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
<view class="report_search_row" @click="$refs.pengTree1._show()" v-if="['1'].includes(typeId)">
- <text>{{locationName ? locationName : '浣嶇疆'}}</text>
+ <text>{{localtionId ? locationName : '浣嶇疆'}}</text>
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
</view>
@@ -163,6 +163,7 @@
async getLocation() {
let res = await this.$u.api.categoryTree({ categoryType: 2 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address = res.data
}
},
@@ -170,6 +171,7 @@
async getLocation1() {
let res = await this.$u.api.categoryTree({ categoryType: 3 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address1 = res.data
}
},
diff --git a/h5/utils/decryption.js b/h5/utils/decryption.js
index ae73403..9324979 100644
--- a/h5/utils/decryption.js
+++ b/h5/utils/decryption.js
@@ -10,15 +10,15 @@
// const privateKey = uni.getStorageSync('aes_private_key')
export function decryptedData (msg, data) {
- console.log(msg)
- console.log(data)
+ // console.log(msg)
+ // console.log(data)
// 鍙樻崲key:灏嗗綋鏈堜綅鏁板瓧绗︿覆鍘婚櫎锛岀劧鍚庡�掑簭
const monthIndex = new Date().getMonth() + 1
const msgStr = msg.slice(0, monthIndex) + msg.slice(monthIndex + 1)
const reverseMsgStr = msgStr.split('').reverse().join('')
const str1 = data.replace(/\s/g, '')
- console.log(reverseMsgStr)
- console.log(str1)
+ // console.log(reverseMsgStr)
+ // console.log(str1)
// 瑙ｅ瘑骞惰繑鍥炵粨鏋�
return (
JSON.parse(
diff --git a/h5/utils/http.api.js b/h5/utils/http.api.js
index 9d4009c..687912e 100644
--- a/h5/utils/http.api.js
+++ b/h5/utils/http.api.js
@@ -7,23 +7,23 @@
return config;
})
- let login = (data = {}) => vm.$u.http.post('web/member/loginH5', data); // 鐧诲綍 encryptData(data)
+ let login = (data = {}) => vm.$u.http.post('web/member/loginH5', encryptData(data)); // 鐧诲綍
let categoryTree = (params = {}) => vm.$u.http.get('web/category/categoryTree', { params }); // 鏌ヨ鏍�
- let workOrderCreate = (data = {}) => vm.$u.http.post('web/workOrder/create', data); // 鍒涘缓宸ュ崟
+ let workOrderCreate = (data = {}) => vm.$u.http.post('web/workOrder/create', encryptData(data)); // 鍒涘缓宸ュ崟
let upload = (data = {}) => vm.$u.http.post('web/public/upload', data); // 涓婁紶
let uploadBatch = (data = {}) => vm.$u.http.post('web/public/uploadBatch', data); // 鎵归噺涓婁紶鏂囦欢鍒癋TP
let detail = (params = {}) => vm.$u.http.get('web/workOrder/detail', { params }); // 椋庨櫓涓婃姤璇︽儏
- let managersList = (data = {}) => vm.$u.http.post('web/workOrder/managersList', data); // 涓婁紶
+ let managersList = (data = {}) => vm.$u.http.post('web/workOrder/managersList', encryptData(data)); // 涓婁紶
let categoryList = (params = {}) => vm.$u.http.get('web/category/categoryList', { params }); // 鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鍒楄〃
- let page = (data = {}) => vm.$u.http.post('web/workOrder/page', data); // 鍒嗛〉鏌ヨ
- let getWorkOrderData = (data = {}) => vm.$u.http.post('web/workOrder/getWorkOrderData', data); // 鍒嗛〉鏌ヨ
- let passOn = (data = {}) => vm.$u.http.post('web/workOrder/passOn', data); // 宸ュ崟鎸囨淳
- let closeWorkOrder = (data = {}) => vm.$u.http.post('web/workOrder/closeWorkOrder', data); // 宸ュ崟鍏抽棴
+ let page = (data = {}) => vm.$u.http.post('web/workOrder/page', encryptData(data)); // 鍒嗛〉鏌ヨ
+ let getWorkOrderData = (data = {}) => vm.$u.http.post('web/workOrder/getWorkOrderData', encryptData(data)); // 鍒嗛〉鏌ヨ
+ let passOn = (data = {}) => vm.$u.http.post('web/workOrder/passOn', encryptData(data)); // 宸ュ崟鎸囨淳
+ let closeWorkOrder = (data = {}) => vm.$u.http.post('web/workOrder/closeWorkOrder', encryptData(data)); // 宸ュ崟鍏抽棴
let urge = (params = {}) => vm.$u.http.get('web/workOrder/urge', { params }); // 宸ュ崟鍌績
- let sendCopy = (data = {}) => vm.$u.http.post('web/workOrder/sendCopy', data); // 宸ュ崟鎶勯��
- let getQwSignature = (data = {}) => vm.$u.http.post('web/member/getQwSignature', data); // 鑾峰彇titket
+ let sendCopy = (data = {}) => vm.$u.http.post('web/workOrder/sendCopy', encryptData(data)); // 宸ュ崟鎶勯��
+ let getQwSignature = (data = {}) => vm.$u.http.post('web/member/getQwSignature', encryptData(data)); // 鑾峰彇titket
let getCategoryVOForGCXTree = (params = {}) => vm.$u.http.get('web/category/getCategoryVOForGCXTree', { params }); // 鏌ヨ鏍�
- let getCopySendUserPage = (data = {}) => vm.$u.http.post('web/member/getCopySendUserPage', data); // 鏌ヨ鍙鎶勯�佷汉鍒嗛〉
+ let getCopySendUserPage = (data = {}) => vm.$u.http.post('web/member/getCopySendUserPage', encryptData(data)); // 鏌ヨ鍙鎶勯�佷汉鍒嗛〉
vm.$u.api = {
login,
diff --git a/h5/utils/http.interceptor.js b/h5/utils/http.interceptor.js
index 52941c5..88bc070 100644
--- a/h5/utils/http.interceptor.js
+++ b/h5/utils/http.interceptor.js
@@ -30,6 +30,7 @@
if (response.data.code === 5112) {
uni.showToast({
title: '鐧诲綍杩囨湡锛屾鍦ㄩ噸鏂拌烦杞巿鏉�',
+ icon: 'none',
duration: 2000,
success() {
setTimeout(() => {
@@ -50,16 +51,17 @@
duration: 2000
});
}
- // if (response.data.message) {
- // const tm = response.data.message
- // const list = tm.split(' ')
- // let msg = list[0]
- // if (list.length > 1 && response.data.data) {
- // msg = decryptedData(list[1], list[0])
- // response.data.data = decryptedData(list[1], response.data.data)
- // response.data.message = msg
- // }
- // }
+ if (response.data.message) {
+ const tm = response.data.message
+ const list = tm.split(' ')
+ let msg = list[0]
+ if (list.length > 1 && response.data.data) {
+ msg = decryptedData(list[1], list[0])
+ response.data.data = decryptedData(list[1], response.data.data)
+ console.log(response.data.data)
+ response.data.message = msg
+ }
+ }
return response.data;
}, (response) => {
return Promise.reject(response)
diff --git a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
index 147c29f..06ad2fc 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -4,6 +4,7 @@
import com.doumee.config.annotation.EncryptionReq;
import com.doumee.config.annotation.EncryptionResp;
import com.doumee.config.annotation.LoginRequired;
+import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
@@ -17,6 +18,7 @@
import com.doumee.service.business.ManagersService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.WorkorderService;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.java.Log;
@@ -212,7 +214,8 @@
try {
Member member = jwtTokenUtil.getUserInfoByToken(token);
pageWrap.getModel().setQwId(member.getQwId());
- return ApiResponse.success(workorderService.findPage(pageWrap));
+ PageData<Workorder> pageData = workorderService.findPage(pageWrap);
+ return ApiResponse.success(pageData);
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
}catch (Exception e){
diff --git a/server/src/main/java/com/doumee/dao/business/model/Workorder.java b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
index 2c08031..6067883 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Workorder.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
@@ -222,7 +222,6 @@
@TableField(exist = false)
private Long num;
-
@ApiModelProperty("鏂囦欢璺緞鍓嶇紑")
@TableField(exist = false)
private String path;
diff --git a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index aa8d4d6..8ba0af2 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -90,7 +90,7 @@
Category com = new Category();
com.setId(category.getId());
- com.setIdPath(idPath+category.getId()+"/");
+ com.setIdPath(idPath+"/"+category.getId()+"/");
categoryMapper.updateById(com);
return category.getId();
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 8b80a22..1b6ba87 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -207,7 +207,7 @@
//澶勭悊涓婃姤鏃ュ織 DCA宸ュ崟 鏃ュ織瀛樺偍鑷冲瓙涓氬姟 涓嶅瓨鍦ㄤ簬鐖剁骇 涓庤穼缁婃粦
String logTitle = Constants.equalsInteger(workorder.getType(), Constants.THREE) ? "璺岀粖婊戦闄�" : "DCA";
workorder.setCreateDate(workorder.getSubmitDate());
- this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),workOrderStatus.getLogTitle().replace("{title}",logTitle),null,null);
+ this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),workOrderStatus.getLogTitle().replace("{title}",logTitle),null,null,null);
}
}
@@ -404,7 +404,7 @@
* @param memberId
* @param paramr2 杞氦缁欑殑澶勭悊浜�
*/
- public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content,String paramr2){
+ public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content,String paramr2,String remark){
WorkorderLog workorderLog = new WorkorderLog();
workorderLog.setCreateDate(afterWorkorder.getEditDate());
workorderLog.setEditDate(afterWorkorder.getEditDate());
@@ -417,6 +417,7 @@
workorderLog.setObjType(objType);
workorderLog.setTitle(title);
workorderLog.setContent(content);
+ workorderLog.setRemark(remark);
workorderLogMapper.insert(workorderLog);
return workorderLog.getId();
}
@@ -613,18 +614,19 @@
}
}
}
-
- //鏌ヨ闄勪欢淇℃伅
- List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
- .eq(Multifile::getIsdeleted,Constants.ZERO)
- .ne(Multifile::getObjType,Constants.multiFileType.upload)
- .eq(Multifile::getObjId,workorderLog.getId())
- .orderByAsc(Multifile::getId));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
- for (Multifile multifile:multifileList) {
- multifile.setFileurlFull(path+multifile.getFileurl());
+ if(!Constants.equalsInteger(workorderLog.getObjType(),Constants.FOUR)){
+ //鏌ヨ闄勪欢淇℃伅
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .ne(Multifile::getObjType,Constants.multiFileType.upload)
+ .eq(Multifile::getObjId,workorderLog.getId())
+ .orderByAsc(Multifile::getId));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path+multifile.getFileurl());
+ }
+ workorderLog.setMultifileList(multifileList);
}
- workorderLog.setMultifileList(multifileList);
}
}
}
@@ -706,7 +708,8 @@
.ne(org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getQwId()),Workorder::getType,Constants.TWO)
.in(Objects.nonNull(pageWrap.getDealStatus())&&
Constants.equalsInteger(pageWrap.getDealStatus(),Constants.ZERO),
- Workorder::getStatus,Constants.WorkOrderStatus.waitConfirm.getKey(),Constants.WorkOrderStatus.waitAllocation.getKey(),Constants.WorkOrderStatus.waitDeal.getKey())
+ Workorder::getStatus,Constants.WorkOrderStatus.waitConfirm.getKey(),
+ Constants.WorkOrderStatus.waitAllocation.getKey(),Constants.WorkOrderStatus.waitDeal.getKey())
.in(Objects.nonNull(pageWrap.getDealStatus())&&
Constants.equalsInteger(pageWrap.getDealStatus(),Constants.ONE),
Workorder::getStatus,Constants.WorkOrderStatus.sheClose.getKey(),Constants.WorkOrderStatus.close.getKey(),Constants.WorkOrderStatus.wtsClose.getKey())
@@ -847,7 +850,13 @@
if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO && !workorder.getManagerId().equals(closeDTO.getMember().getQwId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
}
- workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
+ if(workorder.getManagerId().equals(closeDTO.getMember().getQwId())){
+ workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
+ }else if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())>Constants.ZERO){
+ workorder.setStatus(Constants.WorkOrderStatus.sheClose.getKey());
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
+ }
qwIds.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
qwIds.add(workorder.getManagerId());
qwIds.remove(closeDTO.getMember().getQwId());
@@ -857,7 +866,15 @@
&& !workorder.getDealerId().equals(closeDTO.getMember().getQwId()) ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
}
- workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
+ if(workorder.getManagerId().equals(closeDTO.getMember().getQwId())){
+ workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
+ }else if(workorder.getDealerId().equals(closeDTO.getMember().getQwId())){
+ workorder.setStatus(Constants.WorkOrderStatus.close.getKey());
+ }else if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())>Constants.ZERO){
+ workorder.setStatus(Constants.WorkOrderStatus.sheClose.getKey());
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
+ }
qwIds.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
qwIds.add(workorder.getManagerId());
qwIds.remove(closeDTO.getMember().getQwId());
@@ -867,9 +884,21 @@
workorder.setEditDate(new Date());
workorder.setDealTime(new Date());
workorder.setDealInfo(closeDTO.getInfo());
+ //瀛愬伐鍗� 鍒欐煡璇㈢埗绾у伐鍗曟暟鎹� 鏄惁浠樺瓨鍦ㄦ湭瀹屾垚鐨� 濡傛灉涓嶅瓨鍦ㄦ湭瀹屾垚鐨勫垯杩涜涓诲伐鍗曠姸鎬佸彉鍖�
+ if(Constants.equalsInteger(workorder.getType(),Constants.TWO)&&
+ workorderMapper.selectCount(new QueryWrapper<Workorder>().lambda().eq(Workorder::getDcaRecordId,workorder.getDcaRecordId()).eq(Workorder::getIsdeleted,Constants.ZERO)
+ .ne(Workorder::getId,workorder.getId()).in(Workorder::getStatus,
+ Constants.WorkOrderStatus.waitConfirm.getKey(),Constants.WorkOrderStatus.waitAllocation.getKey(),Constants.WorkOrderStatus.waitDeal.getKey()
+ ))<=Constants.ZERO){
+ Workorder parentWorkorder = new Workorder();
+ parentWorkorder.setId(workorder.getDcaRecordId());
+ parentWorkorder.setEditDate(new Date());
+ parentWorkorder.setStatus(Constants.WorkOrderStatus.close.getKey());
+ workorderMapper.updateById(parentWorkorder);
+ }
workorderMapper.updateById(workorder);
//澶勭悊涓婃姤鏃ュ織
- Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,closeDTO.getMember().getId(),"浠诲姟宸插鐞�",closeDTO.getInfo(),null);
+ Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,closeDTO.getMember().getId(),"浠诲姟宸插鐞�",closeDTO.getInfo(),null,closeDTO.getInfo());
List<Multifile> multifileList = closeDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
@@ -935,7 +964,7 @@
//澶勭悊涓婃姤鏃ュ織
Integer logId = this.saveLog(beforeJson,workorder,
Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)?Constants.ONE:Constants.TWO
- ,passOnDTO.getMember().getId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo(),paramr2);
+ ,passOnDTO.getMember().getId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo(),paramr2,null);
List<Multifile> multifileList = passOnDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
@@ -1152,7 +1181,7 @@
this.saveLog(null,workorder,
Constants.FOUR
- ,member.getId(),"鍌績","宸插偓淇� "+urgeUser.getCompanyName() + "/" + urgeUser.getName(),null);
+ ,member.getId(),"鍌績","宸插偓淇� "+urgeUser.getCompanyName() + "/" + urgeUser.getName(),null,null);
//鍙戦�佷紒寰�氱煡
Category category = categoryMapper.selectById(workorder.getTypeId());
if(Objects.nonNull(category)){
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index f41fa85..d119626 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,7 +9,7 @@
spring:
profiles:
- active: dev
+ active: test
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3