From f4d7a1d8322c37349aeee87287eceb7eb56ce49a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 五月 2025 10:00:01 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 2
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 11 ++++-
server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java | 2 +
server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java | 7 +++
server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsMoneyVO.java | 28 ++++++++++++++
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 60 ++++++++++++++++++++++++++++++
6 files changed, 107 insertions(+), 3 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java b/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java
index 59bdd8b..e9b4a52 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java
@@ -40,6 +40,13 @@
public ApiResponse create(@RequestBody SettleClaims settleClaims) {
return ApiResponse.success(settleClaimsService.create(settleClaims));
}
+ @PreventRepeat
+ @ApiOperation("骞冲彴绯荤粺妗堜欢褰曞叆")
+ @PostMapping("/createSys")
+ @RequiresPermissions("business:settleclaims:create")
+ public ApiResponse createSys(@RequestBody SettleClaims settleClaims) {
+ return ApiResponse.success(settleClaimsService.createSys(settleClaims));
+ }
@ApiOperation("娣诲姞鎶ユ鍙�")
@PostMapping("/addCode")
@RequiresPermissions("business:settleclaims:addCode")
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 aad4123..7720870 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
@@ -2,13 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.business.vo.SettleClaimsMoneyVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
@@ -176,7 +177,7 @@
private String shouliType;
@ApiModelProperty(value = "鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬 ")
@ExcelColumn(name="鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬")
- private String origin;
+ private Integer origin;
@ApiModelProperty(value = "鍙楃悊鍟嗚闂 0璧勬枡缂哄け锛�1寤惰繜鎶ユ 2瓒呰亴涓氱被鍒� 3鍏朵粬锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
@ExcelColumn(name="鍙楃悊鍟嗚闂 0璧勬枡缂哄け锛�1寤惰繜鎶ユ 2瓒呰亴涓氱被鍒� 3鍏朵粬锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
private String syProblemOpts;
@@ -301,5 +302,11 @@
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍩鸿〃缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
@TableField(exist = false)
private Integer baseDuId;
+ @ApiModelProperty(value = "绯荤粺褰曞叆妗堜欢鎵╁睍灞炴�у璞�", example = "1")
+ @TableField(exist = false)
+ private SettleClaimsExt extData;
+ @ApiModelProperty(value = "璐圭敤瀵硅薄闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<SettleClaimsMoneyVO> accountList;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsMoneyVO.java b/server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsMoneyVO.java
new file mode 100644
index 0000000..b121279
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsMoneyVO.java
@@ -0,0 +1,28 @@
+package com.doumee.dao.business.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 鎶曚繚鍗� 鍙搷浣滄潈闄�
+ * @author RenKang
+ */
+@Data
+public class SettleClaimsMoneyVO {
+
+ @ApiModelProperty(value = "璐圭敤鍚嶇О", example = "1")
+ private String name;
+
+ @ApiModelProperty(value = "璐圭敤", example = "1")
+ private BigDecimal money;
+
+ @ApiModelProperty(value = "璐圭敤绫诲瀷")
+ private Integer type;
+
+ @ApiModelProperty(value = "璐圭敤璇存槑")
+ private String info;
+
+
+}
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 a6f58cb..9df4a9e 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
@@ -130,4 +130,6 @@
Integer back(SettleClaims settleClaims);
Integer delFile(Integer id, Integer fileId);
+
+ Integer createSys(SettleClaims settleClaims);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index d71c395..8923fa6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1447,7 +1447,7 @@
.eq(ApplyDetail::getApplyId,applyChange.getApplyId())
.eq(ApplyDetail::getIdcardNo,applyChagneDetail.getIdcardNo())
.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
- .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(insuranceApply.getEndTime(),2))
+ .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(insuranceApply.getEndTime(),2))
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
}
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 74ad590..3065b99 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
@@ -358,6 +358,66 @@
}
@Override
+ public Integer createSys(SettleClaims settleClaims) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ settleClaims.setOrigin(Constants.ONE);
+ if(Objects.isNull(settleClaims)
+ || Objects.isNull(settleClaims.getMemberName())
+ || Objects.isNull(settleClaims.getSolutionName())
+ || Objects.isNull(settleClaims.getDuId())
+ || Objects.isNull(settleClaims.getWorktypeId())
+ || Objects.isNull(settleClaims.getHappenTime())
+ || Objects.isNull(settleClaims.getType())
+ || Objects.isNull(settleClaims.getInHospital())
+ || Objects.isNull(settleClaims.getMedicalInsurance())
+ || Objects.isNull(settleClaims.getContent())
+ || Objects.isNull(settleClaims.getInformantName())
+ || Objects.isNull(settleClaims.getInformantPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氬憳宸ユ棤娉曡繘琛岃鎿嶄綔");
+ }
+ //鏌ヨ鏄惁瀛樺湪宸叉彁鎶ョ殑鏁版嵁 鏍规嵁浜哄憳鍜屼繚闄╂柟妗堣繘琛岃繃婊� 鏄惁瀛樺湪杩涜涓殑鏁版嵁
+ if(settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
+ .eq(SettleClaims::getSolutionId,settleClaims.getSolutionId())
+ .eq(SettleClaims::getMemberId,loginUserInfo.getId())
+ .in(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey(),
+ Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鎻愭姤涓殑鎶ユ鏁版嵁!");
+ }
+ settleClaims.setCreateDate(new Date());
+ settleClaims.setIsdeleted(Constants.ZERO);
+ settleClaims.setCompanyId(loginUserInfo.getCompanyId());
+ settleClaims.setStatus(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
+ settleClaims.setCreator(loginUserInfo.getId());
+ settleClaims.setCheckUserId(loginUserInfo.getId());
+ settleClaimsMapper.insert(settleClaims);
+
+ List<Multifile> reportVideo = settleClaims.getReportFileList();
+ if(CollectionUtils.isNotEmpty(reportVideo)){
+ for (int i = 0; i < reportVideo.size(); i++) {
+ Multifile multifile = reportVideo.get(i);
+ if(Objects.isNull(multifile.getFileurl())
+ || Objects.isNull(multifile.getType())
+ || StringUtils.isBlank(multifile.getName())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍐呭寮傚父");
+ }
+ multifile.setCreator(loginUserInfo.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(settleClaims.getId());
+ multifile.setObjType(Constants.ONE);
+ multifile.setSortnum(i+1);
+ multifileJoinMapper.insert(multifile);
+ }
+ }
+
+ return settleClaims.getId();
+ }
+ @Override
public Integer create(SettleClaims settleClaims) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(settleClaims)
--
Gitblit v1.9.3