wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字段赋值修改1

This commit is contained in:
wangshuai 2024-07-10 20:23:57 +08:00
parent 160e8940fe
commit 077b357242
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
View File

@ -182,17 +182,15 @@ public class RyTask {
}
// 话术判断 08:00 10:00 11:30 13:30 18:00 20:00
String content = "";
LocalTime time1 = LocalTime.of(8, 00, 00);
LocalTime time1 = LocalTime.of(6, 00, 00);
LocalTime time2 = LocalTime.of(10, 00, 00);
LocalTime time3 = LocalTime.of(11, 30, 00);
LocalTime time4 = LocalTime.of(13, 30, 00);
LocalTime time5 = LocalTime.of(18, 00, 00);
LocalTime time6 = LocalTime.of(20, 00, 00);
LocalTime time3 = LocalTime.of(14, 00, 00);
LocalTime time4 = LocalTime.of(17, 00, 00);
if(time1.isBefore(localTime)&&localTime.isBefore(time2)){
content = busStoreConfigInfo.getContent1();
}else if(time3.isBefore(localTime)&&localTime.isBefore(time4)){
}else if(time2.isBefore(localTime)&&localTime.isBefore(time3)){
content = busStoreConfigInfo.getContent2();
}else if(time5.isBefore(localTime)&&localTime.isBefore(time6)){
}else if(time3.isBefore(localTime)&&localTime.isBefore(time4)){
content = busStoreConfigInfo.getContent3();
}else{
content = busStoreConfigInfo.getContent4();

27
ruoyi-ui/src/views/market/whole/index.vue
View File

@ -244,7 +244,7 @@
:value="dict.value"
/>
</el-select>
<el-tooltip content="08:00:00-10:00:00" effect="dark" placement="right">
<el-tooltip content="06:00:00-10:00:00" effect="dark" placement="right">
<i class="el-tooltip el-icon-question" tabindex="0" ></i>
</el-tooltip>
</el-form-item>
@ -262,11 +262,11 @@
:value="dict.value"
/>
</el-select>
<el-tooltip content="11:30:00-13:30:00" effect="dark" placement="right">
<el-tooltip content="10:00:00-14:00:00" effect="dark" placement="right">
<i class="el-tooltip el-icon-question" tabindex="0" ></i>
</el-tooltip>
</el-form-item>
<el-form-item label="晚高峰时段-方案" prop="content3">
<el-form-item label="下午时段-方案" prop="content3">
<el-select
v-model="form.content3"
placeholder="选择话术"
@ -280,11 +280,11 @@
:value="dict.value"
/>
</el-select>
<el-tooltip content="18:00:00-20:00:00" effect="dark" placement="right">
<el-tooltip content="14:00:00-17:00:00" effect="dark" placement="right">
<i class="el-tooltip el-icon-question" tabindex="0" ></i>
</el-tooltip>
</el-form-item>
<el-form-item label="默认时间段-方案" prop="content4">
<el-form-item label="晚高峰时段-方案" prop="content4">
<el-select
v-model="form.content4"
placeholder="选择话术"
@ -298,7 +298,7 @@
:value="dict.value"
/>
</el-select>
<el-tooltip content="00:00:00-23:59:59" effect="dark" placement="right">
<el-tooltip content="17:00:00-06:00:00" effect="dark" placement="right">
<i class="el-tooltip el-icon-question" tabindex="0" ></i>
</el-tooltip>
</el-form-item>
@ -432,19 +432,6 @@ export default {
},
// 表单校验
rules: {
// storeCode: undefined,
// content1: undefined,
// content2: undefined,
// content3: undefined,
// content4: undefined,
// minOrderNum: 1,
// maxOrderNum: 1,
// timeRange: '',
// isSpliceOrder: 2,
// selfDeliveryDuration: 1,
// saleBindId: undefined,
// quota: 1,
// remark: undefined
minOrderNum: [
{ required: true, message: "下单次数min不能为空", trigger: "blur" }
],
@ -607,7 +594,9 @@ export default {
this.open = true;
if(response.data != null){
this.form = response.data;
if(response.data.startTime != null&&response.data.endTime != null){
this.timeRange = [response.data.startTime,response.data.endTime];
}
this.title = "编辑配置";
}else{
this.form.storeCode = row.storeCode;