From 8fa7cb630556f3670f8ea7b520e1c4858f5418ed Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 25 一月 2024 12:03:47 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java | 19 +++++++++
server/platform/src/main/java/com/doumee/api/common/PublicController.java | 9 +++-
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 17 ++++++++
server/company/src/main/java/com/doumee/api/business/CompanySolutionController.java | 1
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 4 +-
server/service/src/main/java/com/doumee/service/business/CompanySolutionService.java | 3 +
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 5 ++
server/platform/src/main/java/com/doumee/api/business/CompanySolutionController.java | 12 ++++++
8 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/CompanySolutionController.java b/server/company/src/main/java/com/doumee/api/business/CompanySolutionController.java
index b0915c3..f988bcd 100644
--- a/server/company/src/main/java/com/doumee/api/business/CompanySolutionController.java
+++ b/server/company/src/main/java/com/doumee/api/business/CompanySolutionController.java
@@ -74,6 +74,7 @@
return ApiResponse.success(companySolutionService.findPage(pageWrap));
}
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:companysolution:exportExcel")
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanySolutionController.java b/server/platform/src/main/java/com/doumee/api/business/CompanySolutionController.java
index b0915c3..cf96873 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanySolutionController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/CompanySolutionController.java
@@ -73,6 +73,18 @@
public ApiResponse<PageData<CompanySolution>> findPage (@RequestBody PageWrap<CompanySolution> pageWrap) {
return ApiResponse.success(companySolutionService.findPage(pageWrap));
}
+ @ApiOperation("鏌ヨ鍏ㄩ儴")
+ @PostMapping("/list")
+ @RequiresPermissions("business:companysolution:query")
+ public ApiResponse<List<CompanySolution>> findPage (@RequestBody CompanySolution pageWrap) {
+ return ApiResponse.success(companySolutionService.findList(pageWrap));
+ }
+ @ApiOperation("鏌ヨ浼佷笟鍏ㄩ儴鍏宠仈鏂规")
+ @PostMapping("/listForCompany")
+ @RequiresPermissions("business:companysolution:query")
+ public ApiResponse<List<CompanySolution>> findListForCompany (@RequestBody CompanySolution pageWrap) {
+ return ApiResponse.success(companySolutionService.findListForCompany(pageWrap));
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
diff --git a/server/platform/src/main/java/com/doumee/api/common/PublicController.java b/server/platform/src/main/java/com/doumee/api/common/PublicController.java
index b397b98..4904bc8 100644
--- a/server/platform/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/platform/src/main/java/com/doumee/api/common/PublicController.java
@@ -60,8 +60,9 @@
@ApiOperation("鍚涘瓙绛剧绾﹀洖璋冮�氱煡")
@PostMapping("/signNotify")
- public ApiResponse updateStatus(@RequestBody NotifyReq request) {
-
+ public void updateStatus(@RequestBody NotifyReq request,HttpServletResponse response) {
+ Map<String, Object> context = new HashMap<>();
+ context.put("success",true);
InterfaceLog log=new InterfaceLog();
log.setType(1);
log.setCreateDate(new Date());
@@ -85,12 +86,14 @@
insuranceApplyService.dealSignResult(request.getData());
}catch (Exception e){
log.setRepose("澶勭悊寮傚父锛�"+e.getMessage());
+ context.put("success",false);
+ context.put("msg","澶勭悊鍙戠敓寮傚父");
throw e;
}finally {
interfaceLogService.create(log);
}
- return ApiResponse.success(null);
+ writerJson(response, context);
}
@ApiOperation(value = "涓婁紶", notes = "涓婁紶", httpMethod = "POST", position = 6)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
index 33bf2ec..c634acc 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
@@ -65,8 +65,8 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
- @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攕olution_base锛�", example = "1")
- @ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攕olution_base锛�")
+ @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
+ @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛�")
private Integer solutionBaseId;
@ApiModelProperty(value = "鏄惁鍙姞淇� 0鍚� 1鏄�", example = "1")
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 1687cae..3a1d3d5 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
@@ -129,6 +129,23 @@
@ApiModelProperty(value = "鎶ユ浜哄鍚�")
@ExcelColumn(name="鎶ユ浜哄鍚�")
private String informantName;
+ @ApiModelProperty(value = "鍖荤枟鐞嗚禂")
+ @ExcelColumn(name="鍖荤枟鐞嗚禂")
+ private BigDecimal ylClaimAccount;
+ @ApiModelProperty(value = "璇伐鐞嗚禂")
+ @ExcelColumn(name="璇伐鐞嗚禂")
+ private BigDecimal wgClaimAccount;
+ @ApiModelProperty(value = "姝讳骸鐞嗚禂")
+ @ExcelColumn(name="姝讳骸鐞嗚禂")
+ private BigDecimal swClaimAccount;
+ @ApiModelProperty(value = "浼ゆ畫鐞嗚禂")
+ @ExcelColumn(name="浼ゆ畫鐞嗚禂")
+ private BigDecimal scClaimAccount;
+ @ApiModelProperty(value = "鐞嗚禂鎬婚")
+ @ExcelColumn(name="鐞嗚禂鎬婚")
+ private BigDecimal claimAccount;
+
+
@ApiModelProperty(value = "鎶ユ浜鸿仈绯绘柟寮�")
@ExcelColumn(name="鎶ユ浜鸿仈绯绘柟寮�")
diff --git a/server/service/src/main/java/com/doumee/service/business/CompanySolutionService.java b/server/service/src/main/java/com/doumee/service/business/CompanySolutionService.java
index 66191bb..81cf063 100644
--- a/server/service/src/main/java/com/doumee/service/business/CompanySolutionService.java
+++ b/server/service/src/main/java/com/doumee/service/business/CompanySolutionService.java
@@ -78,7 +78,8 @@
* @return List<CompanySolution>
*/
List<CompanySolution> findList(CompanySolution companySolution);
-
+ List<CompanySolution> findListForCompany(CompanySolution companySolution);
+
/**
* 鍒嗛〉鏌ヨ
*
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java
index 4c421b5..45572e8 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java
@@ -2,14 +2,18 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CompanySolutionMapper;
+import com.doumee.dao.business.join.CompanySolutionJoinMapper;
import com.doumee.dao.business.model.CompanySolution;
+import com.doumee.dao.business.model.Solutions;
import com.doumee.service.business.CompanySolutionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -24,6 +28,8 @@
@Service
public class CompanySolutionServiceImpl implements CompanySolutionService {
+ @Autowired
+ private CompanySolutionJoinMapper companySolutionJoinMapper;
@Autowired
private CompanySolutionMapper companySolutionMapper;
@@ -77,7 +83,18 @@
QueryWrapper<CompanySolution> wrapper = new QueryWrapper<>(companySolution);
return companySolutionMapper.selectOne(wrapper);
}
-
+ @Override
+ public List<CompanySolution> findListForCompany(CompanySolution companySolution) {
+ MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>();
+ csWrapper.selectAll(CompanySolution.class);
+ csWrapper.selectAs(Solutions::getName,CompanySolution::getSolutionName);
+ csWrapper.leftJoin(Solutions.class,Solutions::getId,CompanySolution::getSolutionBaseId);
+ csWrapper.eq(CompanySolution::getCompanyId,companySolution.getCompanyId());
+ csWrapper.eq(CompanySolution::getIsdeleted, Constants.ZERO);
+ csWrapper.eq(Solutions::getIsdeleted, Constants.ZERO);
+ csWrapper.orderByAsc(CompanySolution::getSortnum);
+ return companySolutionJoinMapper.selectJoinList(CompanySolution.class,csWrapper);
+ }
@Override
public List<CompanySolution> findList(CompanySolution companySolution) {
QueryWrapper<CompanySolution> wrapper = new QueryWrapper<>(companySolution);
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 af31cda..914e29c 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
@@ -218,6 +218,11 @@
update.setCheckUserId(user.getId());
update.setStatus(Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey());
update.setId(model.getId());
+ update.setYlClaimAccount(Constants.formatBigdecimal(param.getYlClaimAccount()));
+ update.setSwClaimAccount(Constants.formatBigdecimal(param.getSwClaimAccount()));
+ update.setWgClaimAccount(Constants.formatBigdecimal(param.getWgClaimAccount()));
+ update.setScClaimAccount(Constants.formatBigdecimal(param.getScClaimAccount()));
+ update.setClaimAccount(update.getYlClaimAccount().add(update.getSwClaimAccount()).add(update.getScClaimAccount()).add(update.getWgClaimAccount()));
settleClaimsMapper.updateById(update);
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_FINISH;
--
Gitblit v1.9.3