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") 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 = "æ´¾é£åä½åºè¡¨ç¼ç ï¼å ³èsolutionsï¼", 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; } 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; } 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); } 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() + "ãå卿¥æå²çªçæ°æ®"); } 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)