From 496eaf6c859b868cac4aaaa8948b446d759b9d94 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 14 五月 2025 16:07:20 +0800
Subject: [PATCH] 更新生成点检记录定时器
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java | 90 +++++++++++++++--------------
eims-ui-mobile/src/pages/maint/maint-order.vue | 6 +-
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsInspectPlanBo.java | 1
eims-ui-mobile/src/pages/scan/index.vue | 4 +
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java | 3
eims-ui-mobile/src/pages/home/index.vue | 7 ++
eims-ui-mobile/src/pages/inspect/insp-record.vue | 6 +-
eims-ui-mobile/src/pages/repair/req-list.vue | 6 +
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java | 3
9 files changed, 70 insertions(+), 56 deletions(-)
diff --git a/eims-ui-mobile/src/pages/home/index.vue b/eims-ui-mobile/src/pages/home/index.vue
index 8033aef..54b0029 100644
--- a/eims-ui-mobile/src/pages/home/index.vue
+++ b/eims-ui-mobile/src/pages/home/index.vue
@@ -161,6 +161,7 @@
import { receiveOrderRepair } from '@/service/mobile'
import { useToast, useMessage } from 'wot-design-uni'
import { ref } from 'vue'
+import {isLeader} from "@/utils/RoleUtils";
const message = useMessage()
const toast = useToast()
@@ -212,7 +213,11 @@
} else {
switch (item.name) {
case '鎺ュ崟缁翠慨':
- handleSelectReq()
+ if (isLeader()) {
+ toast.info('璇风櫥褰曠淮淇伐璐﹀彿鎺ュ崟')
+ } else {
+ handleSelectReq()
+ }
break
}
}
diff --git a/eims-ui-mobile/src/pages/inspect/insp-record.vue b/eims-ui-mobile/src/pages/inspect/insp-record.vue
index 99efef5..fb20b64 100644
--- a/eims-ui-mobile/src/pages/inspect/insp-record.vue
+++ b/eims-ui-mobile/src/pages/inspect/insp-record.vue
@@ -83,11 +83,11 @@
</wd-button>
</wd-cell>
<wd-collapse v-model="collSelects" title="鐐规椤�" ref="collapseRef">
- <wd-collapse-item :name="item.id" v-for="(item, index) in dataList">
+ <wd-collapse-item :name="item.id" v-for="(item, index) in dataList" disabled>
<template #title="{ expanded, disabled, isFirst }">
<view class="flex justify-between">
- <view class="flex justify-center items-center">
- <text class="text-sm">{{ item.inspName }}</text>
+ <view class="flex justify-center items-center" style="max-width: 60%;">
+ <text class="text-sm" >{{ item.inspName }}</text>
</view>
<view class="flex items-center">
diff --git a/eims-ui-mobile/src/pages/maint/maint-order.vue b/eims-ui-mobile/src/pages/maint/maint-order.vue
index bd77876..e87f216 100644
--- a/eims-ui-mobile/src/pages/maint/maint-order.vue
+++ b/eims-ui-mobile/src/pages/maint/maint-order.vue
@@ -101,10 +101,9 @@
<view class="flex justify-between">
<view class="flex items-center menu-title-box">
<view class="menu-indicator"></view>
- <view class="ml-1 text-sm align-center w-[50%]">
+ <view class="ml-1 text-sm align-center">
<wd-text :text="item.maintName" :lines="1"></wd-text>
</view>
- <view class="text-color-gray ml-2 text-mini">{{ item.maintCode }}</view>
</view>
<view class="flex items-center w-[20%] justify-end">
@@ -114,9 +113,10 @@
</view>
</view>
</template>
- <view class="flex h-[140rpx]" items-center>
+ <view class="flex h-[200rpx]" items-center>
<image class="slot-img text-center" src="/static/ico/ico-platform.png" />
<view class="flex-1 text-color-gray text-xs flex-row">
+ <view class="mr-3 mt-2">淇濆吇鍗曞彿: {{ item.maintCode }}</view>
<view class="mr-3 mt-2">璁″垝淇濆吇鏃ユ湡: {{ item.planTime }}</view>
<view class="mr-3 mt-2">淇濆吇寮�濮嬫椂闂�: {{ item.startTime }}</view>
<view class="mr-3 mt-2">淇濆吇缁撴潫鏃堕棿: {{ item.endTime }}</view>
diff --git a/eims-ui-mobile/src/pages/repair/req-list.vue b/eims-ui-mobile/src/pages/repair/req-list.vue
index 75916b9..54209d6 100644
--- a/eims-ui-mobile/src/pages/repair/req-list.vue
+++ b/eims-ui-mobile/src/pages/repair/req-list.vue
@@ -264,7 +264,7 @@
// 鍙樉绀烘湭鎺ュ崟鏁版嵁
status.value = 0
console.log('OnSelectReq', data)
- reloadData()
+ // reloadData()
})
})
@@ -274,7 +274,9 @@
const sList: any = await getDictInfo(DICT_REPAIR_REQ_STATUS)
statusList.value.push(...sList)
- reloadData()
+ setTimeout(() => {
+ reloadData()
+ }, 800)
}
onLoad(() => {
diff --git a/eims-ui-mobile/src/pages/scan/index.vue b/eims-ui-mobile/src/pages/scan/index.vue
index 82d4d73..0d2ee20 100644
--- a/eims-ui-mobile/src/pages/scan/index.vue
+++ b/eims-ui-mobile/src/pages/scan/index.vue
@@ -101,7 +101,9 @@
function initData(assetNo: any) {
getEquByAssetNo(assetNo)
.then((res: any) => {
- if (res.data) {
+ console.error(res)
+ if (res?.equId) {
+ exist.value = true
Object.assign(model, res)
} else {
toast.error('鏈煡璇㈠埌璇ヨ祫浜х紪鍙风浉鍏虫暟鎹紒')
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsInspectPlanBo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsInspectPlanBo.java
index 68be155..6e2d184 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsInspectPlanBo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsInspectPlanBo.java
@@ -65,7 +65,6 @@
/**
* 鐐规鍛ㄦ湡鍗曚綅锛堝瓧鍏革級
*/
- @NotBlank(message = "鐐规鍛ㄦ湡鍗曚綅锛堝瓧鍏革級涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String inspCycleUnit;
/**
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java
index aa2096a..e5d8f1e 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java
@@ -49,51 +49,55 @@
LambdaQueryWrapper<EimsInspectPlan> planBoQueryWrapper = Wrappers.lambdaQuery();
// 鏌ヨ鍚敤鐨勭偣妫�璁″垝
planBoQueryWrapper.eq(EimsInspectPlan::getStatus, DictConstants.SYS_NORMAL_DISABLE_DETAIL.NORMAL);
- // 杩囨护娌℃湁涓嬫杩愯鏃堕棿
- planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspNextTime);
- // 杩囨护娌℃湁鐐规鍛ㄦ湡鐨勬暟鎹�
- planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspCycle);
- planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspCycleUnit);
+// // 杩囨护娌℃湁涓嬫杩愯鏃堕棿
+// planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspNextTime);
+// // 杩囨护娌℃湁鐐规鍛ㄦ湡鐨勬暟鎹�
+// planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspCycle);
+// planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspCycleUnit);
List<EimsInspectPlanVo> planVoList = planMapper.selectVoList(planBoQueryWrapper);
for (int i = 0; i < planVoList.size(); i++) {
EimsInspectPlanVo planVo = planVoList.get(i);
- // 鐐规璁″垝add鐨勬椂鍊欎細鑷姩鐢熸垚涓嬫杩愯鏃堕棿
- Date oldNext = planVo.getInspNextTime();
- int day = DateUtils.differentDays(today, oldNext);
- // 濡傛灉璁″垝鐢熸垚鐐规鏃ユ湡澶т簬浠婂ぉ鍒欎笉鐢熸垚鐐规璁板綍
- if (day >= 1) {
- continue;
- }
+// // 鐐规璁″垝add鐨勬椂鍊欎細鑷姩鐢熸垚涓嬫杩愯鏃堕棿
+// Date oldNext = planVo.getInspNextTime();
+// int day = DateUtils.differentDays(today, oldNext);
+// // 濡傛灉璁″垝鐢熸垚鐐规鏃ユ湡澶т簬浠婂ぉ鍒欎笉鐢熸垚鐐规璁板綍
+// if (day >= 1) {
+// continue;
+// }
+//
+// // 璁＄畻鐢熸垚鐐规璁板綍鏃堕棿
+// Long inspCycle = planVo.getInspCycle();
+// Date newNext = null;
+// String inspCycleUnit = planVo.getInspCycleUnit();
+// switch (inspCycleUnit) {
+// case DictConstants.MAINT_CYCLE_UNIT_DETAIL.DAY:
+// newNext = DateUtils.addDays(oldNext, inspCycle.intValue());
+// break;
+// case DictConstants.MAINT_CYCLE_UNIT_DETAIL.WEEK:
+//
+// newNext = DateUtils.addWeeks(oldNext, inspCycle.intValue());
+//
+// break;
+// case DictConstants.MAINT_CYCLE_UNIT_DETAIL.MONTH:
+//
+// newNext = DateUtils.addMonths(oldNext, inspCycle.intValue());
+//
+// break;
+// case DictConstants.MAINT_CYCLE_UNIT_DETAIL.SEASON:
+// newNext = DateUtils.addMonths(oldNext, inspCycle.intValue() * 3);
+//
+// break;
+// case DictConstants.MAINT_CYCLE_UNIT_DETAIL.YEAR:
+//
+// newNext = DateUtils.addYears(oldNext, inspCycle.intValue());
+//
+// break;
+// }
- // 璁＄畻鐢熸垚鐐规璁板綍鏃堕棿
- Long inspCycle = planVo.getInspCycle();
- Date newNext = null;
- String inspCycleUnit = planVo.getInspCycleUnit();
- switch (inspCycleUnit) {
- case DictConstants.MAINT_CYCLE_UNIT_DETAIL.DAY:
- newNext = DateUtils.addDays(oldNext, inspCycle.intValue());
- break;
- case DictConstants.MAINT_CYCLE_UNIT_DETAIL.WEEK:
+ Date nowDate = DateUtils.getNowDate();
- newNext = DateUtils.addWeeks(oldNext, inspCycle.intValue());
-
- break;
- case DictConstants.MAINT_CYCLE_UNIT_DETAIL.MONTH:
-
- newNext = DateUtils.addMonths(oldNext, inspCycle.intValue());
-
- break;
- case DictConstants.MAINT_CYCLE_UNIT_DETAIL.SEASON:
- newNext = DateUtils.addMonths(oldNext, inspCycle.intValue() * 3);
-
- break;
- case DictConstants.MAINT_CYCLE_UNIT_DETAIL.YEAR:
-
- newNext = DateUtils.addYears(oldNext, inspCycle.intValue());
-
- break;
- }
+ Date nextDate = DateUtils.addDays(nowDate, 1);
EimsInspectRecord record = new EimsInspectRecord();
record.setEquId(planVo.getEquId());
@@ -102,16 +106,16 @@
record.setInspUser(planVo.getInspUser());
record.setInspDept(planVo.getInspDept());
record.setStatus(DictConstants.EIMS_INSPECT_STATUS_DETAIL.N);
- record.setPlanTime(oldNext);
+ record.setPlanTime(nowDate);
record.setPlanId(planVo.getId());
//鐐规椤瑰悕绉�
record.setInspName(planVo.getInspName());
record.setInspCode(codeService.generateCode("DJZD"));
EimsInspectPlan plan = MapstructUtils.convert(planVo, EimsInspectPlan.class);
assert plan != null;
- plan.setInspLastTime(oldNext);
- plan.setInspNextTime(newNext);
- if(plan.getInspFirstTime()==null)plan.setInspFirstTime(oldNext);
+ plan.setInspLastTime(nowDate);
+ plan.setInspNextTime(nextDate);
+ if(plan.getInspFirstTime()==null)plan.setInspFirstTime(nowDate);
boolean flag = recordMapper.insert(record) > 0;
//TODO 鐢熸垚澶辫触锛屾坊鍔犲紓甯歌褰�
if (!flag) continue;
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java
index 6d7f742..c7cf26e 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java
@@ -54,7 +54,8 @@
public EimsEquVo queryByAssetNo(String assetNo) {
LambdaQueryWrapper<EimsEqu> lqw = new LambdaQueryWrapper<>();
lqw.eq(EimsEqu::getAssetNo, assetNo);
- return baseMapper.selectVoOne(lqw);
+ EimsEquVo eimsEquVo = baseMapper.selectVoOne(lqw);
+ return eimsEquVo;
}
/**
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
index 9ed4e3b..4e95350 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
@@ -75,7 +75,8 @@
@Override
public TableDataInfo<EimsRepairReqVo> queryPageListCustom(EimsRepairReqBo bo, PageQuery pageQuery) {
- DataFilterUtil.getInstance().filterRepairReq(bo);
+ //TODO
+ //DataFilterUtil.getInstance().filterRepairReq(bo);
Page<EimsRepairReqVo> page = baseMapper.selectRepairReqList(pageQuery.build(), buildWrapper(bo));
return TableDataInfo.build(page);
}
--
Gitblit v1.9.3