From ba5ffa8d8996f040860b67859c7453f4e0d7e4d1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 22 一月 2024 09:49:59 +0800
Subject: [PATCH] 调整
---
server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java | 18 ++--
server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java | 4
server/service/src/main/java/com/doumee/core/utils/Constants.java | 79 ++++++++++++++-----
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 54 +++++++++++++
server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 30 +++++++
server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java | 12 ++
6 files changed, 163 insertions(+), 34 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java b/server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java
index b82980d..db2c56a 100644
--- a/server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java
@@ -66,20 +66,20 @@
applyChagneDetailService.updateById(applyChagneDetail);
return ApiResponse.success(null);
}
+//
+// @ApiOperation("鍒嗛〉鏌ヨ")
+// @PostMapping("/page")
+// @RequiresPermissions("business:applychagnedetail:query")
+// public ApiResponse<PageData<ApplyChagneDetail>> findPage (@RequestBody PageWrap<ApplyChagneDetail> pageWrap) {
+// return ApiResponse.success(applyChagneDetailService.findPage(pageWrap));
+// }
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("business:applychagnedetail:query")
- public ApiResponse<PageData<ApplyChagneDetail>> findPage (@RequestBody PageWrap<ApplyChagneDetail> pageWrap) {
- return ApiResponse.success(applyChagneDetailService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
+/* @ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:applychagnedetail:exportExcel")
public void exportExcel (@RequestBody PageWrap<ApplyChagneDetail> pageWrap, HttpServletResponse response) {
ExcelExporter.build(ApplyChagneDetail.class).export(applyChagneDetailService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇锋槑缁嗕俊鎭〃", response);
- }
+ }*/
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
diff --git a/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java b/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java
index 8699678..815dd8a 100644
--- a/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java
@@ -67,7 +67,7 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ /* @ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:applydetail:query")
public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetail> pageWrap) {
@@ -79,7 +79,7 @@
@RequiresPermissions("business:applydetail:exportExcel")
public void exportExcel (@RequestBody PageWrap<ApplyDetail> pageWrap, HttpServletResponse response) {
ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPage(pageWrap).getRecords(), "鎶曚繚鐢宠鏄庣粏淇℃伅琛�", response);
- }
+ }*/
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
diff --git a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 3b79d89..142ea09 100644
--- a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -39,6 +39,36 @@
public ApiResponse create(@RequestBody InsuranceApply insuranceApply) {
return ApiResponse.success(insuranceApplyService.create(insuranceApply));
}
+ @ApiOperation("骞冲彴鎶曚繚瀹℃牳")
+ @PostMapping("/check")
+ @RequiresPermissions("business:insuranceapply:check")
+ public ApiResponse check(@RequestBody InsuranceApply insuranceApply) {
+ return ApiResponse.success(insuranceApplyService.check(insuranceApply));
+ }
+ @ApiOperation("骞冲彴閫�鍥炴姇淇�")
+ @PostMapping("/back")
+ @RequiresPermissions("business:insuranceapply:back")
+ public ApiResponse back(@RequestBody InsuranceApply insuranceApply) {
+ return ApiResponse.success(insuranceApplyService.back(insuranceApply));
+ }
+ @ApiOperation("骞冲彴涓婁紶鎶曚繚鍗�")
+ @PostMapping("/uploadToubaodan")
+ @RequiresPermissions("business:insuranceapply:uploadToubaodan")
+ public ApiResponse uploadToubaodan(@RequestBody InsuranceApply insuranceApply) {
+ return ApiResponse.success(insuranceApplyService.uploadToubaodan(insuranceApply));
+ }
+ @ApiOperation("骞冲彴涓婁紶淇濋櫓鍗�")
+ @PostMapping("/uploadBaoxiandan")
+ @RequiresPermissions("business:insuranceapply:uploadBaoxiandan")
+ public ApiResponse uploadBaoxiandan(@RequestBody InsuranceApply insuranceApply) {
+ return ApiResponse.success(insuranceApplyService.uploadBaoxiandan(insuranceApply));
+ }
+ @ApiOperation("骞冲彴椹冲洖閫�鍗曠敵璇�")
+ @PostMapping("/refuseBackApply")
+ @RequiresPermissions("business:insuranceapply:refuseBackApply")
+ public ApiResponse refuseBackApply(@RequestBody InsuranceApply insuranceApply) {
+ return ApiResponse.success(insuranceApplyService.refuseBackApply(insuranceApply));
+ }
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{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 d25517c..820e961 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
@@ -609,24 +609,27 @@
public enum ApplyLogType {
- UPLOAD(0, "鎻愪氦鎶曚繚鐢宠"),
- PLATFORM_RETURN(1, "骞冲彴閫�鍥炰繚鍗�"),
- WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�"),
- SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�"),
- FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�"),
- UPLOAD_INSURANCE(5, "宸蹭笂浼犱繚鍗�"),
- COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�"),
- COMPANY_APPLY_CLOSE(7, "浼佷笟鍏抽棴鐢宠"),
- PLATFORM_AGREE(8, "骞冲彴鍚屾剰浼佷笟閫�鍥炵敵璇�"),
- PLATFORM_UN_AGREE(9, "骞冲彴鎷掔粷浼佷笟閫�鍥炵敵璇�"),
+ UPLOAD(0, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_RETURN(1, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ WAIT_SIGNATURE(2, "涓婁紶鎶曚繚鍗�","鎻愪氦鎰忚锛�${param}"),
+ SIGNATURE(3, "浼佷笟绛剧珷",""),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}"),
+ COMPANY_APPLY_RETURN(6, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_APPLY_CLOSE(7, "鍏抽棴鐢宠",""),
+ PLATFORM_AGREE_BACK(8, "鍚屾剰閫�鍥炵敵璇�",""),
+ PLATFORM_UN_AGREE_BACK(9, "椹冲洖閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}"),
;
// 鎴愬憳鍙橀噺
private String name;
+ private String info;
private int key;
// 鏋勯�犳柟娉�
- ApplyLogType(int key, String name) {
+ ApplyLogType(int key, String name,String info) {
this.name = name;
+ this.info = info;
this.key = key;
}
@@ -635,6 +638,14 @@
for (ApplyLogType c : ApplyLogType.values()) {
if (c.getKey() == index) {
return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getKey() == index) {
+ return c.info;
}
}
return null;
@@ -657,34 +668,51 @@
this.key = key;
}
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
}
public enum InsuranceApplyStatus {
- UPLOAD(0, "鎻愪氦鎶曚繚鐢宠"),
- PLATFORM_RETURN(1, "骞冲彴閫�鍥炰繚鍗�"),
- WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�"),
- SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�"),
- FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�"),
- UPLOAD_INSURANCE(5, "宸蹭笂浼犱繚鍗�"),
- COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�"),
- PLATFORM_AGREE(7, "骞冲彴鍚屾剰閫�鍥�"),
- CLOSE(8, "璁㈠崟鍏抽棴"),
+ UPLOAD(0, "鎻愪氦鎶曚繚",""),
+ PLATFORM_RETURN(1, "瀹℃牳涓嶉�氳繃","鎻愪氦鎰忚锛�${param}"),
+ WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�",""),
+ SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�",""),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�",""),
+ UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param}鍙樻洿涓�${param1}"),
+ COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_AGREE(7, "骞冲彴鍚屾剰閫�鍥�",""),
+ CLOSE(8, "璁㈠崟鍏抽棴",""),
;
// 鎴愬憳鍙橀噺
private String name;
+ private String info;
private int key;
// 鏋勯�犳柟娉�
- InsuranceApplyStatus(int key, String name) {
+ InsuranceApplyStatus(int key, String name,String info) {
this.name = name;
this.key = key;
+ this.info = info;
}
// 鏅�氭柟娉�
public static String getName(int index) {
- for (ApplyLogType c : ApplyLogType.values()) {
+ for (InsuranceApplyStatus c : InsuranceApplyStatus.values()) {
if (c.getKey() == index) {
return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (InsuranceApplyStatus c : InsuranceApplyStatus.values()) {
+ if (c.getKey() == index) {
+ return c.info;
}
}
return null;
@@ -707,6 +735,13 @@
this.key = key;
}
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
}
public static BigDecimal countDetailFee(Solutions solutions,Date startDate, Date endDate){
diff --git a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
index e5ca65b..caab703 100644
--- a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
@@ -99,5 +99,15 @@
InsuranceApply findDetail(Integer id);
- void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO);
+ void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO);
+
+ Integer back(InsuranceApply insuranceApply);
+
+ Integer uploadToubaodan(InsuranceApply insuranceApply);
+
+ Integer uploadBaoxiandan(InsuranceApply insuranceApply);
+
+ Integer refuseBackApply(InsuranceApply insuranceApply);
+
+ Integer check(InsuranceApply insuranceApply);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 3dbe7b2..fd91573 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -68,6 +68,60 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public Integer back(InsuranceApply insuranceApply) {
+ if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
+
+ if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ InsuranceApply update = new InsuranceApply();
+ update.setEditDate(new Date());
+ update.setEditor(user.getId());
+ update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+ update.setCheckDate(update.getEditDate());
+ update.setCheckInfo(insuranceApply.getCheckInfo());
+ update.setCheckUserId(user.getId());
+ update.setId(model.getId());
+ insuranceApplyMapper.updateById(update);
+
+ return null;
+
+ }
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public Integer uploadBaoxiandan(InsuranceApply insuranceApply) {
+ return null;
+
+ }
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public Integer refuseBackApply(InsuranceApply insuranceApply) {
+ return null;
+
+ }
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public Integer uploadToubaodan(InsuranceApply insuranceApply) {
+ return null;
+
+ }
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public Integer check(InsuranceApply insuranceApply) {
+ return null;
+
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(InsuranceApply insuranceApply) {
if (Objects.isNull(insuranceApply)
|| Objects.isNull(insuranceApply.getSolutionId())
--
Gitblit v1.9.3