From f60cf404ff35da7b584721819c3faf87efb40bff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 09:57:53 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/dto/CaseTypeDTO.java | 16 ++++
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 8 +
server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java | 6 +
server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java | 7 +
server/service/src/main/java/com/doumee/core/utils/Constants.java | 11 +-
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 109 ++++++++++++++++++++++++---
server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java | 5 +
server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java | 33 +++++++-
server/service/src/main/java/com/doumee/dao/business/dto/PayCashDTO.java | 24 ++++++
9 files changed, 197 insertions(+), 22 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java b/server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java
index 3dbbcce..8617169 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java
@@ -146,6 +146,13 @@
}
+ @PreventRepeat
+ @ApiOperation("淇敼妗堜欢绫诲瀷")
+ @PostMapping("/updCaseType")
+ public ApiResponse updCaseType(@RequestBody CaseTypeDTO dto) {
+ settleClaimsService.updCaseType(dto);
+ return ApiResponse.success(null);
+ }
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 6c170bd..cf0fd7d 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
@@ -1934,7 +1934,7 @@
public enum SettleClaimsStatus {
//鐘舵�� 0鏆傚瓨涓� 1宸叉姤妗� 2寰呯珛妗� 3宸茬珛妗� 4绔嬫閫�鍥� 5寰呭彈鐞� 6鎷掔粷鍙楃悊 7鍟嗚寰呭鎵�
- // 8鍟嗚瀹℃壒鎷掔粷 9宸插彈鐞� 10寰呮牳璧� 11宸叉牳璧� 12寰呯粨妗� 13宸茬粨妗� 14宸叉挙妗�
+ // 8鍟嗚瀹℃壒鎷掔粷 9宸插彈鐞� 10寰呮牳璧� 11宸叉牳璧� 12宸茬‘璁ら噾棰� 13宸茬粨妗� 14宸叉挙妗�
WAIT_ACCEPTANCE(0, "鏆傚瓨涓�"),
RETURN_ACCEPTANCE(1, "宸叉姤妗�"),
DEAL_ING(2, "寰呯珛妗� 锛堝純鐢級"),
@@ -1947,13 +1947,15 @@
ACCEPTANCE(9, "宸插彈鐞�"),//寰呯悊绠�
WAIT_AUDIT_COMPENSATION(10, "寰呮牳璧�"),
COMPENSATION(11, "宸叉牳璧�"),
- WAIT_CLOSE_CASE(12, "寰呯粨妗堬紙寮冪敤锛�"),
+ CONFIRM_FEE(12, "宸茬‘璁ら噾棰�"),
CLOSE_CASE(13, "宸茬粨妗�"),
RETURN(14, "宸叉挙妗�"),
;
// 鎴愬憳鍙橀噺
- private String name;
- private int key;
+ private String name;//涓氬姟鎻忚堪
+ private int key;//涓氬姟鐘舵��
+ private int companyParentKey;//浼佷笟涓绘祦绋�
+ private int platformParentKey;//骞冲彴涓绘祦绋�
// 鏋勯�犳柟娉�
SettleClaimsStatus(int key, String name) {
@@ -2014,6 +2016,7 @@
PLATFORM_HP_DEAL(21, "鏍歌禂-鎻愪氦鏍歌禂閲戦","宸叉彁浜よ禂浠橀噾棰濓紝寰呯敤鎴风‘璁�"),
PLATFORM_UPD_FEE(22, "鏍歌禂-淇敼閲戦",""),
CONFIRM_FEE(22, "鏍歌禂-瀹㈡埛纭閲戦","宸茬‘璁ら噾棰�"),
+ UPD_CASE_TYPE(23, "鍙楃悊-纭妗堜欢绫诲瀷","宸茬‘璁ゆ浠剁被鍨�"),
;
// 鎴愬憳鍙橀噺
private String name;
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/CaseTypeDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/CaseTypeDTO.java
new file mode 100644
index 0000000..a3a7392
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/CaseTypeDTO.java
@@ -0,0 +1,16 @@
+package com.doumee.dao.business.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CaseTypeDTO {
+
+ @ApiModelProperty(value = "涓氬姟涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "妗堜欢绫诲瀷锛�1=鍖荤枟锛�2=浼ゆ畫锛�3=姝讳骸")
+ private Integer caseType;
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/PayCashDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/PayCashDTO.java
new file mode 100644
index 0000000..46d14a9
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/PayCashDTO.java
@@ -0,0 +1,24 @@
+package com.doumee.dao.business.dto;
+
+import com.doumee.dao.business.model.Multifile;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 瀛樺偍 琛ュ厖璇存槑
+ */
+@Data
+public class PayCashDTO {
+
+ @ApiModelProperty(value = "涓氬姟涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "璇存槑銆佸娉�")
+ private String describe;
+
+ @ApiModelProperty(value = "鎵撴鍥剧墖")
+ private List<Multifile> multifileList;
+
+}
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 c82e50e..7f0740e 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
@@ -200,7 +200,7 @@
private String riskSensitive;
@ApiModelProperty(value = "鎶ユ鍙疯缃姸鎬� 0鏈缃� 1宸茶缃� 2宸蹭慨鏀�")
@ExcelColumn(name="鎶ユ鍙疯缃姸鎬� 0鏈缃� 1宸茶缃� 2宸蹭慨鏀�")
- private String reportNumStatus;
+ private Integer reportNumStatus;
@ApiModelProperty(value = "鎵�鏈夎禂浠橀」淇℃伅锛坖son鏁扮粍[{name:鈥滀紮椋熻垂鈥�,val:100,info:鈥滀紮椋熻垂璇存槑鈥�,type:0}]锛�,type:0涓昏璧斾粯椤� 1鍏朵粬璧斾粯椤� 2瀹氭崯鏂规璐圭敤\t")
@ExcelColumn(name="鎵�鏈夎禂浠橀」淇℃伅")
private String accountContent;
@@ -234,6 +234,12 @@
private Integer waitSupplement;
+ @ApiModelProperty(value = "璐圭敤鏄惁鍙戠敓鍙樻洿:0=鍚︼紱1=鏄紱")
+ private Integer feeUpdate;
+
+ @ApiModelProperty(value = "妗堜欢绫诲瀷锛�0=鏈缃紱1=鍖荤枟锛�2=浼ゆ畫锛�3=姝讳骸")
+ private Integer caseType;
+
@ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
@TableField(exist = false)
private Multifile baoxiandanFile;
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 70d69c7..a270de7 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
@@ -229,4 +229,10 @@
* @param id
*/
void confirmFee(Integer id);
+
+ /**
+ * 淇敼妗堜欢绫诲瀷
+ * @param dto
+ */
+ void updCaseType(CaseTypeDTO dto);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
index c04c5d2..5922a7e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
@@ -7,7 +7,9 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.AreasMapper;
import com.doumee.dao.business.KnowledgeMapper;
+import com.doumee.dao.business.model.Areas;
import com.doumee.dao.business.model.Knowledge;
import com.doumee.service.business.KnowledgeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -35,15 +37,16 @@
@Autowired
private KnowledgeMapper knowledgeMapper;
+ @Autowired
+ private AreasMapper areasMapper;
+
@Override
public Integer create(Knowledge knowledge) {
LoginUserInfo user= (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(knowledge)
|| StringUtils.isBlank(knowledge.getTitle())
|| StringUtils.isBlank(knowledge.getLink())
-// || StringUtils.isBlank(knowledge.getCityName())
// || Objects.isNull(knowledge.getCityId())
- || StringUtils.isBlank(knowledge.getProvinceName())
|| Objects.isNull(knowledge.getProvinceId())
|| StringUtils.isBlank(knowledge.getYearInfo())
|| StringUtils.isBlank(knowledge.getTitle())
@@ -53,6 +56,18 @@
}
if(knowledge.getLabels().split(",").length>10){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏍囩鏁版渶澶氭坊鍔犲崄涓�");
+ }
+ Areas province = areasMapper.selectById(knowledge.getProvinceId());
+ if(Objects.isNull(province)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐪佷唤淇℃伅閿欒");
+ }
+ knowledge.setProvinceName(province.getName());
+ if(Objects.nonNull(knowledge.getCityId())){
+ Areas city = areasMapper.selectById(knowledge.getCityId());
+ if(Objects.isNull(city)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"甯傚尯淇℃伅閿欒");
+ }
+ knowledge.setCityName(city.getName());
}
knowledge.setIsdeleted(Constants.ZERO);
knowledge.setCreateDate(new Date());
@@ -88,8 +103,6 @@
|| Objects.isNull(knowledge.getId())
|| StringUtils.isBlank(knowledge.getTitle())
|| StringUtils.isBlank(knowledge.getLink())
- || StringUtils.isBlank(knowledge.getProvinceName())
-// || StringUtils.isBlank(knowledge.getCityName())
// || Objects.isNull(knowledge.getCityId())
|| Objects.isNull(knowledge.getProvinceId())
|| StringUtils.isBlank(knowledge.getYearInfo())
@@ -101,6 +114,18 @@
if(knowledge.getLabels().split(",").length>10){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏍囩鏁版渶澶氭坊鍔犲崄涓�");
}
+ Areas province = areasMapper.selectById(knowledge.getProvinceId());
+ if(Objects.isNull(province)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐪佷唤淇℃伅閿欒");
+ }
+ knowledge.setProvinceName(province.getName());
+ if(Objects.nonNull(knowledge.getCityId())){
+ Areas city = areasMapper.selectById(knowledge.getCityId());
+ if(Objects.isNull(city)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"甯傚尯淇℃伅閿欒");
+ }
+ knowledge.setCityName(city.getName());
+ }
knowledge.setEditDate(new Date());
knowledge.setEditor(user.getId());
knowledgeMapper.updateById(knowledge);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
index da3c023..61bd2c4 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
@@ -42,9 +42,14 @@
|| StringUtils.isEmpty(labels.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(labelsMapper.selectCount(new QueryWrapper<Labels>().lambda().eq(Labels::getIsdeleted,Constants.ZERO).eq(Labels::getStatus,Constants.ZERO))>=5){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈�澶氶厤缃�50涓爣绛緙");
+ }
labelsMapper.delete(new QueryWrapper<Labels>().lambda().eq(Labels::getName,labels.getName()));
labels.setCreateDate(new Date());
labels.setCreator(user.getId());
+ labels.setStatus(Constants.ZERO);
+ labels.setIsdeleted(Constants.ZERO);
labelsMapper.insert(labels);
return labels.getId();
}
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 f3ea9df..c283ea8 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
@@ -1001,6 +1001,7 @@
}
SettleClaims settleClaims = new SettleClaims();
BeanUtils.copyProperties(settleClaimsDTO,settleClaims);
+ settleClaims.setReportNumStatus(Constants.ZERO);
if(Objects.nonNull(settleClaims.getId())){
settleClaims.setEditDate(new Date());
settleClaims.setEditor(loginUserInfo.getId());
@@ -1499,7 +1500,34 @@
}
-
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updCaseType(CaseTypeDTO dto){
+ if(Objects.isNull(dto)
+ || Objects.isNull(dto.getId())
+ || Objects.isNull(dto.getCaseType())
+ || !(dto.getCaseType()>=Constants.ONE&&dto.getCaseType()<=Constants.THREE)
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炵鐞嗗憳鏃犳硶杩涜璇ユ搷浣�");
+ }
+ SettleClaims settleClaims = settleClaimsJoinMapper.selectById(dto.getId());
+ if(Objects.isNull(settleClaims)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(Constants.SettleClaimsStatus.ACCEPTANCE.getKey(),settleClaims.getStatus())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝涓氬姟鐘舵�佸凡娴佽浆~");
+ }
+ //瀛樺偍鏃ュ織
+ this.saveSettleClaimsLog(settleClaims, Constants.SettleClaimsLogType.UPD_CASE_TYPE,Constants.SettleClaimsLogType.UPD_CASE_TYPE.getInfo());
+ settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
+ .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime())
+ .set(SettleClaims::getEditor,loginUserInfo.getId())
+ .set(SettleClaims::getCaseType,dto.getCaseType()));
+ }
@@ -1556,16 +1584,25 @@
if(!user.getType().equals(Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炵鐞嗗憳鏃犳硶杩涜璇ユ搷浣�");
}
- //鏌ヨ鏄惁鏈夋姤妗堝彿鏇存敼璁板綍
- if(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
- && settleClaimsLogMapper.selectCount(new QueryWrapper<SettleClaimsLog>().lambda()
- .eq(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.PLATFORM_ADDCODE.getKey())
- .eq(SettleClaimsLog::getSettleClainmsId,param.getId()))>=Constants.ONE){
+ if(Constants.equalsInteger(model.getReportNumStatus(),Constants.TWO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠呭彲淇敼涓�娆℃姤妗堝彿");
}
- if(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())&&StringUtils.isNotBlank(model.getReportNum())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸蹭慨鏀规姤妗堝彿锛屾棤娉曞啀娆′慨鏀�");
+ if(!((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())&&Constants.equalsInteger(model.getReportNumStatus(),Constants.ONE))
+ ||(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_DEAL.getKey())&&Constants.equalsInteger(model.getReportNumStatus(),Constants.ZERO)))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠呭彲淇敼涓�娆℃姤妗堝彿");
}
+
+
+// //鏌ヨ鏄惁鏈夋姤妗堝彿鏇存敼璁板綍
+// if(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
+// && settleClaimsLogMapper.selectCount(new QueryWrapper<SettleClaimsLog>().lambda()
+// .eq(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.PLATFORM_ADDCODE.getKey())
+// .eq(SettleClaimsLog::getSettleClainmsId,param.getId()))>=Constants.ONE){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠呭彲淇敼涓�娆℃姤妗堝彿");
+// }
+// if(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())&&StringUtils.isNotBlank(model.getReportNum())){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸蹭慨鏀规姤妗堝彿锛屾棤娉曞啀娆′慨鏀�");
+// }
settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
.eq(SettleClaims::getId,param.getId()).set(SettleClaims::getEditDate,
DateUtil.getCurrDateTime()).set(SettleClaims::getReportNum,param.getReportNum()));
@@ -1573,6 +1610,7 @@
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
update.setEditor(user.getId());
+ update.setReportNumStatus(model.getReportNumStatus()+Constants.ONE);
update.setId(model.getId());
update.setCheckDate(update.getEditDate());
update.setCheckInfo("娣诲姞澶囨鍙�");
@@ -1608,7 +1646,7 @@
||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_REJECT.getKey())
||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey())
||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.COMPENSATION.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_CLOSE_CASE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_FEE.getKey())
||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CLOSE_CASE.getKey())
)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
@@ -1867,7 +1905,9 @@
if(Objects.isNull(settleClaims)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(Constants.SettleClaimsStatus.COMPENSATION.getKey(),settleClaims.getStatus())){
+ if(!(Constants.equalsInteger(Constants.SettleClaimsStatus.COMPENSATION.getKey(),settleClaims.getStatus())
+ || Constants.equalsInteger(Constants.SettleClaimsStatus.CONFIRM_FEE.getKey(),settleClaims.getStatus()))
+ ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝涓氬姟鐘舵�佸凡娴佽浆~");
}
@@ -1876,12 +1916,14 @@
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
+ if(Constants.equalsInteger(Constants.SettleClaimsStatus.CONFIRM_FEE.getKey(),settleClaims.getStatus())){
+ update.setFeeUpdate(Constants.ONE);
+ }
update.setYlClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.YL_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
update.setWgClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.WG_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
update.setScClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.SC_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
update.setSwClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.SW_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
update.setClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
-
//澶勭悊鍘嗗彶鏁版嵁
List<CompensationVO> oldList = JSONArray.parseArray(settleClaims.getAccountContent(),CompensationVO.class);
for (CompensationVO compensationVO:oldList) {
@@ -1912,7 +1954,6 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void confirmFee(Integer id){
-
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!loginUserInfo.getType().equals(Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炵鐞嗗憳鏃犳硶杩涜璇ユ搷浣�");
@@ -1924,7 +1965,12 @@
if(!Constants.equalsInteger(Constants.SettleClaimsStatus.COMPENSATION.getKey(),settleClaims.getStatus())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝涓氬姟鐘舵�佸凡娴佽浆~");
}
-
+ SettleClaims update = new SettleClaims();
+ update.setEditDate(new Date());
+ update.setEditor(loginUserInfo.getId());
+ update.setStatus(Constants.SettleClaimsStatus.WAIT_DEAL.getKey());
+ update.setId(settleClaims.getId());
+ settleClaimsMapper.updateById(update);
//瀛樺偍鏃ュ織
this.saveSettleClaimsLog(settleClaims,
@@ -1933,5 +1979,42 @@
}
+// @Override
+// @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+// public void payCash(PayCashDTO dto){
+// if(Objects.isNull(dto)
+// || Objects.isNull(dto.getId())
+// || StringUtils.isBlank(dto.getDescribe())
+// ){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST);
+// }
+// LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+// if(!loginUserInfo.getType().equals(Constants.ZERO)){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炵鐞嗗憳鏃犳硶杩涜璇ユ搷浣�");
+// }
+// SettleClaims settleClaims = settleClaimsJoinMapper.selectById(dto.getId());
+// if(Objects.isNull(settleClaims)){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY);
+// }
+// if(!Constants.equalsInteger(Constants.SettleClaimsStatus.COMPENSATION.getKey(),settleClaims.getStatus())){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝涓氬姟鐘舵�佸凡娴佽浆~");
+// }
+// SettleClaims update = new SettleClaims();
+// update.setEditDate(new Date());
+// update.setEditor(loginUserInfo.getId());
+// update.setStatus(Constants.SettleClaimsStatus.WAIT_DEAL.getKey());
+// update.setId(settleClaims.getId());
+// settleClaimsMapper.updateById(update);
+//
+// //瀛樺偍鏃ュ織
+// this.saveSettleClaimsLog(settleClaims,
+// Constants.SettleClaimsLogType.CONFIRM_FEE,
+// Constants.SettleClaimsLogType.CONFIRM_FEE.getInfo());
+// }
+
+
+
+
+
}
--
Gitblit v1.9.3