From 845f406d11563c12b9e35562ce587a72cd47cb9d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 17:48:43 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 6
server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java | 2
server/service/src/main/java/com/doumee/dao/business/vo/CompensationVO.java | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 175 +++++++++++++++++++------
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 129 ++++++++++++++++--
server/service/src/main/java/com/doumee/dao/business/vo/RiskConfigVO.java | 2
server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java | 20 ++
server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java | 7 +
server/service/src/main/java/com/doumee/dao/business/vo/SettleParentStatusVO.java | 27 +++
9 files changed, 302 insertions(+), 68 deletions(-)
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 0dc1009..a589686 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
@@ -1936,32 +1936,32 @@
public enum SettleClaimsStatus {
//鐘舵�� 0鏆傚瓨涓� 1宸叉姤妗� 2寰呯珛妗� 3宸茬珛妗� 4绔嬫閫�鍥� 5寰呭彈鐞� 6鎷掔粷鍙楃悊 7鍟嗚寰呭鎵�
// 8鍟嗚瀹℃壒鎷掔粷 9宸插彈鐞� 10寰呮牳璧� 11宸叉牳璧� 12宸茬‘璁ら噾棰� 13宸茬粨妗� 14宸叉挙妗�
- WAIT_ACCEPTANCE(0, "鏆傚瓨涓�"),
- RETURN_ACCEPTANCE(1, "宸叉姤妗�"),
- DEAL_ING(2, "寰呯珛妗� 锛堝純鐢級"),
- CONFIRM_INFORMATION(3, "宸茬珛妗�"),
- FINISH_ACCEPTANCE(4, "绔嬫閫�鍥�"),
- WAIT_DEAL(5, "寰呭彈鐞�"),
- REJECT_DEAL(6, "鎷掔粷鍙楃悊"),
- WAIT_DISCUSS_AUDIT(7, "寰呭晢璁鎵�"),
- WAIT_DISCUSS_REJECT(8, "鍟嗚瀹℃壒鎷掔粷"),
- ACCEPTANCE(9, "宸插彈鐞�"),//寰呯悊绠�
- WAIT_AUDIT_COMPENSATION(10, "寰呮牳璧�"),
- COMPENSATION(11, "宸叉牳璧�"),
- CONFIRM_FEE(12, "宸茬‘璁ら噾棰�"),
- CLOSE_CASE(13, "宸茬粨妗�"),
- RETURN(14, "宸叉挙妗�"),
+ WAIT_ACCEPTANCE(0, "鏆傚瓨涓�",0),
+ RETURN_ACCEPTANCE(1, "宸叉姤妗�",1),
+ DEAL_ING(2, "寰呯珛妗� 锛堝純鐢級",0),
+ CONFIRM_INFORMATION(3, "宸茬珛妗�",1),
+ FINISH_ACCEPTANCE(4, "绔嬫閫�鍥�",1),
+ WAIT_DEAL(5, "寰呭彈鐞�",2),
+ REJECT_DEAL(6, "鎷掔粷鍙楃悊",2),
+ WAIT_DISCUSS_AUDIT(7, "寰呭晢璁鎵�",2),
+ WAIT_DISCUSS_REJECT(8, "鍟嗚瀹℃壒鎷掔粷",3),
+ ACCEPTANCE(9, "宸插彈鐞�",3),//寰呯悊绠�
+ WAIT_AUDIT_COMPENSATION(10, "寰呮牳璧�",4),
+ COMPENSATION(11, "宸叉牳璧�",5),
+ CONFIRM_FEE(12, "宸茬‘璁ら噾棰�",5),
+ CLOSE_CASE(13, "宸茬粨妗�",6),
+ RETURN(14, "宸叉挙妗�",6),
;
// 鎴愬憳鍙橀噺
private String name;//涓氬姟鎻忚堪
private int key;//涓氬姟鐘舵��
- private int companyParentKey;//浼佷笟涓绘祦绋�
- private int platformParentKey;//骞冲彴涓绘祦绋�
+ private int parentKey;//涓绘祦绋� 1=鎶ユ 2=绔嬫 3=鍙楃悊 4=鐞嗙畻 5=鏍歌禂 6=缁撴/宸叉挙妗�
// 鏋勯�犳柟娉�
- SettleClaimsStatus(int key, String name) {
+ SettleClaimsStatus(int key, String name,int parentKey) {
this.name = name;
this.key = key;
+ this.parentKey = parentKey;
}
// 鏅�氭柟娉�
public static String getName(int index) {
@@ -1988,9 +1988,15 @@
public void setKey(int key) {
this.key = key;
}
+
+ public int getParentKey() {
+ return parentKey;
+ }
+
+ public void setParentKey(int parentKey) {
+ this.parentKey = parentKey;
+ }
}
-
-
public enum SettleClaimsLogType {
UPLOAD(0, "鎻愪氦鎶ユ","鎻愪氦鎰忚锛�${param}"),
@@ -2042,6 +2048,83 @@
}
public static String getInfo(int index) {
for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getKey() == index) {
+ return c.info;
+ }
+ }
+ return null;
+ }
+
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
+
+
+ public enum SettleClaimsLogParentStatus {
+ BA(1, "鎶ユ","宸叉姤妗�"),
+ LA(2, "绔嬫","宸茬珛妗�"),
+ SL(3, "鍙楃悊","宸插彈鐞�"),
+ LS(4, "鐞嗙畻","宸茬悊绠�"),
+ HP(5, "鏍歌禂","宸叉牳璧�"),
+ JA(6, "缁撴","宸茬粨妗�"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private String info;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ SettleClaimsLogParentStatus(int key, String name,String info) {
+ this.name = name;
+ this.info = info;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (SettleClaimsLogParentStatus c : SettleClaimsLogParentStatus.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+
+ // 鏅�氭柟娉�
+ public static SettleClaimsLogParentStatus getAll(int index) {
+ for (SettleClaimsLogParentStatus c : SettleClaimsLogParentStatus.values()) {
+ if (c.getKey() == index) {
+ return c;
+ }
+ }
+ return null;
+ }
+
+ public static String getInfo(int index) {
+ for (SettleClaimsLogParentStatus c : SettleClaimsLogParentStatus.values()) {
if (c.getKey() == index) {
return c.info;
}
@@ -2641,28 +2724,36 @@
* 璧斾粯椤�
*/
public enum compensation{
- YL_COMPENSATION(0, "鍖荤枟鐞嗚禂",1),
- WG_COMPENSATION(1, "璇伐鐞嗚禂",1),
- SC_COMPENSATION(2, "浼ゆ畫鐞嗚禂",1),
- SW_COMPENSATION(3, "姝讳骸鐞嗚禂",1),
- HSF_FEE(4, "浼欓璐�",2),
- XY_FEE(5, "缁尰璐�",2),
- YY_FEE(6, "钀ュ吇璐�",2),
- HL_FEE(7, "鎶ょ悊璐�",2),
- ZDJB_FEE(8, "閲嶅ぇ鐤剧梾璧斿伩閲�",2),
- TB_FEE(9, "鐗瑰埆璐圭敤",2),
- ZS_FEE(10, "浣忓璐�",2),
- JT_FEE(11, "娲ヨ创",2),
- CJ_FEE(12, "娈嬬柧璧斿伩閲�",2),
- BFYR_FEE(13, "琚姎鍏讳汉鐢熸椿璐�",2),
- SCF_FEE(14, "涓ц懍璐�",2),
- JSFXJ_FEE(15, "绮剧鎶氭仱閲�",2),
- JD_FEE(16, "閴村畾璐�",2),
- SS_FEE(17, "璇夎璐�",2),
- LS_FEE(18, "寰嬪笀璐�",2),
- TRAFFIC_FEE(19, "浜ら�氳垂",2),
- CJQJ_FEE(20, "娈嬬柧鍣ㄥ叿璐�",2),
- QT_FEE(21, "鍏朵粬璐圭敤",2),
+ YL_COMPENSATION(0, "鍖荤枟鐞嗚禂",0),
+ WG_COMPENSATION(1, "璇伐鐞嗚禂",0),
+ SC_COMPENSATION(2, "浼ゆ畫鐞嗚禂",0),
+ SW_COMPENSATION(3, "姝讳骸鐞嗚禂",0),
+ HSF_FEE(4, "浼欓璐�",1),
+ XY_FEE(5, "缁尰璐�",1),
+ YY_FEE(6, "钀ュ吇璐�",1),
+ HL_FEE(7, "鎶ょ悊璐�",1),
+ ZDJB_FEE(8, "閲嶅ぇ鐤剧梾璧斿伩閲�",1),
+ TB_FEE(9, "鐗瑰埆璐圭敤",1),
+ ZS_FEE(10, "浣忓璐�",1),
+ JT_FEE(11, "娲ヨ创",1),
+ CJ_FEE(12, "娈嬬柧璧斿伩閲�",1),
+ BFYR_FEE(13, "琚姎鍏讳汉鐢熸椿璐�",1),
+ SCF_FEE(14, "涓ц懍璐�",1),
+ JSFXJ_FEE(15, "绮剧鎶氭仱閲�",1),
+ JD_FEE(16, "閴村畾璐�",1),
+ SS_FEE(17, "璇夎璐�",1),
+ LS_FEE(18, "寰嬪笀璐�",1),
+ TRAFFIC_FEE(19, "浜ら�氳垂",1),
+ CJQJ_FEE(20, "娈嬬柧鍣ㄥ叿璐�",1),
+ QT_FEE(21, "鍏朵粬璐圭敤",1),
+ ZFPJEYPF_FEE(22, "鎬诲彂绁ㄩ噾棰濊嵂鍝佽垂",2),
+ ZL_FEE(23, "璇婄枟璐�",2),
+ CL_FEE(24, "鏉愭枡璐�",2),
+ ZKJJE_FEE(25, "鎬绘墸鍑忛噾棰�",2),
+ BFZF_FEE(26, "閮ㄥ垎鑷垂",2),
+ QZF_FEE(27, "鍏ㄨ嚜璐归噾棰�",2),
+ BHL_FEE(28, "涓嶅悎鐞嗚垂鐢�",2),
+ DSFGF_FEE(29, "绗笁鏂圭粰浠樿垂鐢�",2),
;
// 鎴愬憳鍙橀噺
private String name;
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 5c0f182..3cce6d7 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,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.business.vo.CompensationVO;
import com.doumee.dao.business.vo.SettleClaimsMoneyVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -285,6 +286,9 @@
@TableField(exist = false)
private List<Multifile> otherFileList;
+ @ApiModelProperty(value = "鎵撴鍑瘉")
+ @TableField(exist = false)
+ private List<Multifile> payFileList;
@ApiModelProperty(value = "鏃ュ織鍒楄〃")
@TableField(exist = false)
@@ -334,6 +338,6 @@
private SettleClaimsExt extData;
@ApiModelProperty(value = "璐圭敤瀵硅薄闆嗗悎", example = "1")
@TableField(exist = false)
- private List<SettleClaimsMoneyVO> accountList;
+ private List<CompensationVO> accountList;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
index a84af6d..731352d 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
@@ -93,6 +93,13 @@
@ExcelColumn(name="鎿嶄綔鍚庡唴瀹�")
private String afterContent;
+ @ApiModelProperty(value = "澶х被绫诲瀷锛�1=鎶ユ 2=绔嬫 3=鍙楃悊 4=鐞嗙畻 5=鏍歌禂 6=缁撴 7=绔嬫閫�鍥� 8鍟嗚閫�鍥� 9宸叉挙妗�")
+ private Integer parentStatus;
+
+ @ApiModelProperty(value = "涓氬姟绫诲瀷")
+ private Integer status;
+
+
@ApiModelProperty(value = "鍒涘缓浜哄悕绉�", example = "1")
@TableField(exist = false)
private String creatorName;
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
index d8e1c54..c92717b 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
@@ -18,7 +18,7 @@
* @date 2024/10/28 19:16
*/
@Data
-@ApiModel("淇濋櫓鏂规淇℃伅琛�")
+@ApiModel("淇濋櫓涓绘柟妗堜俊鎭〃")
@TableName("`solutions_base`")
public class SolutionsBase {
diff --git a/server/service/src/main/java/com/doumee/dao/business/vo/CompensationVO.java b/server/service/src/main/java/com/doumee/dao/business/vo/CompensationVO.java
index e9f8696..cdefa81 100644
--- a/server/service/src/main/java/com/doumee/dao/business/vo/CompensationVO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/vo/CompensationVO.java
@@ -11,7 +11,7 @@
@Data
public class CompensationVO {
- @ApiModelProperty(value = "璧斾粯绫诲瀷锛�1=涓昏璧斾粯椤癸紱2=鍏朵粬璧斾粯椤�")
+ @ApiModelProperty(value = "璐圭敤绫诲瀷 0涓昏璧斾粯椤� 1鍏朵粬璧斾粯椤� 2瀹氭崯鏂规璐圭敤")
private Integer type;
@ApiModelProperty(value = "璧斾粯椤�")
diff --git a/server/service/src/main/java/com/doumee/dao/business/vo/RiskConfigVO.java b/server/service/src/main/java/com/doumee/dao/business/vo/RiskConfigVO.java
index bdb0b24..9d93cf4 100644
--- a/server/service/src/main/java/com/doumee/dao/business/vo/RiskConfigVO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/vo/RiskConfigVO.java
@@ -35,7 +35,7 @@
private String riskNewMemberTime;
@ApiModelProperty(value = "椋庨櫓鎻愰啋璁剧疆-鏁忔劅璇嶆彁閱掓槸鍚﹀紑鍚細0=鍚︼紱1=鏄紱", example = "1")
private String riskSensitiveWordsOpen;
- @ApiModelProperty(value = "椋庨櫓鎻愰啋璁剧疆-澶氭鍑虹幇鎶ユ娆℃暟鎻愰啋", example = "1")
+ @ApiModelProperty(value = "椋庨櫓鎻愰啋璁剧疆-鏁忔劅璇嶆彁閱�", example = "1")
private String riskSensitiveWords;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/vo/SettleParentStatusVO.java b/server/service/src/main/java/com/doumee/dao/business/vo/SettleParentStatusVO.java
new file mode 100644
index 0000000..46a092b
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/vo/SettleParentStatusVO.java
@@ -0,0 +1,27 @@
+package com.doumee.dao.business.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 瀛樺偍 琛ュ厖璇存槑
+ */
+@Data
+public class SettleParentStatusVO {
+
+ @ApiModelProperty(value = "鐖舵爣棰�")
+ private String parentTitle;
+
+ @ApiModelProperty(value = "瀛愭爣棰�")
+ private String childTitle;
+
+ @ApiModelProperty(value = "鎿嶄綔鏃堕棿")
+ private Date optDate;
+
+ @ApiModelProperty(value = "绫诲瀷锛�0=宸插鐞嗭紱1=澶勭悊涓紱2=寰呭鐞嗭紱3=宸查┏鍥�")
+ private Integer status;
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
index db4db1c..0afb8d4 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
@@ -440,12 +440,20 @@
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
systemDictDataBiz.queryByCode(Constants.OSS,Constants.INSURANCE).getCode();
//闄勪欢淇℃伅
- Multifile lpStampTempFile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjId,id).eq(Multifile::getObjId,10).last("limit 1"));
- lpStampTempFile.setFileurlFull(path + lpStampTempFile.getFileurl());
- model.setLpStampTempFile(lpStampTempFile);
- Multifile lpFile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjId,id).eq(Multifile::getObjId,11).last("limit 1"));
- lpStampTempFile.setFileurlFull(path + lpFile.getFileurl());
- model.setLpFile(lpFile);
+ Multifile lpStampTempFile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.LP_STAMP_FILE.getKey()).last("limit 1"));
+ if(Objects.nonNull(lpStampTempFile)){
+ lpStampTempFile.setFileurlFull(path + lpStampTempFile.getFileurl());
+ model.setLpStampTempFile(lpStampTempFile);
+ }
+
+ Multifile lpFile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.LP_FILE.getKey()).last("limit 1"));
+ if(Objects.nonNull(lpFile)){
+ lpStampTempFile.setFileurlFull(path + lpFile.getFileurl());
+ model.setLpFile(lpFile);
+ }
+
return model;
}
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 d412f7a..647f38b 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
@@ -20,6 +20,7 @@
import com.doumee.dao.business.vo.CompensationVO;
import com.doumee.dao.business.vo.RiskConfigVO;
import com.doumee.dao.business.vo.SettleClaimsMoneyVO;
+import com.doumee.dao.business.vo.SettleParentStatusVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
@@ -405,15 +406,15 @@
settleClaims.setEditDate(date);
settleClaims.setEditor(loginUserInfo.getId());
- List<SettleClaimsMoneyVO> feeList = settleClaims.getAccountList();
+ List<CompensationVO> feeList = settleClaims.getAccountList();
BigDecimal mainFee = new BigDecimal(0);
BigDecimal ortherFee = new BigDecimal(0);
if(feeList!=null && feeList.size()>0){
- for(SettleClaimsMoneyVO fee : feeList){
+ for(CompensationVO fee : feeList){
if(Constants.equalsObject(fee.getType(),Constants.ZERO)){
- mainFee = mainFee.add(Constants.formatBigdecimal(fee.getMoney()));
+ mainFee = mainFee.add(Constants.formatBigdecimal(fee.getFee()));
}else{
- ortherFee = ortherFee.add(Constants.formatBigdecimal(fee.getMoney()));
+ ortherFee = ortherFee.add(Constants.formatBigdecimal(fee.getFee()));
}
}
settleClaims.setHpAccountContent(JSONObject.toJSONString(feeList));
@@ -719,6 +720,8 @@
settleClaims.setCompensationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_JACL_FILE.getKey())).collect(Collectors.toList()));
settleClaims.setOtherFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_OTHER_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setPayFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_PAY_FILE.getKey())).collect(Collectors.toList()));
}
//鏌ヨ鎿嶄綔璁板綍
@@ -1148,6 +1151,7 @@
SettleClaims settleClaims = new SettleClaims();
BeanUtils.copyProperties(settleClaimsDTO,settleClaims);
settleClaims.setReportNumStatus(Constants.ZERO);
+ settleClaims.setOrigin(Constants.ZERO);
if(Objects.nonNull(settleClaims.getId())){
settleClaims.setEditDate(new Date());
settleClaims.setEditor(loginUserInfo.getId());
@@ -1157,7 +1161,6 @@
//澶勭悊椋庨櫓淇℃伅
this.saveRisk(settleClaims,settleClaimsDTO,systemDictDataService);
}
-
settleClaimsMapper.updateById(settleClaims);
}else{
settleClaims.setCreateDate(new Date());
@@ -1888,9 +1891,9 @@
}
List<CompensationVO> modelList = new ArrayList<>();
if (Objects.nonNull(settleClaims)) {
- if(Constants.equalsInteger(compensationFeeDTO.getType(),Constants.ONE)&&StringUtils.isNotBlank(settleClaims.getAccountContent())){
+ if(Constants.equalsInteger(compensationFeeDTO.getType(),Constants.ZERO)&&StringUtils.isNotBlank(settleClaims.getAccountContent())){
modelList = JSONArray.parseArray(settleClaims.getAccountContent(),CompensationVO.class);
- }else if(Constants.equalsInteger(compensationFeeDTO.getType(),Constants.TWO)&&StringUtils.isNotBlank(settleClaims.getHpAccountContent())){
+ }else if(Constants.equalsInteger(compensationFeeDTO.getType(),Constants.ONE)&&StringUtils.isNotBlank(settleClaims.getHpAccountContent())){
modelList = JSONArray.parseArray(settleClaims.getHpAccountContent(),CompensationVO.class);
}
}
@@ -1940,12 +1943,12 @@
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
- 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));
- update.setOtherAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ update.setYlClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)&&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.ZERO)&&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.ZERO)&&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.ZERO)&&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.ZERO)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ update.setOtherAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
update.setAccountContent(dto.getCompensationJson());
update.setId(settleClaims.getId());
update.setStatus(Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey());
@@ -2030,8 +2033,8 @@
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
update.setHpAccountContent(dto.getCompensationJson());
- update.setHpAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
- update.setHpOtherAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ update.setHpAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ update.setHpOtherAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
update.setId(settleClaims.getId());
@@ -2193,7 +2196,101 @@
}
-
+//
+// public List<SettleParentStatusVO> getParentStatus(SettleClaims settleClaims){
+// List<SettleParentStatusVO> settleParentStatusVOList = new ArrayList<>();
+// List<SettleClaimsLog> settleClaimsLogList = settleClaimsLogMapper
+// .selectList(new QueryWrapper<SettleClaimsLog>().lambda().eq(SettleClaimsLog::getObjId,settleClaims.getId()).orderByDesc(SettleClaimsLog::getCreateDate));
+// //绔嬫閫�鍥炵姸鎬佹暟鎹�
+// if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())){
+// SettleParentStatusVO settleParentStatusVO = new SettleParentStatusVO();
+// settleParentStatusVO.setParentTitle("鎶ユ");
+// settleParentStatusVO.setStatus(Constants.ONE);
+// settleParentStatusVO.setChildTitle(Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getName());
+// Optional<SettleClaimsLog> optionalSettleClaimsLog = settleClaimsLogList.stream()
+// .filter(i->Constants.equalsInteger(i.getObjType(),Constants.SettleClaimsLogType.PLATFORM_RETURN.getKey())).findFirst();
+// if(optionalSettleClaimsLog.isPresent()){
+// settleParentStatusVO.setOptDate(optionalSettleClaimsLog.get().getCreateDate());
+// }
+// settleParentStatusVOList.add(settleParentStatusVO);
+// return settleParentStatusVOList;
+// }
+// //鏆傚瓨鐘舵�� 鏃犱富娴佺▼鏁版嵁
+// if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())){
+// return settleParentStatusVOList;
+// }
+// //鍟嗚瀹℃壒涓嶉�氳繃
+// if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_REJECT.getKey())){
+//
+// SettleParentStatusVO settleParentStatusBAVO = new SettleParentStatusVO();
+// settleParentStatusBAVO.setParentTitle("鎶ユ");
+// settleParentStatusBAVO.setChildTitle("宸叉姤妗�");
+// settleParentStatusBAVO.setStatus(Constants.ZERO);
+// Optional<SettleClaimsLog> optionalSettleClaimsBALog = settleClaimsLogList.stream()
+// .filter(i->Constants.equalsInteger(i.getParentStatus(),Constants.ONE)).findFirst();
+// if(optionalSettleClaimsBALog.isPresent()){
+// settleParentStatusBAVO.setOptDate(optionalSettleClaimsBALog.get().getCreateDate());
+// }
+// settleParentStatusVOList.add(settleParentStatusBAVO);
+//
+// SettleParentStatusVO settleParentStatusLAVO = new SettleParentStatusVO();
+// settleParentStatusLAVO.setParentTitle("绔嬫");
+// settleParentStatusLAVO.setChildTitle("宸茬珛妗�");
+// settleParentStatusLAVO.setStatus(Constants.ZERO);
+// Optional<SettleClaimsLog> optionalSettleClaimsLALog = settleClaimsLogList.stream()
+// .filter(i->Constants.equalsInteger(i.getParentStatus(),Constants.TWO)).findFirst();
+// if(optionalSettleClaimsLALog.isPresent()){
+// settleParentStatusLAVO.setOptDate(optionalSettleClaimsBALog.get().getCreateDate());
+// }
+// settleParentStatusVOList.add(settleParentStatusBAVO);
+//
+// SettleParentStatusVO settleParentStatusSLVO = new SettleParentStatusVO();
+// settleParentStatusSLVO.setParentTitle("鍙楃悊");
+// settleParentStatusSLVO.setChildTitle("鍟嗚鎷掔粷");
+// settleParentStatusSLVO.setStatus(Constants.TWO);
+// Optional<SettleClaimsLog> optionalSettleClaimsSLLog = settleClaimsLogList.stream()
+// .filter(i->Constants.equalsInteger(i.getParentStatus(),Constants.THREE)).findFirst();
+// if(optionalSettleClaimsSLLog.isPresent()){
+// settleParentStatusSLVO.setOptDate(optionalSettleClaimsSLLog.get().getCreateDate());
+// }
+// settleParentStatusVOList.add(settleParentStatusSLVO);
+//
+// return settleParentStatusVOList;
+// }
+//
+// if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN.getKey())){
+// List<SettleClaimsLog> settleClaimsLogs = settleClaimsLogList.stream()
+// .filter(i->i.getParentStatus()<Constants.SettleClaimsStatus.RETURN.getParentKey()).collect(Collectors.toList());
+//
+// for (int i = 1; i <= 5; i++) {
+// SettleParentStatusVO s = new SettleParentStatusVO();
+// Constants.SettleClaimsLogParentStatus parentStatus = Constants.SettleClaimsLogParentStatus.getAll(i);
+// s.setParentTitle(parentStatus.getName());
+// s.set(parentStatus.getInfo());
+// s.setStatus(Constants.ZERO);
+//
+// }
+// SettleParentStatusVO settleParentStatusCHVO = new SettleParentStatusVO();
+// settleParentStatusCHVO.setParentTitle("宸叉挙妗�");
+// settleParentStatusCHVO.setChildTitle("浼佷笟涓诲姩鎾ゆ");
+// settleParentStatusCHVO.setStatus(Constants.TWO);
+// Optional<SettleClaimsLog> optionalSettleClaimsSLLog = settleClaimsLogList.stream()
+// .filter(i->Constants.equalsInteger(i.getStatus(),Constants.SettleClaimsLogType.RETURN_SETTLE.getKey())).findFirst();
+// if(optionalSettleClaimsSLLog.isPresent()){
+// settleParentStatusCHVO.setOptDate(optionalSettleClaimsSLLog.get().getCreateDate());
+// }
+// settleParentStatusVOList.add(settleParentStatusCHVO);
+//
+//
+// return settleParentStatusVOList;
+//
+// }
+//
+//
+// return settleParentStatusVOList;
+//
+//
+// }
--
Gitblit v1.9.3