From ea99df3cd96a57e6478c20c85eaaf44ce0ad1481 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 09:24:52 +0800
Subject: [PATCH] 前端
---
admin/src/api/business/identityInfo.js | 5
server/admin/src/main/java/com/doumee/api/business/IdentityInfoController.java | 6
server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 17 -
server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 4
admin/src/components/business/OperaMemberDetailWindow.vue | 292 +++++++++++++++----------------
server/services/src/main/java/com/doumee/core/constants/Constants.java | 11
server/services/src/main/java/com/doumee/service/business/IdentityInfoService.java | 2
server/services/src/main/java/com/doumee/api/common/PublicCloudController.java | 71 -------
server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java | 65 +++++++
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 9 -
server/services/src/main/java/com/doumee/dao/system/model/SystemDictData.java | 1
server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java | 7
12 files changed, 227 insertions(+), 263 deletions(-)
diff --git a/admin/src/api/business/identityInfo.js b/admin/src/api/business/identityInfo.js
index 3dc730a..755bbb2 100644
--- a/admin/src/api/business/identityInfo.js
+++ b/admin/src/api/business/identityInfo.js
@@ -6,6 +6,11 @@
trim: true
})
}
+export function allList (data) {
+ return request.post('/business/identityInfo/memberList', data, {
+ trim: true
+ })
+}
// 鍒涘缓
export function create (data) {
diff --git a/admin/src/components/business/OperaMemberDetailWindow.vue b/admin/src/components/business/OperaMemberDetailWindow.vue
index b524198..c175618 100644
--- a/admin/src/components/business/OperaMemberDetailWindow.vue
+++ b/admin/src/components/business/OperaMemberDetailWindow.vue
@@ -93,122 +93,83 @@
:total="tableData.total">
</el-pagination>
</div>
- <div class="main" v-if="activeTabs === 1 && info">
+ <div class="main" v-if="activeTabs === 1 && info">
<el-radio-group v-model="type" @change="changeType" style="margin-bottom: 20px;">
<el-radio-button :label="0">鏀跺埌鐨勮瘎浠�</el-radio-button>
<el-radio-button :label="1">鍙戝竷鐨勮瘎浠�</el-radio-button>
</el-radio-group>
<el-table
- :data="tableData"
- border
- v-loading="loading"
- style="width: 100%">
- <el-table-column
- width="150"
- label="璐﹀崟缂栧彿">
- </el-table-column>
- <el-table-column
- label="璐圭敤绫诲瀷">
- </el-table-column>
- <el-table-column
- prop="totleFee"
- label="璐﹀崟閲戦">
- </el-table-column>
- <el-table-column
- :key="Date.now()"
- prop="receivableFee"
- :label="`搴�${type === 0 ? '鏀�' : '浠�'}閲戦`">
- </el-table-column>
- <el-table-column
- prop="actReceivableFee"
- :label="`瀹�${type === 0 ? '鏀�' : '浠�'}閲戦`">
- </el-table-column>
- <el-table-column
- :label="`闇�${type === 0 ? '鏀�' : '浠�'}閲戦`">
+ v-loading="isWorking.search"
+ :data="tableData1.records"
+ stripe
+ >
+ <el-table-column prop="commentTime" label="璇勪环鏃堕棿" min-width="150px" align="center">
<template slot-scope="{row}">
- <template v-if="type === 0">
- <el-tag type="success" v-if="row.needReceivableFee > 0">鏀�</el-tag>
- <el-tag type="warning" v-else-if="row.needReceivableFee < 0">浠�</el-tag>
- </template>
- <template v-else>
- <el-tag type="warning" v-if="row.needReceivableFee !== 0">浠�</el-tag>
- </template>
- <span style="margin-left: 10px;">{{Math.abs(row.needReceivableFee)}}</span>
+ <span >{{ row.commentTime }}</span>
</template>
</el-table-column>
- <el-table-column
- label="璐﹀崟鏉ユ簮">
+ <el-table-column prop="commentLevel" label="璇勫垎" width="120px" align="center">
<template slot-scope="{row}">
- <span v-if="row.type === 0">鍚堝悓璐﹀崟</span>
- <span v-else>鑷缓璐﹀崟</span>
+ <span class="yellowbtn">{{ row.commentLevel || 0 }}鍒�</span>
</template>
</el-table-column>
- <el-table-column
- width="200"
- label="璁¤垂鍛ㄦ湡">
+ <el-table-column prop="commentInfo" label="璇勪环鍐呭" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="code" label="璁㈠崟鍙�" min-width="100px" align="center"> </el-table-column>
+ <el-table-column prop="type" label="璁㈠崟绫诲瀷" min-width="100px" align="center">
<template slot-scope="{row}">
- {{ row.startDate }} ~ {{ row.endDate }}
+ <span v-if="row.type ==0" >鐢ㄥ伐鍗�
+ <span v-if="row.workType ==0">/閲囨憳宸�</span>
+ <span v-if="row.workType ==1">/鍒嗘嫞宸�</span>
+ <span v-if="row.workType ==2">/鍖呰宸�</span>
+ </span>
+ <span v-if="row.type ==1" >杩愯揣鍗�</span>
+ <span v-if="row.type ==2" >璁㈤鍗�</span>
</template>
- </el-table-column>
- <el-table-column
- prop="planPayDate"
- label="搴旀敹鏃ユ湡">
- </el-table-column>
- <el-table-column
- label="鏄惁閫炬湡">
- </el-table-column>
- <el-table-column
- fixed="right"
- label="鐘舵��">
</el-table-column>
</el-table>
<el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="page"
- :page-sizes="[10, 15, 20, 25]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total">
+ @current-change="handleCurrentChange0"
+ :current-page="page1"
+ :page-size="pageSize"
+ layout="total, prev, pager, next, jumper"
+ :total="tableData1.total">
</el-pagination>
</div>
<div class="main" v-if="activeTabs === 2 && info">
- <div class="title">鎿嶄綔璁板綍</div>
- <el-table
- :data="info.logList"
- border
- style="width: 100%">
- <el-table-column
- :key="Date.now()"
- width="200"
- prop="param1"
- label="鎿嶄綔浜�">
- </el-table-column>
- <el-table-column
- :key="Date.now()"
- width="200"
- prop="createDate"
- label="鎿嶄綔鏃堕棿">
- </el-table-column>
- <el-table-column
- :key="Date.now()"
- width="150"
- label="鎿嶄綔">
- <template slot-scope="{row}">
- <span v-if="row.objType === 0">宸ュ崟鍒涘缓</span>
- <span v-if="row.objType === 1">鎸囨淳</span>
- <span v-if="row.objType === 2">澶勭悊</span>
- <span v-if="row.objType === 3">鍚堝悓鍒涘缓</span>
- <span v-if="row.objType === 4">鍚堝悓鍙樻洿</span>
- <span v-if="row.objType === 5">鍚堝悓閫�绉�</span>
- </template>
- </el-table-column>
- <el-table-column
- :key="Date.now()"
- prop="content"
- label="鎿嶄綔鍐呭">
- </el-table-column>
- </el-table>
+ <div class="renzheng" v-for="item in tableData2">
+ <div class="info" >
+ <span class="m10" v-if="item.type ==0">鐢ㄥ伐璁よ瘉</span>
+ <span class="m10" v-if="item.type ==1">璐ц繍璁よ瘉</span>
+ <span class="m10" v-if="item.type ==2">渚涢璁よ瘉</span>
+ <el-tag type="primary" class="mr10 tag2" v-if="item.auditStatus == 0">璁よ瘉涓�</el-tag>
+ <el-tag type="success" class="mr10 tag2" v-if="item.auditStatus == 1">璁よ瘉閫氳繃</el-tag>
+ <el-tag type="danger" class="mr10 tag2" v-if="item.auditStatus == 2">璁よ瘉澶辫触</el-tag>
+ </div>
+ <div class="detail" >
+ <div class="line">
+ <span class="label"> 璁よ瘉绫诲瀷锛�</span> <span class="txt">{{item.authType == 0? '涓汉':'浼佷笟' }}</span>
+ <span class="label"> 鑱旂郴浜猴細</span> <span class="txt">{{item.linkName || '' }}</span>
+ <span class="label"> 鑱旂郴鏂瑰紡锛�</span> <span class="txt">{{item.telephone || '' }}</span>
+ </div>
+ <template v-if="item.authType ==1">
+ <div class="line">
+ <span class="label">鍗曚綅浣嶇疆锛�</span><span class="txt">{{item.location || '' }}</span>
+ <span class="label">鍗曚綅鍚嶇О锛�</span><span class="txt">{{item.companyName || '' }}</span>
+ </div>
+ <div class="line"> <span class="label">璁よ瘉璧勬枡锛�</span> <span v-if="!item.imgList || item.imgList.length==0" class="txt">鏃�</span> </div>
+ </template>
+ <template v-else>
+ <div class="line"> <span class="label">韬唤淇℃伅锛�</span> <span v-if="!item.imgList || item.imgList.length==0" class="txt">鏃�</span> </div>
+ </template>
+ <div class="line" v-if="item.imgList && item.imgList.length>0">
+ <div v-for="info in item.imgList">
+ <el-image v-if="info" style="width: 50px; height: 50px; margin-right: 10px" :src="info"
+ :preview-src-list="[info]">
+ </el-image>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</GlobalWindow>
</template>
@@ -218,8 +179,8 @@
import BaseOpera from '@/components/base/BaseOpera'
import { getById } from '@/api/business/member'
import { fetchList as yueList, exportExcel as yueExportExcel } from '@/api/business/memberRevenue'
-import { commentList } from '@/api/business/orders'
-import { fetchList as renzhengList } from '@/api/business/identityInfo'
+import { fetchList as commentList } from '@/api/business/orders'
+import { allList as renzhengList} from '@/api/business/identityInfo'
export default {
components: {
GlobalWindow
@@ -236,9 +197,10 @@
page: 1,
total: 0,
tableData: {},
+ tableData1: {},
+ tableData2:[],
page0: 1,
- totalPage0: 0,
- total0: 0,
+ page1: 1,
loading: false,
export0: false,
searchForm: {
@@ -246,6 +208,8 @@
startTime: null,
endTime: null,
optType: null,
+ acceptMemberId: -1,
+ releaseMemberId: -1,
transactionNo: null
}
}
@@ -257,11 +221,20 @@
this.activeTabs = 0
this.type = 0
this.page0 = 1
- this.totalPage0 = 0
- this.total0 = 0
this.pageSize = 10
this.tableData = {}
+ this.tableData1 = {}
+ this.tableData2 = []
this.id = id
+ this.searchForm = {
+ type: 0,
+ startTime: null,
+ endTime: null,
+ optType: null,
+ acceptMemberId: -1,
+ releaseMemberId: -1,
+ transactionNo: null
+ }
this.getData()
},
getData () {
@@ -269,7 +242,9 @@
.then(res => {
this.info = res
this.visible = true
- this.handleCurrentChange0(0)
+ this.handleCurrentChange0(1)
+ this.changeType(0)
+ this.getRenzhengList()
})
},
exportExcel0 () {
@@ -287,8 +262,8 @@
transactionNo: this.searchForm.transactionNo
}
}).then(response => {
- this.download(response)
- })
+ this.download(response)
+ })
.catch(e => {
this.$tip.apiFailed(e)
})
@@ -310,6 +285,10 @@
this.page0 = page
this.getYueList()
},
+ handleCurrentChange1 (page) {
+ this.page1 = page
+ this.getCommentList()
+ },
getYueList () {
this.loading = true
yueList({
@@ -325,9 +304,27 @@
}).then(res => {
this.loading = false
this.tableData = res
- this.total0 = res.total
- this.totalPage0 = res.total
console.log(this.tableData)
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+ getCommentList () {
+ this.loading = true
+ commentList({
+ capacity: this.pageSize,
+ page: this.page1,
+ model: {
+ acceptMemberId: this.searchForm.acceptMemberId,
+ releaseMemberId: this.searchForm.releaseMemberId,
+ commentStatus: 1
+ }
+ }).then(res => {
+ this.loading = false
+ this.tableData1 = res
+ console.log(this.tableData1)
}).catch(e => {
this.$tip.apiFailed(e)
}).finally(() => {
@@ -340,60 +337,32 @@
getRenzhengList () {
this.loading = true
renzhengList({
- capacity: this.pageSize,
- page: this.page,
- model: {
- startTime: this.searchForm.startTime,
- endTime: this.searchForm.endTime,
- optType: this.searchForm.optType,
- transactionNo: this.searchForm.transactionNo
- }
+ memberId: this.id || -1
}).then(res => {
this.loading = false
- this.tableData = res.records
- this.total = res.total
+ this.tableData2 = res
}).catch(e => {
this.$tip.apiFailed(e)
}).finally(() => {
this.loading = false
})
},
- getCommentList () {
- this.loading = true
- commentList({
- capacity: this.pageSize,
- page: this.page,
- model: {
- status: 0,
- billType: this.type,
- contractId: this.info.id
- }
- }).then(res => {
- this.loading = false
- this.tableData = res.records
- this.total = res.total
- })
- },
changeType (e) {
- this.type = e
- this.page = 1
- this.pageSize = 10
- this.tableData = []
- this.getList()
+ this.searchForm.acceptMemberId = -1
+ this.searchForm.releaseMemberId = -1
+ if (e == 0) {
+ this.searchForm.releaseMemberId = this.info.id || -1
+ this.searchForm.acceptMemberId = null
+ } else {
+ this.searchForm.acceptMemberId = this.info.id || -1
+ this.searchForm.releaseMemberId =null
+ }
+ this.page1 = 1
+ this.tableData1 = {}
+ this.handleCurrentChange1(0)
},
tabsClick (val) {
this.activeTabs = val
- },
- getDetail () {
-
- },
- handleSizeChange (e) {
- this.pageSize = e
- this.getList()
- },
- handleCurrentChange (e) {
- this.page = e
- this.getList()
}
}
}
@@ -401,6 +370,29 @@
<style lang="scss" scoped>
@import '@/assets/style/variables.scss';
+.renzheng{
+ margin: 0px 0px 50px 20px;
+ width: calc(100% - 60px);
+ .detail{
+ font-size: 14px;
+ .label{
+ color: #8c939d;
+ }
+ .txt{
+ margin-right: 30px;
+ }
+ .line{
+ margin-top: 15px;
+ }
+ }
+ .info{
+ font-size: 14px;
+ font-weight: bold;
+ }
+ .tag2{
+ font-size: 12px;
+ }
+}
.home_title {
.mr10{
margin-right: 10px;
diff --git a/server/admin/src/main/java/com/doumee/api/business/IdentityInfoController.java b/server/admin/src/main/java/com/doumee/api/business/IdentityInfoController.java
index 865400e..f827db9 100644
--- a/server/admin/src/main/java/com/doumee/api/business/IdentityInfoController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/IdentityInfoController.java
@@ -73,6 +73,12 @@
public ApiResponse<PageData<IdentityInfo>> findPage (@RequestBody PageWrap<IdentityInfo> pageWrap) {
return ApiResponse.success(identityInfoService.findPage(pageWrap));
}
+ @ApiOperation("鏌ヨ鐢ㄦ埛璁よ瘉闆嗗悎")
+ @PostMapping("/memberList")
+ @RequiresPermissions("business:identityinfo:query")
+ public ApiResponse<List<IdentityInfo>> findMemberList (@RequestBody IdentityInfo pageWrap) {
+ return ApiResponse.success(identityInfoService.findMemberList(pageWrap));
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
diff --git a/server/services/src/main/java/com/doumee/api/common/PublicCloudController.java b/server/services/src/main/java/com/doumee/api/common/PublicCloudController.java
index c265fb7..e709502 100644
--- a/server/services/src/main/java/com/doumee/api/common/PublicCloudController.java
+++ b/server/services/src/main/java/com/doumee/api/common/PublicCloudController.java
@@ -67,77 +67,6 @@
systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode());
}
- @ApiOperation(value = "涓婁紶OBS", notes = "涓婁紶OBS", httpMethod = "POST", position = 6)
- @ApiImplicitParams({
- @ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
- @ApiImplicitParam(name = "file", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
- })
- @PostMapping(value = "/upload", headers = "content-type=multipart/form-data")
- @ResponseBody
- public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
- Date d1 = new Date();
- log.error("鎬诲緱涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(d1));
- SystemDictData folderData = systemDictDataBiz.queryByCode(Constants.FTP,folder);
- if(Objects.isNull(folderData)||StringUtils.isBlank(folderData.getCode())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩爣鏂囦欢澶归敊璇�");
- }
- folder =folderData.getCode().replace("/", "");
- String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
- InputStream is = null;
- response.setCharacterEncoding("UTF-8");
- response.setContentType("text/html;charset=UTF-8");
- Map<String, Object> context = new HashMap<>();
- try {
- CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
- if (multipartResovler.isMultipart(request)) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Iterator<String> it = multipartRequest.getFileNames();
- while (it.hasNext()) {
- MultipartFile file = multipartRequest.getFile(it.next());
- System.out.println(file.getSize());
- String originname = file.getOriginalFilename();
- is = file.getInputStream();
- String endType = ".jpg";
- if(originname.indexOf(".")>0){
- endType=originname.substring(originname.lastIndexOf("."),originname.length());
- }
- String date = DateUtil.getNowShortDate();
- String fName = date+"/"+ UUID.randomUUID()+endType;
- String fileName = folder+"/"+fName;
- boolean r =false;
- ObsUtil obsUtil = new ObsUtil( systemDictDataBiz.queryByCode(Constants.HWY_OBS,Constants.HWY_OBS_ACCESSID).getCode(),
- systemDictDataBiz.queryByCode(Constants.HWY_OBS,Constants.HWY_OBS_ACCESSKEY).getCode(),
- systemDictDataBiz.queryByCode(Constants.HWY_OBS,Constants.HWY_OBS_ENDPOINT).getCode());
- r = obsUtil.uploadFile( systemDictDataBiz.queryByCode(Constants.HWY_OBS,Constants.HWY_OBS_BUCKET).getCode(),is,fileName);//涓婁紶
- if(r){
- context.put("success", true);
- context.put("code", 200);
- context.put("errno",0);
- JSONObject fileJSON = new JSONObject();
-// fileJSON.put("prefixPath", prefixPath);
-// fileJSON.put("folder", folder);
- fileJSON.put("url", prefixPath+fileName);
- fileJSON.put("imgaddr", fName);
- fileJSON.put("imgname", fileName);
- fileJSON.put("originname", originname);
- context.put("data",fileJSON);
- context.put("message","璇锋眰鎴愬姛");
- writerJson(response, context);
- Date d2= new Date();
- log.error("鎬荤殑涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(d2) +"鑰楁椂绉掞細"+( (d2.getTime()-d1.getTime()) /1000));
- return;
- }
- }
- }
- } catch (Exception e) {
- log.error("銆愪笂浼燜TP澶辫触銆�======================"+e.getMessage());
- }
- context.put("code", 0);
- context.put("message", "涓婁紶澶辫触");
- context.put("errno",0);
- writerJson(response, context);
- return;
- }
public void uploadFileLocal(HttpServletRequest request, HttpServletResponse response, String rootPath,String dir) throws Exception {
diff --git a/server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java b/server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
index f6039cc..2c25530 100644
--- a/server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
+++ b/server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
@@ -43,12 +43,5 @@
List<SystemDictData> queryListByCode(String dicCode, String label);
List<SystemDictData> queryDataByCode(String dicCode, String code);
- /**
- * 鑾峰彇璺緞鍓嶇紑
- * @param resourceCode
- * @param targetCode
- * @return
- */
- String getPreFixPath(String resourceCode, String targetCode);
void updateByDicId(List<SystemDictData> list);
}
diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index b602f4a..a3541d3 100644
--- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -195,23 +195,6 @@
}
- @Override
- public String getPreFixPath(String resourceCode, String targetCode) {
- if (StringUtils.isBlank(resourceCode) || StringUtils.isBlank(targetCode)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璺緞鍙傛暟涓嶅畬鏁�");
- }
- SystemDict queryDto = new SystemDict();
- queryDto.setCode(Constants.FTP);
- queryDto.setDeleted(Boolean.FALSE);
- SystemDict dictData = systemDictService.findOne(queryDto);
- if (dictData == null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊间笉瀛樺湪");
- }
- List<SystemDictData> list = systemDictDataService.findList(dictData.getId(), Arrays.asList(resourceCode, targetCode));
- String resourcePath = list.stream().filter(s->s.getLabel().equals(resourceCode)).findFirst().map(s->s.getCode()).orElse("");
- String targetPath = list.stream().filter(s -> s.getLabel().equals(targetCode)).findFirst().map(s -> s.getCode()).orElse("");
- return resourcePath+targetPath;
- }
}
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index f579819..1c6ae0c 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -18,13 +18,7 @@
public static final String HWY_OBS_ACCESSKEY ="HWY_OBS_ACCESSKEY" ;
public static final String HWY_OBS_ENDPOINT ="HWY_OBS_ENDPOINT" ;
public static final String HWY_OBS_BUCKET ="HWY_OBS_BUCKET" ;
- public static final String FTP ="FTP" ;
- public static final String FTP_HOST ="FTP_HOST" ;
- public static final String FTP_PORT ="FTP_PORT" ;
- public static final String FTP_USERNAME ="FTP_USERNAME" ;
- public static final String FTP_PWD ="FTP_PWD" ;
- public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
- public static final String FTP_LOCAL_RESOURCE_PATH ="FTP_LOCAL_RESOURCE_PATH" ;
+ public static final String RESOURCE_PATH ="RESOURCE_PATH" ;
public static final String QYWX_CORPID = "QYWX_CORPID";
public static final String QYWX_SECRET = "QYWX_SECRET";
public static final String QYWX_TOKEN = "QYWX_TOKEN";
@@ -61,6 +55,9 @@
public static final Integer FOUR = 4;
public static final Integer SIX = 6;
public static final Integer FIVE = 5;
+ public static final String INENTITY_FILES = "INENTITY_FILES";
+ public static final String MEMBER_FILES = "MEMBER_FILES";
+ public static final String CATEGORY_FILES = "CATEGORY_FILES";
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
index 2974faf..2177307 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
@@ -11,6 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 浼氬憳韬唤璁よ瘉淇℃伅琛�
@@ -120,4 +121,7 @@
@ApiModelProperty(value = "鍥剧墖鍓嶇紑")
@TableField(exist = false)
private String prefix;
+ @ApiModelProperty(value = "鍥剧墖闆嗗悎")
+ @TableField(exist = false)
+ private List<String> imgList;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index a47edc6..636a093 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -37,7 +37,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -46,7 +45,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@@ -63,12 +61,10 @@
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
@ExcelColumn(name="寮�濮嬫椂闂� yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
@ExcelColumn(name="缁撴潫鏃堕棿 yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
@@ -181,7 +177,6 @@
@ApiModelProperty(value = "鎺ュ崟鏃堕棿")
@ExcelColumn(name="鎺ュ崟鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date acceptTime;
@ApiModelProperty(value = "鎺ュ崟浜�", example = "1")
@@ -194,12 +189,10 @@
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date workStartTime;
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
@ExcelColumn(name="瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date finishTime;
@ApiModelProperty(value = "骞冲彴鎻愭垚姣斾緥", example = "1")
@@ -224,7 +217,6 @@
@ApiModelProperty(value = "璇勪环鏃堕棿")
@ExcelColumn(name="璇勪环鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date commentTime;
@ApiModelProperty(value = "璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�", example = "1")
@@ -233,7 +225,6 @@
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelTime;
@ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱", example = "1")
diff --git a/server/services/src/main/java/com/doumee/dao/system/model/SystemDictData.java b/server/services/src/main/java/com/doumee/dao/system/model/SystemDictData.java
index 80a7813..ccd9773 100644
--- a/server/services/src/main/java/com/doumee/dao/system/model/SystemDictData.java
+++ b/server/services/src/main/java/com/doumee/dao/system/model/SystemDictData.java
@@ -27,7 +27,6 @@
private Integer id;
@ApiModelProperty(value = "鎵�灞炲瓧鍏�", example = "1")
- @NotNull(message = "鎵�灞炲瓧鍏镐笉鑳戒负绌�", groups = {Constants.OperaType.Create.class, Constants.OperaType.Update.class})
private Integer dictId;
@ApiModelProperty(value = "鏁版嵁鍊�")
diff --git a/server/services/src/main/java/com/doumee/service/business/IdentityInfoService.java b/server/services/src/main/java/com/doumee/service/business/IdentityInfoService.java
index e7b811c..f5595ff 100644
--- a/server/services/src/main/java/com/doumee/service/business/IdentityInfoService.java
+++ b/server/services/src/main/java/com/doumee/service/business/IdentityInfoService.java
@@ -99,4 +99,6 @@
IdentityInfo findByMemberType(Integer type,Integer memberId);
void updateLocation(IdentityInfo identityInfo);
+
+ List<IdentityInfo> findMemberList(IdentityInfo pageWrap);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
index f7095cb..d1b698e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
@@ -1,5 +1,8 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -7,17 +10,21 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.IdentityInfoMapper;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.IdentityInfo;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.IdentityInfoService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -32,6 +39,10 @@
@Autowired
private IdentityInfoMapper identityInfoMapper;
+ @Autowired
+ private MemberMapper memberMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(IdentityInfo identityInfo) {
@@ -192,6 +203,58 @@
}
@Override
+ public List<IdentityInfo> findMemberList(IdentityInfo identityInfo) {
+ if(identityInfo.getMemberId() == null){
+ return new ArrayList<>();
+ }
+ Member member = memberMapper.selectById(identityInfo.getMemberId());
+ if(identityInfo == null || Constants.equalsInteger(member.getDeleted(),Constants.ONE)){
+ return new ArrayList<>();
+ }
+ List<IdentityInfo> list = new ArrayList<>();
+
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INENTITY_FILES).getCode();
+ //绫诲瀷:0=鐢ㄥ伐韬唤锛�1=璐ц繍韬唤锛�2=渚涢韬唤锛�
+ if(!Constants.equalsInteger(member.getWorkerIdentity(),Constants.ZERO)){//鐢ㄥ伐韬唤
+ addMemberModelByType(member.getId(),Constants.ZERO,list,path);
+ }
+ if(!Constants.equalsInteger(member.getDriverIdentity(),Constants.ZERO)){//璐ц繍韬唤
+ addMemberModelByType(member.getId(),Constants.ONE,list,path);
+ }
+ if(!Constants.equalsInteger(member.getChefIdentity(),Constants.ZERO)){//渚涢寰堢矇
+ addMemberModelByType(member.getId(),Constants.TWO,list,path);
+ }
+
+ return list;
+ }
+
+ private void addMemberModelByType(Integer id,Integer type, List<IdentityInfo> list,String path) {
+ LambdaQueryWrapper<IdentityInfo> wrapper = new LambdaQueryWrapper<IdentityInfo>()
+ .orderByDesc(IdentityInfo::getCreateTime )//鍙栨渶鏂颁竴鏉�
+ .eq(IdentityInfo::getMemberId,id)
+ .eq(IdentityInfo::getType,type)
+ .eq(IdentityInfo::getDeleted,Constants.ZERO)
+ .last("limit 1");
+ IdentityInfo model = identityInfoMapper.selectOne(wrapper);
+ if(model !=null){
+ if(StringUtils.isNotBlank(model.getImg1())){
+ model.setImg1(path+model.getImg1());
+ }
+ if(StringUtils.isNotBlank(model.getImg2())){
+ model.setImg1(path+model.getImg2());
+ }
+ if(StringUtils.isNotBlank(model.getImg3())) {
+ model.setImg1(path + model.getImg3());
+ }
+ if(StringUtils.isNotBlank(model.getImg4())){
+ model.setImg1(path+model.getImg4());
+ }
+ list.add(model);
+ }
+ }
+
+ @Override
public PageData<IdentityInfo> findPage(PageWrap<IdentityInfo> pageWrap) {
IPage<IdentityInfo> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<IdentityInfo> queryWrapper = new QueryWrapper<>();
--
Gitblit v1.9.3