From 056ed00799018426f21837c88a3e3abcd3c90d30 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 03 四月 2024 19:01:14 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java | 2 ++
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 3 +++
company/src/components/business/UnionChangeDetails.vue | 11 +++++++++--
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 1 +
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/company/src/components/business/UnionChangeDetails.vue b/company/src/components/business/UnionChangeDetails.vue
index d6d8408..c1fb079 100644
--- a/company/src/components/business/UnionChangeDetails.vue
+++ b/company/src/components/business/UnionChangeDetails.vue
@@ -35,8 +35,12 @@
<div class="box_table">
<div class="box_table_head box_table_content">
<div class="box_table_head_item" style=" flex: 1;border-bottom: 0px">琚繚闄╀汉</div>
- <div class="box_table_content_item box_table_content_header" style=" flex: 7;">{{ apply.companyNames }}</div>
- </div>
+ <div class="box_table_content_item box_table_content_header" style=" flex: 7;">
+ <p v-for="(item, index) in companyList" :key="index" >
+ {{index>0?'锛�':''}} {{ item[1]}}
+ </p>
+ </div>
+ </div>
</div>
<div class="box_table" v-if="addList && addList.length>0">
<div class="box_table_head">
@@ -125,6 +129,7 @@
type:0,
delList:[],
addList:[],
+ companyList:new Map(),
// 琛ㄥ崟鏁版嵁
form: {
id: null,
@@ -174,7 +179,9 @@
this.addList=[]
getChangeDetailList({unionChangeId: this.model.id})
.then(res => {
+ var index =0
res.forEach(item1 => {
+ this.companyList.set(item1.companyId, item1.companyName)
if (item1.type == 1) {
this.delList.push(item1);
} else {
diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index cb80484..79aef73 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -358,6 +358,7 @@
style.setVerticalAlignment(VerticalAlignment.CENTER);
// 璁剧疆鑳屾櫙
style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+ style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
// 瀛椾綋
Font font = workbook.createFont();
font.setFontHeightInPoints((short)12);
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
index 127994e..0e89d62 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
@@ -150,6 +150,9 @@
@ApiModelProperty(value = "鍛樺伐浼佷笟鍚嶇О")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "鍛樺伐浼佷笟缂栫爜")
+ @TableField(exist = false)
+ private Integer companyId;
@ApiModelProperty(value = "骞撮緞")
@TableField(exist = false)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java
index 768ce06..c266424 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChagneDetailServiceImpl.java
@@ -99,6 +99,7 @@
queryWrapper.select("t4.name",ApplyChagneDetail::getOldWorkTypeName);
queryWrapper.select("t5.name",ApplyChagneDetail::getOldDuName);
queryWrapper.selectAs(Company::getName,ApplyChagneDetail::getCompanyName);
+ queryWrapper.selectAs(Company::getId,ApplyChagneDetail::getCompanyId);
queryWrapper.selectAs(Member::getName,ApplyChagneDetail::getMemberName);
queryWrapper.selectAs(Member::getSex,ApplyChagneDetail::getSex);
queryWrapper.selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo);
@@ -193,6 +194,7 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(ApplyChagneDetail.class);
queryWrapper.selectAs(Company::getName,ApplyChagneDetail::getCompanyName);
+ queryWrapper.selectAs(Company::getId,ApplyChagneDetail::getCompanyId);
queryWrapper.select("t2.name",ApplyChagneDetail::getWorkTypeName);
queryWrapper.select("t3.name",ApplyChagneDetail::getDuName);
queryWrapper.select("t4.name",ApplyChagneDetail::getOldWorkTypeName);
--
Gitblit v1.9.3