From 5e5a317f936e4e333809298930fb771fc0bdc9ac Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 12 九月 2025 16:32:34 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 5 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 8 ++
admin/src/api/platform/platformGroup.js | 4 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 1
admin/src/views/index.vue | 6 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 64 +++++++++++++++
admin/src/api/business/deviceRole.js | 1
admin/src/views/platform/platformGroup.vue | 28 ++++++
admin/src/components/business/OperaPlatformGroupWindow.vue | 60 +++++++++++++--
13 files changed, 166 insertions(+), 18 deletions(-)
diff --git a/admin/src/api/business/deviceRole.js b/admin/src/api/business/deviceRole.js
index ae3212b..d166eb5 100644
--- a/admin/src/api/business/deviceRole.js
+++ b/admin/src/api/business/deviceRole.js
@@ -21,7 +21,6 @@
export function updateStatusById (data) {
return request.post('/visitsAdmin/cloudService/business/deviceRole/updateStatusById', data)
}
-
// 銆愭捣搴枫�戝叏閲忓悓姝ヨ瀹㈡潈闄愮粍鎺ュ彛
export function syncPrivilege (data) {
return request.post('/visitsAdmin/cloudService/business/hksync/syncPrivilege', data)
diff --git a/admin/src/api/platform/platformGroup.js b/admin/src/api/platform/platformGroup.js
index 87cdd5a..4531b43 100644
--- a/admin/src/api/platform/platformGroup.js
+++ b/admin/src/api/platform/platformGroup.js
@@ -24,6 +24,10 @@
export function create (data) {
return request.post('/visitsAdmin/cloudService/business/platformGroup/create', data)
}
+// 鍒涘缓
+export function updateAutoCallById (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformGroup/updateAutoCallById', data)
+}
// 淇敼
export function updateById (data) {
diff --git a/admin/src/components/business/OperaPlatformGroupWindow.vue b/admin/src/components/business/OperaPlatformGroupWindow.vue
index 0ec1105..96533f5 100644
--- a/admin/src/components/business/OperaPlatformGroupWindow.vue
+++ b/admin/src/components/business/OperaPlatformGroupWindow.vue
@@ -10,6 +10,12 @@
<el-form-item label="鍒嗙粍鍚嶇О锛�" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ垎缁勫悕绉�" v-trim/>
</el-form-item>
+ <el-form-item label="鏄惁铏氭嫙鏈堝彴缁�" prop="isVirtual" >
+ <el-radio-group v-model="form.isVirtual" @change="chagneVirtural">
+ <el-radio :label="0">鍚�</el-radio>
+ <el-radio :label="1">鏄�</el-radio>
+ </el-radio-group>
+ </el-form-item>
<el-form-item label="涓氬姟绫诲瀷锛�" prop="type">
<el-radio-group v-model="form.type" >
<el-radio :label="0" >瀹夋嘲鐗╂祦鍗歌揣</el-radio>
@@ -29,16 +35,17 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="宸ヤ綔鏃堕棿锛�" prop="startTime">
- <div style=" display: inline-block">
+ <div style=" display: inline-block">
+ <el-form-item label="宸ヤ綔鏃堕棿锛�" prop="startTime" style=" display: inline-block">
<el-time-picker
style="width: 150px;display: inline-block"
v-model="form.startTime"
format="HH:mm"
value-format="HH:mm"
placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
- >
- </el-time-picker> 鑷�
+ > </el-time-picker>
+ </el-form-item>鑷�
+ <el-form-item label="" prop="endTime" style=" display: inline-block">
<el-time-picker
style="width: 150px;display: inline-block"
v-model="form.endTime"
@@ -47,9 +54,35 @@
placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
>
</el-time-picker>
- </div>
-
</el-form-item>
+ </div>
+ <el-form-item label="鏄惁鑷姩鍙彿" prop="autoCall">
+ <el-radio-group v-model="form.autoCall">
+ <el-radio :label="0" :value="0">鍚�</el-radio>
+ <el-radio :label="1" :value="1">鏄�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <div>
+ <el-form-item label="鑷姩鍙彿鏃堕棿锛�" prop="autoCallStartTime" style=" display: inline-block">
+ <el-time-picker
+ style="width: 150px;display: inline-block"
+ v-model="form.autoCallStartTime"
+ format="HH:mm"
+ value-format="HH:mm"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
+ >
+ </el-time-picker> </el-form-item>鑷�
+ <el-form-item label="" prop="autoCallEndTime" style=" display: inline-block">
+ <el-time-picker
+ style="width: 150px;display: inline-block"
+ v-model="form.autoCallEndTime"
+ format="HH:mm"
+ value-format="HH:mm"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ >
+ </el-time-picker>
+ </el-form-item>
+ </div>
<el-form-item label="鍙彿绛夊緟鏃堕棿(鍒嗛挓)锛�" prop="waitCallTime">
<el-input type="number" v-model="form.waitCallTime" placeholder="璇疯緭鍏ュ彨鍙风瓑寰呮椂闂�(鍒嗛挓)" v-trim/>
</el-form-item>
@@ -77,8 +110,12 @@
id: null,
name: '',
type: 0,
+ autoCall: 0,
+ isVirtual: 0,
startTime: '',
endTime: '',
+ autoCallStartTime: '',
+ autoCallEndTime: '',
waitCallTime: '',
signInNoticeUsers: [],
unFinishNoticeUsers: []
@@ -86,9 +123,11 @@
// 楠岃瘉瑙勫垯
rules: {
name: [{ required: true, message: '璇疯緭鍏ュ垎缁勫悕绉� ', trigger: 'blur' }],
- type: [{ required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷 '}],
+ type: [{ required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷' }],
signInNoticeUsers: [{ required: true, message: '璇烽�夋嫨绛惧埌閫氱煡浜哄憳', trigger: 'blur' }],
- unFinishNoticeUsers: [{ required: true, message: '璇烽�夋嫨浣滀笟鏈畬鎴愰�氱煡浜哄憳', trigger: 'blur' }]
+ unFinishNoticeUsers: [{ required: true, message: '璇烽�夋嫨浣滀笟鏈畬鎴愰�氱煡浜哄憳', trigger: 'blur' }],
+ isVirtual: [{ required: true, message: '璇烽�夋嫨鏄惁铏氭嫙鏈堝彴', trigger: 'change' }],
+ autoCall: [{ required: true, message: '璇烽�夋嫨鏄惁鑷姩鍙彿', trigger: 'change' }]
},
memberList: []
}
@@ -100,6 +139,11 @@
})
},
methods: {
+ chagneVirtural(){
+ /*if(this.form.isVirtual ==1){
+ this.form.type=1
+ }*/
+ },
changeSignInNoticeUsers(e) {
if (this.form.signInNoticeUsers.length > 5) {
this.form.signInNoticeUsers.splice(this.form.signInNoticeUsers.length - 1, 1)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index b414d59..65464e5 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -396,6 +396,7 @@
},
getWorkBody () {
getWorkbenchData({ queryType: 2 }).then(res => {
+ console.log(res)
this.staticData = res || {}
this.initEchart2()
this.initEchart21()
@@ -517,6 +518,7 @@
if (!document.getElementById('echart2')) {
return
}
+ echarts.dispose(document.getElementById('echart2'))
const myChart = echarts.init(document.getElementById('echart2'))
const that = this
var ydata = that.staticData.internalList.map(i => i.num)
@@ -621,11 +623,11 @@
})
},
initEchart21 () {
- console.log('initEchart21')
+ console.log('initEchart21',this.staticData.lwList)
if (!document.getElementById('echart21')) {
return
}
-
+ echarts.dispose(document.getElementById('echart21'))
const myChart = echarts.init(document.getElementById('echart21'))
const that = this
var le1 = that.staticData.internalList.length
diff --git a/admin/src/views/platform/platformGroup.vue b/admin/src/views/platform/platformGroup.vue
index 1abb876..286e32e 100644
--- a/admin/src/views/platform/platformGroup.vue
+++ b/admin/src/views/platform/platformGroup.vue
@@ -15,12 +15,12 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="鏈堝彴缁勫悕绉�" fixed min-width="150px" align="center"></el-table-column>
- <el-table-column prop="startTime" label="宸ヤ綔鏃堕棿" min-width="150px" align="center">
+ <el-table-column prop="startTime" label="宸ヤ綔鏃堕棿" min-width="100px" align="center">
<template scope="{row}">
{{row.startTime || ' '}} - {{row.endTime || ' '}}
</template>
</el-table-column>
- <el-table-column prop="type" label="涓氬姟绫诲瀷" align="center" min-width="150px">
+ <el-table-column prop="type" label="涓氬姟绫诲瀷" align="center" min-width="100px">
<template scope="{row}">
<span v-if="row.type == 0">瀹夋嘲鐗╂祦鍗歌揣</span>
<span v-if="row.type == 1">瀹夋嘲鐗╂祦瑁呰揣</span>
@@ -30,6 +30,24 @@
<el-table-column prop="waitCallTime" label="鍙彿绛夊緟鏃堕棿锛堝垎閽燂級" min-width="140px" align="center"></el-table-column>
<el-table-column prop="signInNoticeUserNames" label="绛惧埌閫氱煡浜哄憳" min-width="200px" align="center"></el-table-column>
<el-table-column prop="unFinishNoticeUserNames" label="鏈畬鎴愪綔涓氶�氱煡浜哄憳" min-width="200px" align="center"></el-table-column>
+ <el-table-column prop="waitCallTime" label="鑷姩鍙彿鏃堕棿" min-width="140px" align="center">
+ <template scope="{row}">
+ {{row.autoCallStartTime || ' '}} - {{row.autoCallEndTime || ' '}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="type" label="铏氭嫙鏈堝彴缁�" align="center" min-width="100px">
+ <template scope="{row}">
+ <span v-if="row.isVirtual == 1" class="red">鏄�</span>
+ <span v-else class="green">鍚�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁鑷姩鍙彿" width="100px" fixed="right" align="center">
+ <template slot-scope="{row}">
+ <el-switch @change="changeAutoCall($event, row)" v-model="row.autoCall" active-color="#13ce66"
+ inactive-color="#ff4949" :active-value="1" :inactive-value="0" >
+ </el-switch>
+ </template>
+ </el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�" min-width="150px" align="center"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformgroup:update', 'business:platformgroup:delete'])"
@@ -85,6 +103,12 @@
this.search()
},
methods: {
+ changeAutoCall(e, row) {
+ this.api.updateAutoCallById({
+ id: row.id,
+ autoCall: e
+ })
+ }
}
}
</script>
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 9bfa4ef..654ce81 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -862,6 +862,7 @@
AUTHED_LEAVE(9, "涓嬪彂鎺堟潈绂诲洯","涓嬪彂鎺堟潈绂诲洯" ),
LEAVED(10, "宸茬鍥� ","杞﹁締浠巤data}绂诲満 " ),
OVER_NUMBER(11, "宸茶繃鍙�","瓒呮椂鏈埌鎸囧畾鏈堝彴鑷姩杩囧彿" ),
+ CHANGE_GROUP(12, "鏇存崲鏈堝彴缁�","浠庛�恵data}銆戞洿鎹㈠埌銆恵data1}銆�" ),
;
// 鎴愬憳鍙橀噺
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
index 61a0fe9..667f14a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
@@ -109,7 +109,6 @@
return ApiResponse.success(platformService.platformWorkReportList(platform));
}
-
@ApiOperation("鏍规嵁鏈堝彴缁勮幏鍙栨湀鍙板垪琛ㄤ俊鎭�")
@GetMapping("/listByGroupId")
@CloudRequiredPermission("business:platform:query")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index 5a38288..753fb4b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -158,9 +158,17 @@
@ApiOperation("鎵嬪姩瀹屾垚浣滀笟")
@PostMapping("/dealJobFinish")
+ @CloudRequiredPermission("business:platformjob:update")
public ApiResponse dealJobFinish (@RequestBody List<Integer> list, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
platformJobService.dealJobFinish(list,getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @ApiOperation("鏇存崲鏈堝彴鍒嗙粍")
+ @PostMapping("/changPlatformGroup")
+ @CloudRequiredPermission("business:platformjob:update")
+ public ApiResponse changPlatformGroup (@RequestBody PlatformJob param, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformJobService.changPlatformGroup(param,getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index ade110e..ee4d51f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -72,7 +72,7 @@
@ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢", example = "1")
- @ExcelColumn(name="绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢")
+ @ExcelColumn(name="绫诲瀷 0鏁ｄ欢 1鏁ｄ欢")
private Integer type;
@ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬", example = "1")
@ExcelColumn(name="鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬")
@@ -97,6 +97,9 @@
@ApiModelProperty(value = "鍚屾椂浣滀笟鏁伴噺", example = "1")
@ExcelColumn(name="鍚屾椂浣滀笟鏁伴噺")
private Integer workingNum;
+ @ApiModelProperty(value = "鍚屾椂鍑嗗浣滀笟鏁伴噺", example = "1")
+ @ExcelColumn(name="鍚屾椂鍑嗗浣滀笟鏁伴噺")
+ private Integer callReadyNum;
@ApiModelProperty(value = "浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1")
@ExcelColumn(name="浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index 0acfd9a..4f1a23d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -411,9 +411,9 @@
@TableField(exist = false)
private Date beginDoneDateEnd;
-
@ApiModelProperty(value = "鏈堝彴缁勫悕绉�")
@TableField(exist = false)
+ @ExcelColumn(name="浣滀笟鏈堝彴缁�",index =22,width = 10)
private String platformGroupName ;
@ApiModelProperty(value = "鏈堝彴宸ヤ綔鏃堕暱" ,hidden = true)
@@ -427,7 +427,6 @@
@ApiModelProperty(value = "澶氱姸鎬佹煡璇� 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String queryStatus;
-
@ApiModelProperty(value = "澶氱姸鎬佹煡璇� 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
index 0ac5a7d..a993a41 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
@@ -265,4 +265,6 @@
* @return
*/
PlatformJob restoreWork(JobOperateDTO jobOperateDTO);
+
+ void changPlatformGroup(PlatformJob param, LoginUserInfo loginUser);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 8f26cb7..44c182b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -247,7 +247,7 @@
.selectAs(PlatformBooks::getId,PlatformJob::getBookId)
.select("s.REALNAME",PlatformJob::getEditUserName)
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
- .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,PlatformJob::getPlatformGroupId)
.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
.leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId)
.leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
@@ -2447,6 +2447,68 @@
/**
+ * 鏇存崲鏈堝彴鍒嗛挓
+ * @param param
+ */
+ @Override
+ public void changPlatformGroup(PlatformJob param, LoginUserInfo loginUser){
+ if(param.getId() ==null || param.getPlatformGroupId()==null) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ PlatformJob model = platformJobMapper.selectById(param.getId());
+ if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.platformJobType.sgscxh)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"銆愬競鍏徃澶栧崗杞﹀嵏璐с�戜綔涓氱被鍨嬩笉鏀寔鏈堝彴缁勫垏鎹�");
+ }
+ // WAIT_CONFIRM(0, "寰呯‘璁�","寰呯‘璁�" ),
+ // WART_SIGN_IN(1, "寰呯鍒�","寰呯鍒�" ),
+ // WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"),
+ if(!Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())
+ &&!Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())
+ &&!Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛屼笉鏀寔鏈堝彴缁勫垏鎹紒");
+ }
+ PlatformGroup group = platformGroupMapper.selectById(param.getPlatformGroupId());
+ if(Objects.isNull(group)|| Constants.equalsInteger(group.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴缁勪俊鎭�");
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.platformJobType.zycxh)
+ ||Constants.equalsInteger(model.getType(),Constants.platformJobType.wxcxh)){
+ if( ! Constants.equalsInteger(group.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ヤ綔涓氬彧鑳藉湪銆愬畨娉扮墿娴佸嵏璐с�戠被鍨嬬殑鏈堝彴缁勪笅浣滀笟");
+ }
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.platformJobType.zyczh)
+ ||Constants.equalsInteger(model.getType(),Constants.platformJobType.wxczh)){
+ if( ! Constants.equalsInteger(group.getType(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ヤ綔涓氬彧鑳藉湪銆愬畨娉扮墿娴佽璐с�戠被鍨嬬殑鏈堝彴缁勪笅浣滀笟");
+ }
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.platformJobType.sgscxh)
+ && !Constants.equalsInteger(group.getType(),Constants.TWO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ヤ綔涓氬彧鑳藉湪銆愬競鍏徃鍗歌揣銆戠被鍨嬬殑鏈堝彴缁勪笅浣滀笟");
+ }
+ PlatformJob platformJob = new PlatformJob();
+ BeanUtils.copyProperties(model,platformJob);
+ platformJob.setPlatformGroupId(param.getPlatformGroupId());
+ platformJob.setEditDate(new Date());
+ platformJob.setEditor(loginUser.getId());
+ int flag = platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
+ .set(PlatformJob::getEditDate,platformJob.getEditDate())
+ .set(PlatformJob::getEditor,platformJob.getEditor())
+ .set(PlatformJob::getPlatformGroupId,param.getPlatformGroupId())
+ .set(PlatformJob::getPlatformId,null)//缃┖鍒嗛厤鐨勬湀鍙颁俊鎭�
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),
+ Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),
+ Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ .eq(PlatformJob::getId,param.getId()));
+ //瀛樺偍鎿嶄綔鏃ュ織
+ savePlatformLog(Constants.PlatformJobLogType.CHANGE_GROUP.getKey(),model,platformJob,
+ Constants.PlatformJobLogType.CHANGE_GROUP.getInfo().replace("{data}",param.getPlatformGroupName()).replace("{data1}",group.getName()));
+ }
+ /**
* 鎵嬪姩瀹屾垚浣滀笟
* @param jobIdList
*/
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index 8dc8961..82598ea 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -293,6 +293,7 @@
.eq(pageWrap.getModel().getWidth() != null, Platform::getWidth, pageWrap.getModel().getWidth())
.eq(pageWrap.getModel().getHeight() != null, Platform::getHeight, pageWrap.getModel().getHeight())
.eq(pageWrap.getModel().getAngle() != null, Platform::getAngle, pageWrap.getModel().getAngle())
+ .eq(pageWrap.getModel().getType() != null, Platform::getType, pageWrap.getModel().getType())
.orderByAsc(Platform::getSortnum)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
--
Gitblit v1.9.3