From 3cea15af53d4eb5fb9ccdd1b7a31ec494ba41d6c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 四月 2025 09:37:28 +0800
Subject: [PATCH] 代码初始化
---
admin/src/views/business/companyMember.vue | 9 ++++++++-
server/src/main/java/com/doumee/dao/business/model/Member.java | 3 +++
server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 12 ++++++++++--
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 4 ++--
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/companyMember.vue b/admin/src/views/business/companyMember.vue
index f189d83..a2ce228 100644
--- a/admin/src/views/business/companyMember.vue
+++ b/admin/src/views/business/companyMember.vue
@@ -46,7 +46,14 @@
</template>
</el-table-column>
<el-table-column prop="email" label="閭" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px">
+ <template slot-scope="{row}">
+ <div v-if="row.companyNameList && row.companyNameList.length">
+ <div v-for="item in row.companyNameList" :key="item.id" style="display: block;margin-right: 20px">{{item}}
+ </div>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
</el-table>
diff --git a/server/src/main/java/com/doumee/dao/business/model/Member.java b/server/src/main/java/com/doumee/dao/business/model/Member.java
index 25026fc..eaf3d88 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Member.java
@@ -104,5 +104,8 @@
@ApiModelProperty(value = "鐢ㄦ埛鎵�灞炵粍缁囬泦鍚�")
@TableField(exist = false)
private List<Company> companyList;
+ @ApiModelProperty(value = "鐢ㄦ埛鎵�灞炵粍缁囧悕绉伴泦鍚�")
+ @TableField(exist = false)
+ private String[] companyNameList;
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index d0dea26..33954ea 100644
--- a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -208,7 +208,15 @@
queryWrapper.exists(pageWrap.getModel().getCompanyId()!=null,"select (cm.id) from company_member cm where cm.company_id='"+pageWrap.getModel().getCompanyId()+"' and cm.member_id=t.id");
}
queryWrapper.orderByAsc(Member::getCreateDate);
- return PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
+ PageData<Member> record = PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
+ if(record!=null && record.getRecords()!=null){
+ for(Member m : record.getRecords()){
+ if(StringUtils.isNotBlank(m.getCompanyName())){
+ m.setCompanyNameList(m.getCompanyName().split(","));
+ }
+ }
+ }
+ return record;
}
@Override
@@ -278,7 +286,7 @@
if(StringUtils.isNotBlank(comNames)){
comNames += ",";
}
- comNames += c.getName();
+ comNames += c.getNamePath();
}
}
cm.setCompanyList(qycom);
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 803815e..cfad8ac 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -956,9 +956,9 @@
private Map<String, String> getEmailContentFormByModel(Workorder workorder) {
Map<String, String> map = new LinkedHashMap<>();
- map.put("涓婃姤浜�",workorder.getMemberName()+"/" +workorder.getCompanyName());
+ map.put("涓婃姤浜�",workorder.getCompanyName()+"/" +workorder.getMemberName());
map.put("涓婃姤鏃堕棿",DateUtil.getPlusTime2(workorder.getSubmitDate()));
- map.put("浜嬩欢鍙戠敓鏃堕棿/鍦扮偣",DateUtil.getPlusTime2(workorder.getHappenTime())+"/"+workorder.getLocationName());
+ map.put("浜嬩欢鍙戠敓鏃堕棿/鍦扮偣",DateUtil.getPlusTime2(workorder.getHappenTime())+" / "+workorder.getLocationName());
map.put("浼ゅ绫诲瀷", workorder.getTypeName());
map.put("鏄惁澶栭儴灏卞尰", Constants.equalsInteger(workorder.getOutJiuyi(),Constants.ONE)?"鏄�":"鍚�");
map.put("鏄惁鍖诲姟瀹�", Constants.equalsInteger(workorder.getIsYiwushi(),Constants.ONE)?"鏄�":"鍚�");
--
Gitblit v1.9.3