From 3e3dd4acb8724d0d8d71cfc1eb715bf4de389339 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 10:04:10 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
index 1ddf1ad..d85a2fe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
@@ -73,7 +73,7 @@
ywPatrolScheme.setCode(this.getNextCode());
ywPatrolSchemeMapper.insert(ywPatrolScheme);
- this.createThreeDaysData(ywPatrolScheme,loginUserInfo);
+ this.createThreeDaysData(ywPatrolScheme);
return ywPatrolScheme.getId();
}
@@ -89,11 +89,11 @@
- public void createThreeDaysData(YwPatrolScheme ywPatrolScheme,LoginUserInfo loginUserInfo){
+ public void createThreeDaysData(YwPatrolScheme ywPatrolScheme){
//寰幆鐢熸垚涓夊ぉ鍐呯殑鏁版嵁
for (int i = 0; i < 3; i++) {
Date schemeDate = DateUtil.getXDayAfterDate(new Date(),i);
- this.createTask(schemeDate,ywPatrolScheme,loginUserInfo);
+ this.createTask(schemeDate,ywPatrolScheme);
}
}
@@ -102,7 +102,7 @@
* @param schemeDate
* @param ywPatrolScheme
*/
- public void createTask(Date schemeDate,YwPatrolScheme ywPatrolScheme,LoginUserInfo loginUserInfo){
+ public void createTask(Date schemeDate,YwPatrolScheme ywPatrolScheme){
if(ywPatrolScheme.getStartDate().getTime() > schemeDate.getTime()
|| ywPatrolScheme.getEndDate().getTime() < schemeDate.getTime() ){
return;
@@ -150,7 +150,7 @@
String nextCode = StringUtils.leftPad(codeSn.toString(),3,"0");
YwPatrolTask ywPatrolTask = new YwPatrolTask();
ywPatrolTask.setCreateDate(new Date());
- ywPatrolTask.setCreator(loginUserInfo.getId());
+ ywPatrolTask.setCreator(ywPatrolScheme.getCreator());
ywPatrolTask.setIsdeleted(Constants.ZERO);
ywPatrolTask.setStatus(Constants.patrolTaskStatus.waitStart);
ywPatrolTask.setSchemeId(ywPatrolScheme.getId());
@@ -167,7 +167,7 @@
//鐢熸垚浠诲姟鏁版嵁
YwPatrolTaskRecord ywPatrolTaskRecord = new YwPatrolTaskRecord();
ywPatrolTaskRecord.setCreateDate(new Date());
- ywPatrolTaskRecord.setCreator(loginUserInfo.getId());
+ ywPatrolTaskRecord.setCreator(ywPatrolScheme.getCreator());
ywPatrolTaskRecord.setIsdeleted(Constants.ZERO);
ywPatrolTaskRecord.setStatus(Constants.ZERO);
ywPatrolTaskRecord.setSchemeId(ywPatrolScheme.getId());
@@ -237,7 +237,7 @@
ywPatrolScheme.setEditor(loginUserInfo.getId());
ywPatrolSchemeMapper.updateById(ywPatrolScheme);
if(Constants.equalsInteger(ywPatrolScheme.getStatus(),Constants.ZERO)){
- this.createThreeDaysData(ywPatrolScheme,loginUserInfo);
+ this.createThreeDaysData(ywPatrolScheme);
}
}
@@ -281,8 +281,12 @@
.leftJoin(" system_user t2 on t.creator = t2.id ")
.eq(YwPatrolScheme::getIsdeleted,Constants.ZERO)
.like(StringUtils.isNotBlank(model.getTitle()),YwPatrolScheme::getTitle,model.getTitle())
- .ge(Objects.nonNull(model.getStartDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
- .le(Objects.nonNull(model.getEndDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))
+ //鏌ヨ鏈夋椂娈典氦闆嗙殑鏁版嵁
+ .apply(Objects.nonNull(model.getStartDate())&&Objects.nonNull(model.getEndDate()),
+ " t.START_DATE <= '"+Utils.Date.getStart(pageWrap.getModel().getEndDate())+"' and t.END_DATE >= '"+Utils.Date.getStart(pageWrap.getModel().getStartDate())+"' "
+ )
+// .ge(Objects.nonNull(model.getStartDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
+// .le(Objects.nonNull(model.getEndDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))
.orderByDesc(YwPatrolScheme::getCreateDate)
;
IPage<YwPatrolScheme> iPage = ywPatrolSchemeMapper.selectJoinPage(page,YwPatrolScheme.class,queryWrapper);
--
Gitblit v1.9.3