From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/enterprise/onlineReporting.vue | 16 ++++----
company/src/components/business/OperaWtbApplyShopWindow.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 4 +-
server/shop/src/main/resources/application.yml | 2
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 6 +-
company/.env.developmentCom | 8 +--
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 2 +
server/platform/src/main/resources/application.yml | 2
server/company/src/main/resources/application.yml | 2
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 12 +++---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java | 3 +
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 10 ++++
12 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 77ad9b7..820a72d 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -11,10 +11,8 @@
# VUE_APP_API = 'http://localhost:10031/'
-<<<<<<< HEAD
# VUE_APP_API = 'http://192.168.0.138:10031/'
-=======
-VUE_APP_API = 'http://192.168.0.138:10031/'
->>>>>>> 5337d6006b45ca61881623ad2e8738e03ad3bde2
-VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
+VUE_APP_API = 'http://192.168.0.129:10031/'
+
+# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 3ea73c1..99f3bbe 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -18,7 +18,7 @@
</div>
<div class="desc_item_label">
<div class="desc_item_label_left">
- <span>鎶曚繚浜猴細{{ model.shopName }}</span>
+ <span>濮旀墭浜猴細{{ model.shopName }}</span>
<span>琚繚闄╀汉锛歿{ model.companyName }}</span>
<span>淇濆崟鐘舵�侊細
<span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span>
diff --git a/company/src/components/enterprise/onlineReporting.vue b/company/src/components/enterprise/onlineReporting.vue
index 93d7e80..72bbc48 100644
--- a/company/src/components/enterprise/onlineReporting.vue
+++ b/company/src/components/enterprise/onlineReporting.vue
@@ -231,7 +231,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 1)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 1)" />
</div>
</div>
<div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -259,7 +259,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 2)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 2)" />
</div>
</div>
<div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -287,7 +287,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 3)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 3)" />
</div>
</div>
<div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -315,7 +315,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 4)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 4)" />
</div>
</div>
<div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -343,7 +343,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 5)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 5)" />
</div>
</div>
</div>
@@ -360,17 +360,17 @@
</div>
<div class="box_desc_list">
<div class="box_desc_list_row">
- <el-form-item label="鏀舵閾惰" prop="receiveBank">
+ <el-form-item label="鏀舵閾惰" :prop="userInfo.type === 1 ? '' : 'receiveBank'">
<el-input v-model="form.receiveBank" placeholder="璇疯緭鍏ユ敹娆鹃摱琛屾敮琛屽悕绉�"></el-input>
</el-form-item>
</div>
<div class="box_desc_list_row">
- <el-form-item label="鏀舵浜�" prop="receiveUserName">
+ <el-form-item label="鏀舵浜�" :prop="userInfo.type === 1 ? '' : 'receiveUserName'">
<el-input v-model="form.receiveUserName" placeholder="璇疯緭鍏ュ紑鎴峰鍚�"></el-input>
</el-form-item>
</div>
<div class="box_desc_list_row">
- <el-form-item label="鏀舵璐﹀彿" prop="receiveAccount">
+ <el-form-item label="鏀舵璐﹀彿" :prop="userInfo.type === 1 ? '' : 'receiveAccount'">
<el-input v-model="form.receiveAccount" placeholder="璇疯緭鍏ラ摱琛岃处鍙�"></el-input>
</el-form-item>
</div>
diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index dba634a..2107f6a 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -12,7 +12,7 @@
# application:git
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index 368c575..781f762 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
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 c9ce1a1..eb55e1a 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
@@ -1199,7 +1199,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("琚繚闄╀汉");
header1.createCell(3).setCellValue("");
@@ -1351,7 +1351,7 @@
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,6));
Row header1 = sheet.createRow(1);
header1.setHeight((short) 500);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("琚繚闄╀汉");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
@@ -1459,7 +1459,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("");
@@ -1623,7 +1623,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("淇濋櫓鏂规");
header1.createCell(2).setCellValue("淇濆崟鍙�");
header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
@@ -1847,7 +1847,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("淇濋櫓鏂规");
header1.createCell(2).setCellValue("淇濆崟鍙�");
header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
@@ -2016,7 +2016,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浜�");
+ header1.createCell(0).setCellValue("濮旀墭浜�");//鎶曚繚浜�
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("");
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
index df0bc26..da7f082 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
@@ -251,8 +251,8 @@
queryWrapper.le(StringUtils.isNotBlank(applyDetailPageDTO.getStartTimeE()),ApplyDetail::getStartTime,applyDetailPageDTO.getStartTimeE()+" 23:59:59.0");
queryWrapper.ge(StringUtils.isNotBlank(applyDetailPageDTO.getEndTimeS()),ApplyDetail::getEndTime,applyDetailPageDTO.getEndTimeS()+" 00:00:00.0");
queryWrapper.le(StringUtils.isNotBlank(applyDetailPageDTO.getEndTimeE()),ApplyDetail::getEndTime,applyDetailPageDTO.getEndTimeE()+" 23:59:59.0");
- queryWrapper.ge(Objects.nonNull(applyDetailPageDTO.getIsExcel())&&Constants.equalsInteger(applyDetailPageDTO.getIsExcel(),Constants.ONE),
- ApplyDetail::getEndTime,DateUtil.getPlusTime2(new Date()));
+// queryWrapper.ge(Objects.nonNull(applyDetailPageDTO.getIsExcel())&&Constants.equalsInteger(applyDetailPageDTO.getIsExcel(),Constants.ONE),
+// ApplyDetail::getEndTime,DateUtil.getPlusTime2(new Date()));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageWrap.getSorts())){
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index ed874fd..68d4c4f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -40,6 +40,8 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -573,9 +575,15 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒板伐绉嶄俊鎭�");
}
}
-
+ //String pattern = "^[\\u4e00-\\u9fa5\\d路]+$";
+ String pattern = "^[\\u4e00-\\u9fa5路]*$";
+ Pattern r = Pattern.compile(pattern);
index = Constants.TWO;
for(MemberImport model : dataList){
+ Matcher m = r.matcher(model.getName());
+ if (!m.matches()) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝"+model.getName() + "濮撳悕鏃犳晥锛岃妫�鏌ュ悗閲嶈瘯");
+ }
//妫�鏌ユ淳閬ｅ崟浣嶅拰宸ョ鏈夋晥鎬�
dealDuAndWorktype(model,index,dispatchUnitList,solutions,solutionWorktypeList);
index += 1;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 0a0aa04..02352b7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -1364,9 +1364,9 @@
||Objects.isNull(settleClaimsDTO.getMedicalInsurance())
||StringUtils.isBlank(settleClaimsDTO.getInformantName())
||StringUtils.isBlank(settleClaimsDTO.getInformantPhone())
- ||StringUtils.isBlank(settleClaimsDTO.getReceiveUserName())
- ||StringUtils.isBlank(settleClaimsDTO.getReceiveBank())
- ||StringUtils.isBlank(settleClaimsDTO.getReceiveAccount())
+// ||StringUtils.isBlank(settleClaimsDTO.getReceiveUserName())
+// ||StringUtils.isBlank(settleClaimsDTO.getReceiveBank())
+// ||StringUtils.isBlank(settleClaimsDTO.getReceiveAccount())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
index 8a6ae4f..5641958 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
@@ -444,11 +444,14 @@
@Override
public List<SolutionsBase> findList(SolutionsBase solutionsBase) {
QueryWrapper<SolutionsBase> wrapper = new QueryWrapper<>();
+ wrapper.lambda().select(SolutionsBase::getId,SolutionsBase::getName);
wrapper.lambda().eq(SolutionsBase::getDataType,Constants.ZERO);
wrapper.lambda().eq(SolutionsBase::getIsdeleted,Constants.ZERO);
return solutionsBaseMapper.selectList(wrapper);
}
+
+
@Override
public PageData<SolutionsBase> findPage(PageWrap<SolutionsBase> pageWrap) {
IPage<SolutionsBase> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index 1991698..e8604ac 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -346,6 +346,7 @@
.eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey()));
Multifile file = solutions.getFanganFile();
+ file.setId(null);
file.setIsdeleted(Constants.ZERO);
file.setCreateDate(solutions.getEditDate());
file.setCreator(solutions.getEditor());
@@ -353,6 +354,7 @@
file.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey());
file.setType(Constants.formatIntegerNum(file.getType()));
multifileMapper.insert(file);
+ file.setId(null);
file.setObjId(newModel.getId());
multifileMapper.insert(file);
diff --git a/server/shop/src/main/resources/application.yml b/server/shop/src/main/resources/application.yml
index 0252e02..b5c9b1e 100644
--- a/server/shop/src/main/resources/application.yml
+++ b/server/shop/src/main/resources/application.yml
@@ -12,7 +12,7 @@
# application:git
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3