From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 15:17:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 26 +++++++++++++
server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java | 2 +
server/service/src/main/java/com/doumee/core/utils/Constants.java | 3 +
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 42 ++++++++++++++++++++
server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java | 4 -
server/service/src/main/java/com/doumee/dao/business/join/SettleClaimsLogJoinMapper.java | 13 ++++++
server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java | 8 ++++
7 files changed, 93 insertions(+), 5 deletions(-)
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 f3ecd19..9b59586 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
@@ -85,8 +85,6 @@
}
-
-
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:settleclaims:query")
@@ -105,6 +103,6 @@
@GetMapping("/{id}")
@RequiresPermissions("business:settleclaims:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(settleClaimsService.findById(id));
+ return ApiResponse.success(settleClaimsService.getSettleClaimsDetail(id));
}
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index c6d746e..d80f3b3 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -958,7 +958,6 @@
-//3=閫�鍥炵敵璇凤紱4=骞冲彴瀹℃壒閫氳繃锛�0=瀹℃壒椹冲洖;5=骞冲彴瀹℃壒椹冲洖
public enum ApplyChangeLogStatus {
UPLOAD(0, "鍙戣捣鐢宠"),
RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�"),
@@ -1005,6 +1004,8 @@
}
+
+
public enum ProjectRecord {
COM_EDITING(0, "浼佷笟淇濆瓨鏁版嵁", "鐢� ${param2} ${param3}淇濆瓨鎴愬姛锛屽綋鍓嶈繘搴︿负 銆�${param4}銆�"),
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/SettleClaimsLogJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/SettleClaimsLogJoinMapper.java
new file mode 100644
index 0000000..453cfed
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/join/SettleClaimsLogJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.SettleClaimsLog;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+public interface SettleClaimsLogJoinMapper extends MPJJoinMapper<SettleClaimsLog> {
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
index 64d05c3..430055a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -152,4 +152,30 @@
@TableField(exist = false)
private List<Multifile> reportFileList;
+ @ApiModelProperty(value = "鍛樺伐鍏崇郴璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> relationFileList;
+
+ @ApiModelProperty(value = "闂ㄨ瘖璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> outpatientFileList;
+
+ @ApiModelProperty(value = "浣忛櫌璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> hospitalFileList;
+
+ @ApiModelProperty(value = "浼ゆ畫璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> disabilityFileList;
+
+ @ApiModelProperty(value = "璧斾粯缁撴璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> compensationFileList;
+
+ @ApiModelProperty(value = "鏃ュ織鍒楄〃")
+ @TableField(exist = false)
+ List<SettleClaimsLog> settleClaimsLogList;
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
index 4693bee..f03388e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -79,4 +80,11 @@
@ExcelColumn(name="鎿嶄綔鍚庡唴瀹�")
private String afterContent;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�", example = "1")
+ @TableField(exist = false)
+ private String creatorName;
+
+ @ApiModelProperty(value = "鍏徃鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String companyName;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java b/server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java
index 0877c91..26a06f6 100644
--- a/server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java
@@ -109,4 +109,6 @@
* @return long
*/
long count(SettleClaims settleClaims);
+
+ SettleClaims getSettleClaimsDetail(Integer id);
}
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 4846864..dd31f43 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
@@ -12,6 +12,7 @@
import com.doumee.dao.business.SettleClaimsMapper;
import com.doumee.dao.business.dto.SCSupplementDTO;
import com.doumee.dao.business.join.SettleClaimsJoinMapper;
+import com.doumee.dao.business.join.SettleClaimsLogJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
@@ -28,6 +29,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鐞嗚禂鐢宠琛⊿ervice瀹炵幇
@@ -48,6 +50,9 @@
@Autowired
private SettleClaimsJoinMapper settleClaimsJoinMapper;
+
+ @Autowired
+ private SettleClaimsLogJoinMapper settleClaimsLogJoinMapper;
@Override
public Integer create(SettleClaims settleClaims) {
@@ -109,16 +114,51 @@
}
+ @Override
public SettleClaims getSettleClaimsDetail(Integer id){
SettleClaims settleClaims = settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,new MPJLambdaWrapper<SettleClaims>()
.selectAll(SettleClaims.class)
.leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
-
+ .leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
+ .eq(SettleClaims::getId,id)
+ .last(" limit 1 ")
);
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
+ .lambda().eq(Multifile::getObjId,id)
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Multifile::getCreateDate)
+ );
+ if(CollectionUtils.isNotEmpty(multifileList)){
+ settleClaims.setReportFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SGXC_FILE.getKey())).collect(Collectors.toList()));
+ settleClaims.setRelationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_YGGX_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setOutpatientFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_MZCL_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setHospitalFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_ZYCL_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setDisabilityFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SCZL_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setCompensationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_JACL_FILE.getKey())).collect(Collectors.toList()));
+
+ }
+
+ //鏌ヨ鎿嶄綔璁板綍
+ List<SettleClaimsLog> settleClaimsLogList = settleClaimsLogJoinMapper.selectJoinList(SettleClaimsLog.class,
+ new MPJLambdaWrapper<SettleClaimsLog>()
+ .selectAll(SettleClaimsLog.class)
+ .selectAs(Member::getName,SettleClaimsLog::getCreatorName)
+ .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
+ .leftJoin(Member.class,Member::getId,SettleClaimsLog::getCreator)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+ .orderByAsc(SettleClaimsLog::getCreateDate)
+ );
+
+ settleClaims.setSettleClaimsLogList(settleClaimsLogList);
return settleClaims;
}
--
Gitblit v1.9.3