From 75ab4754b8fb7a79b8da134c6aaa6e7b05b5b325 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 10:10:08 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 19 +++++++++++++++++--
company/src/views/business/settleClaims.vue | 5 +++++
server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java | 2 +-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/company/src/views/business/settleClaims.vue b/company/src/views/business/settleClaims.vue
index cdbbfe2..ff71af1 100644
--- a/company/src/views/business/settleClaims.vue
+++ b/company/src/views/business/settleClaims.vue
@@ -5,6 +5,9 @@
<el-form-item label="鍛樺伐濮撳悕" prop="memberName">
<el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
+ <el-form-item label="韬唤璇�" prop="memberIdcardNo">
+ <el-input v-model="searchForm.memberIdcardNo" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
<el-form-item label="鎶ユ鍗曚綅" prop="companyId" v-if="userInfo.type === 0">
<el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
<el-option
@@ -55,6 +58,7 @@
<el-table-column prop="reportNum" label="鎶ユ鍙�" min-width="100px"></el-table-column>
<el-table-column prop="companyName" label="鎶ユ浼佷笟" min-width="100px"></el-table-column>
<el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="100px"></el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="duName" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
<el-table-column prop="worktypeName" label="鎵�灞炲伐绉�" min-width="100px"></el-table-column>
@@ -112,6 +116,7 @@
companyId: '',
duName: '',
memberName:'',
+ memberIdcardNo:'',
status: '',
informantName: ''
}
diff --git a/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java b/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
index 768d4a7..6e2d2fa 100644
--- a/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
@@ -107,7 +107,7 @@
}
@ApiOperation("鍒犻櫎闄勪欢")
@GetMapping("/delFile/{id}/{fileId}")
- @RequiresPermissions("business:settleclaims:query")
+ @RequiresPermissions("business:settleclaims:update")
public ApiResponse delFile(@PathVariable(name = "id") Integer id,@PathVariable(name = "fileId") Integer fileId) {
return ApiResponse.success(settleClaimsService.delFile(id,fileId));
}
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 88de5eb..9175834 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
@@ -73,8 +73,21 @@
*/
@Override
public Integer delFile(Integer id,Integer fileId){
-
- return 0;
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ return multifileJoinMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .set(Multifile::getIsdeleted,Constants.ONE)
+ .set(Multifile::getEditDate,new Date())
+ .set(Multifile::getEditor,user.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjId,id)
+ .eq(Multifile::getId,fileId)
+ .in(Multifile::getObjType,Arrays.asList(new Integer[]{
+ Constants.MultiFile.LP_YGGX_FILE.getKey(),
+ Constants.MultiFile.LP_MZCL_FILE.getKey(),
+ Constants.MultiFile.LP_ZYCL_FILE.getKey(),
+ Constants.MultiFile.LP_SCZL_FILE.getKey(),
+ Constants.MultiFile.LP_JACL_FILE.getKey(),
+ })));
}
@Override
public Integer back(SettleClaims param){
@@ -706,6 +719,7 @@
.selectAs(Company::getName,SettleClaims::getCompanyName)
.selectAs(Solutions::getName,SettleClaims::getSolutionName)
.selectAs(Member::getName,SettleClaims::getMemberName)
+ .selectAs(Member::getIdcardNo,SettleClaims::getMemberIdcardNo)
.selectAs(Worktype::getName,SettleClaims::getWorktypeName)
.selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
.selectAs(DispatchUnit::getName,SettleClaims::getDuName)
@@ -728,6 +742,7 @@
pageWrap.getModel().setCompanyId(user.getCompanyId());
}
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName, pageWrap.getModel().getMemberName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberIdcardNo()),Member::getIdcardNo, pageWrap.getModel().getMemberIdcardNo());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDuName()),DispatchUnit::getName, pageWrap.getModel().getDuName());
queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId, pageWrap.getModel().getBaseSolutionId());
queryWrapper.eq(pageWrap.getModel().getBaseDuId()!=null,DispatchUnit::getBaseId, pageWrap.getModel().getBaseDuId());
--
Gitblit v1.9.3