From f3ce3a1f136f359ae872a223aada9e0d23afa9a0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 23 十二月 2024 13:45:08 +0800
Subject: [PATCH] 开发更新
---
admin/src/views/contract/components/contractEdit.vue | 18 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java | 45 ++++++----
admin/src/components/business/OperaAreasWindow.vue | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java | 3
admin/src/views/Inspection/plan.vue | 44 +++++++---
admin/src/views/contract/components/contractDetail.vue | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java | 8 +-
admin/src/views/workorder/workorderList.vue | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java | 11 ++
admin/src/api/company.js | 4 +
admin/src/views/Inspection/components/taskDetail.vue | 15 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java | 12 +-
admin/src/views/business/areas.vue | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java | 20 ++++
20 files changed, 148 insertions(+), 66 deletions(-)
diff --git a/admin/src/api/company.js b/admin/src/api/company.js
index 832abb0..ad54d7a 100644
--- a/admin/src/api/company.js
+++ b/admin/src/api/company.js
@@ -11,3 +11,7 @@
export function companyList (data) {
return request.post('/visitsAdmin/cloudService/business/company/list', data)
}
+// 鍒楄〃
+export function companyListConstract (data) {
+ return request.post('/visitsAdmin/cloudService/business/company/listForConstract', data)
+}
diff --git a/admin/src/components/business/OperaAreasWindow.vue b/admin/src/components/business/OperaAreasWindow.vue
index 2458dad..5cdd9cc 100644
--- a/admin/src/components/business/OperaAreasWindow.vue
+++ b/admin/src/components/business/OperaAreasWindow.vue
@@ -9,9 +9,12 @@
<el-form-item :label="form.type==1?'甯傚悕绉�':'鍘垮尯鍚嶇О'" prop="name">
<el-input v-model="form.name" :placeholder="form.type==1?'杈撳叆甯傚悕绉�':'杈撳叆鍘垮尯鍚嶇О'" v-trim/>
</el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
+ <el-form-item label="琛屾斂鍖轰唬鐮�" prop="code">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
</el-form-item>
+<!-- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
+ <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
+ </el-form-item>-->
</el-form>
</GlobalAlertWindow>
</template>
@@ -30,6 +33,7 @@
id: null,
parentId: null,
name: null,
+ code:null,
sortnum: '0',
type: null
},
diff --git a/admin/src/views/Inspection/components/taskDetail.vue b/admin/src/views/Inspection/components/taskDetail.vue
index 54b30a5..372808b 100644
--- a/admin/src/views/Inspection/components/taskDetail.vue
+++ b/admin/src/views/Inspection/components/taskDetail.vue
@@ -11,12 +11,25 @@
</el-table-column>
<el-table-column prop="realname" label="宸℃浜�" min-width="100" show-overflow-tooltip />
<el-table-column prop="editDate" label="宸℃鏃堕棿" min-width="100" show-overflow-tooltip />
- <el-table-column prop="" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip>
+ <el-table-column prop="files" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip >
<template v-slot="{ row }">
<span class="gray" v-if="row.dealStatus == 0">姝ｅ父</span>
<span class="red" v-if="row.dealStatus == 1">寮傚父</span>
</template>
</el-table-column>
+ <el-table-column prop="" label="宸℃闄勪欢" min-width="100" show-overflow-tooltip>
+ <template v-slot="{ row }">
+ <div class="value" v-if="row.multifileList != null && row.multifileList.length">
+ <div v-for="item in row.multifileList" :key="item.id" style="display: inline;margin-right: 20px">
+ <video v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')" ref="videoRef" controls preload="auto"
+ style="width: 60px;height: 60px;object-fit: contain;" :src="item.fileurlFull" />
+ <el-image v-else-if="item.fileurlFull" style="width:60px; height: 60px" :src="item.fileurlFull"
+ :preview-src-list="[item.fileurlFull]">
+ </el-image>
+ </div>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="dealInfo" label="宸℃璇存槑" min-width="100" show-overflow-tooltip />
</el-table>
<div class="mt20">
diff --git a/admin/src/views/Inspection/plan.vue b/admin/src/views/Inspection/plan.vue
index 421f804..31bd4c2 100644
--- a/admin/src/views/Inspection/plan.vue
+++ b/admin/src/views/Inspection/plan.vue
@@ -2,14 +2,17 @@
<TableLayout :permissions="['business:ywpatrolscheme:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="寮�濮嬫棩鏈�" prop="selDate">
+ <el-date-picker type="daterange" v-model="searchForm.selDate" @change="changeSelDate" clearable value-format="yyyy-MM-dd"
+ />
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡" prop="selDateSec">
+ <el-date-picker type="daterange" v-model="searchForm.selDateSec" @change="changeSelDateSec" clearable value-format="yyyy-MM-dd"
+ />
+ </el-form-item>
<el-form-item label="璁″垝鍚嶇О" prop="title">
<el-input v-model="searchForm.title" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="璁″垝鏃ユ湡" prop="selDate">
- <el-date-picker type="daterange" v-model="searchForm.selDate" clearable value-format="yyyy-MM-dd"
- @change="changeDate" />
- </el-form-item>
-
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -90,7 +93,9 @@
return {
// 鎼滅储
searchForm: {
- title: ''
+ title: '',
+ selDate:[],
+ selDateSec:[]
}
}
},
@@ -113,16 +118,7 @@
this.search()
})
},
- changeDate(e) {
- if (e && e.length > 0) {
- this.$set(this.searchForm, 'startDate', e[0])
- this.$set(this.searchForm, 'endDate', e[1])
- } else {
- this.$set(this.searchForm, 'startDate', '')
- this.$set(this.searchForm, 'endDate', '')
- }
- },
reset() {
this.searchForm = {}
this.search()
@@ -137,6 +133,24 @@
this.$refs.operaYwPatrolSchemeWindow.initData()
},
+ changeSelDate(e) {
+ if (e && e.length > 0) {
+ this.$set(this.searchForm, 'startDate', e[0] )
+ this.$set(this.searchForm, 'endDate', e[1] )
+ } else {
+ this.$set(this.searchForm, 'startDate', '')
+ this.$set(this.searchForm, 'endDate', '')
+ }
+ },
+ changeSelDateSec(e) {
+ if (e && e.length > 0) {
+ this.$set(this.searchForm, 'startDateSec', e[0] )
+ this.$set(this.searchForm, 'endDateSec', e[1] )
+ } else {
+ this.$set(this.searchForm, 'startDateSec', '')
+ this.$set(this.searchForm, 'endDateSec', '')
+ }
+ },
}
}
</script>
diff --git a/admin/src/views/business/areas.vue b/admin/src/views/business/areas.vue
index 0908620..d308427 100644
--- a/admin/src/views/business/areas.vue
+++ b/admin/src/views/business/areas.vue
@@ -17,8 +17,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column prop="name" label="鍦板尯鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="code" label="琛屾斂鍖轰唬鐮�" align="center" min-width="140px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
+<!--
<el-table-column prop="sortnum" label="鎺掑簭鐮�" align="center" min-width="140px"></el-table-column>
+-->
<el-table-column
v-if="containPermissions(['business:areas:update', 'business:areas:create', 'business:areas:delete'])"
label="鎿嶄綔"
diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index a9c43db..3b49554 100644
--- a/admin/src/views/contract/components/contractDetail.vue
+++ b/admin/src/views/contract/components/contractDetail.vue
@@ -235,7 +235,7 @@
label="璐﹀崟鏉ユ簮">
<template slot-scope="{row}">
<span v-if="row.type === 0">鍚堝悓璐﹀崟</span>
- <span v-if="row.type === 1">鑷缓璐﹀崟</span>
+ <span v-else>鑷缓璐﹀崟</span>
</template>
</el-table-column>
<el-table-column
@@ -345,7 +345,7 @@
page: 1,
total: 0,
tableData: [],
-
+
loading: false
}
},
diff --git a/admin/src/views/contract/components/contractEdit.vue b/admin/src/views/contract/components/contractEdit.vue
index a441200..395e8db 100644
--- a/admin/src/views/contract/components/contractEdit.vue
+++ b/admin/src/views/contract/components/contractEdit.vue
@@ -316,7 +316,7 @@
import { ywList } from '@/api/customer'
import { getUserList } from '@/api/system/user'
import { getProjectList, tree } from '@/api/project/ywProject'
-import { companyList } from '@/api/company'
+import {companyListConstract as companyList } from '@/api/company'
import { Message, Loading } from 'element-ui'
import { mapState } from 'vuex'
export default {
@@ -347,7 +347,7 @@
memberId: '',
memberName: '',
fileList: [],
-
+
zlDeposit: '',
zlPayType: '',
zlFreeStartDate: '',
@@ -363,7 +363,7 @@
advanceDays: ''
}
],
-
+
wyDeposit: '',
wyPayType: '',
wyFreeStartDate: '',
@@ -379,17 +379,17 @@
advanceDays: ''
}
],
-
+
roomIds: []
},
-
+
ids: [],
-
+
zlList: [],
wyList: [],
-
+
rules,
-
+
contactsList: [],
loadingInstance: null,
@@ -432,7 +432,7 @@
{ name: '鍏�/m虏路骞�', value: 2 },
{ name: '鍏�/鍦�', value: 6 },
],
-
+
houseLvThree: []
}
},
diff --git a/admin/src/views/workorder/workorderList.vue b/admin/src/views/workorder/workorderList.vue
index a2b0b1e..f3ad3de 100644
--- a/admin/src/views/workorder/workorderList.vue
+++ b/admin/src/views/workorder/workorderList.vue
@@ -103,7 +103,6 @@
showDetail: false,
searchForm: {
selDate: [],
- areaType: '',
areaIds: '',
projectId: '',
buildingId: '',
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
index 2e1e381..1d28bbf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
@@ -105,7 +105,6 @@
@ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=鍛ㄦ湡璐圭敤锛�1=涓�娆℃�ц垂鐢�")
@TableField(exist = false)
private Integer feeType;
-
@ApiModelProperty(value = "鎵�灞炲叕鍙�", example = "1")
private Integer companyId;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java
index a7c167c..bc6ea4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java
@@ -122,4 +122,15 @@
@ApiModelProperty(value = "瓒呮湡浠诲姟鏁�")
@TableField(exist = false)
private Integer timeOutTaskNum;
+
+ @ApiModelProperty(value = "寮�濮嬫棩鏈燂紙鎼滅储鎴鏃ユ湡锛�")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDateSec;
+
+ @ApiModelProperty(value = "缁撴潫鏃ユ湡锛堟悳绱㈡埅姝㈡棩鏈燂級")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endDateSec;
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
index 1cf5188..4167a7c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
@@ -35,7 +35,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -44,7 +43,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
index 52b009b..8b9b37c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
@@ -33,6 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="涓婃姤鏃堕棿",index = 5,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -83,7 +84,6 @@
@ApiModelProperty(value = "鎻愭姤鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelColumn(name="涓婃姤鏃堕棿",index = 5,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date submitDate;
@ApiModelProperty(value = "宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�", example = "1")
@@ -97,7 +97,7 @@
private String code;
@ApiModelProperty(value = "澶勭悊鐘舵�� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�", example = "1")
- @ExcelColumn(name="宸ュ崟鐘舵��",index = 7,width = 10,valueMapping = "0=寰呭鐞�;1=宸插垎娲�;1=宸插鐞�;")
+ @ExcelColumn(name="宸ュ崟鐘舵��",index = 7,width = 10,valueMapping = "0=寰呭鐞�;1=宸插垎娲�;2=宸插鐞�;")
private Integer dealStatus;
@ApiModelProperty(value = "鍒嗘淳浜虹紪鐮�(鍏宠仈system_user)", example = "1")
@@ -136,9 +136,12 @@
@TableField(exist = false)
private String buildingName;
@ApiModelProperty(value = "鎴挎簮鍚嶇О")
- @ExcelColumn(name="鎴挎簮",index = 2,width = 10)
@TableField(exist = false)
private String roomName;
+ @ApiModelProperty(value = "鎶ヤ慨鍖哄煙")
+ @ExcelColumn(name="鎶ヤ慨鍖哄煙",index = 2,width = 10)
+ @TableField(exist = false)
+ private String areaNameInfo;
@ApiModelProperty(value = "妤煎眰鍚嶇О")
@TableField(exist = false)
private String floorName;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
index 2416bac..28835e0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
@@ -102,6 +102,7 @@
wrapper.lambda().eq(Areas::getId,areas.getId());
Areas update = new Areas();
update.setName(areas.getName());
+ update.setCode(areas.getCode());
update.setSortnum(areas.getSortnum());
areasMapper.update(update,wrapper);
//鍒锋柊缂撳瓨鏁版嵁
@@ -326,7 +327,7 @@
CITY_LIST=null;
AREA_LIST = null;
ALL_AREA_TREE = null;
- ALL_AREA_LIST = areasMapper.selectList(new QueryWrapper<>(a).lambda().orderByDesc(Areas::getSortnum));
+ ALL_AREA_LIST = areasMapper.selectList(new QueryWrapper<>(a).lambda().orderByAsc(Areas::getCode));
if(ALL_AREA_LIST!=null){
for(Areas model : ALL_AREA_LIST){
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 42b5df5..f306f85 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -436,6 +436,7 @@
MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Company.class);
queryWrapper.like(company.getName() != null,Company::getName, company.getName());
+ queryWrapper.eq(Company::getStatus, Constants.ZERO);
queryWrapper.eq(Company::getType, Constants.TWO);
queryWrapper.eq(Company::getIsdeleted, Constants.ZERO);
queryWrapper.exists("select b.id from yw_account b where b.isdeleted=0 and b.company_id=t.id and b.status=0");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index fb15ce1..12976d2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1016,6 +1016,8 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
}
if(model.getCompanyId()!=null) {
+ member.setEditor(member.getLoginUserInfo().getId());
+ member.setEditDate(new Date());
if(Constants.equalsInteger(member.getHeadStatus(),Constants.ONE)){
//濡傛灉鏄彇娑堜富绠�
companyMapper.update(null,new UpdateWrapper<Company>().lambda()
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 0afc0a7..d6f34b7 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
@@ -290,11 +290,13 @@
.eq(YwPatrolScheme::getIsdeleted,Constants.ZERO)
.like(StringUtils.isNotBlank(model.getTitle()),YwPatrolScheme::getTitle,model.getTitle())
//鏌ヨ鏈夋椂娈典氦闆嗙殑鏁版嵁
- .apply(Objects.nonNull(model.getStartDate())&&Objects.nonNull(model.getEndDate()),
- " t.START_DATE <= '"+pageWrap.getModel().getEndDate()+"' and t.END_DATE >= '"+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()))
+ /* .apply(Objects.nonNull(model.getStartDate())&&Objects.nonNull(model.getEndDate()),
+ " t.START_DATE <= '"+pageWrap.getModel().getEndDate()+"' or t.END_DATE >= '"+pageWrap.getModel().getStartDate()+"' "
+ )*/
+ .ge( model.getStartDate()!=null,YwPatrolScheme::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
+ .le(Objects.nonNull(model.getEndDate()),YwPatrolScheme::getStartDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))
+ .ge(Objects.nonNull(model.getStartDateSec()),YwPatrolScheme::getEndDate, Utils.Date.getStart(pageWrap.getModel().getStartDateSec()))
+ .le(Objects.nonNull(model.getEndDateSec()),YwPatrolScheme::getEndDate, Utils.Date.getStart(pageWrap.getModel().getEndDateSec()))
.orderByDesc(YwPatrolScheme::getCreateDate)
;
IPage<YwPatrolScheme> iPage = ywPatrolSchemeMapper.selectJoinPage(page,YwPatrolScheme.class,queryWrapper);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
index f463fe7..087d9a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
@@ -135,7 +135,33 @@
.orderByDesc(YwPatrolScheme::getCreateDate)
;
IPage<YwPatrolTaskRecord> iPage = ywPatrolTaskRecordMapper.selectJoinPage(page,YwPatrolTaskRecord.class,queryWrapper);
+ if(iPage!=null && iPage.getRecords()!=null){
+ for(YwPatrolTaskRecord m : iPage.getRecords()){
+ getFileListByModel(m);
+ }
+ }
return PageData.from(iPage);
+ }
+
+ private void getFileListByModel(YwPatrolTaskRecord ywPatrolTaskRecord) {
+ //闄勪欢鏁版嵁
+ List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
+ .selectAll(Multifile.class)
+ .selectAs(SystemUser::getRealname,Multifile::getUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
+ .eq(Multifile::getObjId,ywPatrolTaskRecord.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_TASK_RECORD_FILE.getKey()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
+ for (Multifile multifile:multifileList) {
+ if(StringUtils.isNotBlank(multifile.getFileurl())){
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ }
+ ywPatrolTaskRecord.setMultifileList(multifileList);
+ }
}
@Override
@@ -253,24 +279,7 @@
if(Objects.isNull(ywPatrolTaskRecord)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈尮閰嶅埌宸℃鐐�!");
}
- //闄勪欢鏁版嵁
- List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
- .selectAll(Multifile.class)
- .selectAs(SystemUser::getRealname,Multifile::getUserName)
- .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
- .eq(Multifile::getObjId,ywPatrolTaskRecord.getId())
- .eq(Multifile::getIsdeleted,Constants.ZERO)
- .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_TASK_RECORD_FILE.getKey()));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
- for (Multifile multifile:multifileList) {
- if(StringUtils.isNotBlank(multifile.getFileurl())){
- multifile.setFileurlFull(path + multifile.getFileurl());
- }
- }
- ywPatrolTaskRecord.setMultifileList(multifileList);
- }
+ getFileListByModel(ywPatrolTaskRecord);
return ywPatrolTaskRecord;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
index 57dc76a..84f274d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
@@ -86,8 +86,8 @@
.selectAs(YwPatrolScheme::getCode,YwPatrolTask::getPlanCode)
.selectAs(YwPatrolScheme::getTitle,YwPatrolTask::getPlanTitle)
.selectAs(SystemUser::getRealname,YwPatrolTask::getUserName)
- .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and t.ISDELETED = 0 ) ",YwPatrolTask::getPatrolNum)
- .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and t.STATUS = 1 and t.ISDELETED = 0) ",YwPatrolTask::getFinishNum)
+ .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and ytr.ISDELETED = 0 ) ",YwPatrolTask::getPatrolNum)
+ .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and ytr.STATUS = 1 and ytr.ISDELETED = 0) ",YwPatrolTask::getFinishNum)
.leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTask::getDealUserId)
.leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId)
.eq(YwPatrolTask::getIsdeleted, Constants.ZERO)
@@ -140,8 +140,8 @@
.selectAs(YwPatrolScheme::getCode,YwPatrolTask::getPlanCode)
.selectAs(YwPatrolScheme::getTitle,YwPatrolTask::getPlanTitle)
.selectAs(SystemUser::getRealname,YwPatrolTask::getUserName)
- .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and t.ISDELETED = 0 ) ",YwPatrolTask::getPatrolNum)
- .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and t.STATUS = 1 and t.ISDELETED = 0) ",YwPatrolTask::getFinishNum)
+ .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and ytr.ISDELETED = 0 ) ",YwPatrolTask::getPatrolNum)
+ .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and ytr.STATUS = 1 and ytr.ISDELETED = 0) ",YwPatrolTask::getFinishNum)
.leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTask::getDealUserId)
.leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId)
.eq(YwPatrolTask::getIsdeleted, Constants.ZERO)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
index 2e2061a..2e0587a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
@@ -282,6 +282,7 @@
List<YwRoom> ywRoomList = ywRoomMapper.selectList(new QueryWrapper<YwRoom>().lambda()
.eq(YwRoom::getIsdeleted,Constants.ZERO)
.eq(YwRoom::getStatus,Constants.ZERO)
+ .eq(YwRoom::getIsInvestment,Constants.ONE)
.eq(Objects.nonNull(dataDTO.getProjectId()),YwRoom::getProjectId,dataDTO.getProjectId())
.apply(Objects.nonNull(dataDTO)&&Objects.nonNull(dataDTO.getStartDate())&&Objects.nonNull(dataDTO.getEndDate())," id not in (" +
" SELECT y2.room_id FROM yw_contract y1 left join yw_contract_room y2 on y1.id = y2.contract_id where 1 = 1 and y1.`STATUS` in( 0,1,2) " +
@@ -291,7 +292,7 @@
" SELECT y2.room_id FROM yw_contract y1 left join yw_contract_room y2 on y1.id = y2.contract_id where 1 = 1 and y1.`STATUS` = 3 " +
" and y1.START_DATE < '"+dataDTO.getEndDate()+" 00:00:00' and y1.BT_DATE > '"+ dataDTO.getStartDate() +" 00:00:00' " +
" ) ")
- .orderByAsc(YwRoom::getSortnum)
+ .orderByAsc(YwRoom::getRoomNum)
);
for (YwRoom data:ywRoomList) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
index c8a86f3..42f163b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
@@ -499,10 +499,28 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
+ if(StringUtils.isNotBlank(pageWrap.getModel().getBuildingName())){
+ queryWrapper.and(rw ->{
+ rw.like(YwBuilding::getName,pageWrap.getModel().getBuildingName()).or()
+ .like(YwRoom::getName,pageWrap.getModel().getBuildingName());
+ });
+ }
queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryStartTime())
.le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryEndTime());
queryWrapper.orderByDesc(YwContract::getCreateDate );
- return PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper));
+
+ PageData<YwWorkorder> result = PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper));
+ if(result!=null && result.getRecords()!=null){
+ for(YwWorkorder m : result.getRecords()){
+ if(Constants.equalsInteger(m.getAreaType(),Constants.ZERO)){
+ //0瀹ゅ唴缁翠慨
+ m.setAreaNameInfo(StringUtils.defaultString(m.getBuildingName(),"")+"/"+StringUtils.defaultString(m.getRoomNum(),""));
+ }else{
+ m.setAreaNameInfo(StringUtils.defaultString(m.getBuildingName(),"")+"/"+StringUtils.defaultString(m.getFloorName(),""));
+ }
+ }
+ }
+ return result;
}
@Override
--
Gitblit v1.9.3