Commit d5b6d18f authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10

parents d54178d6 98ee829d
...@@ -164,5 +164,5 @@ public class ExcelAttributeConstants { ...@@ -164,5 +164,5 @@ public class ExcelAttributeConstants {
public static final String TRUST_REMARK_REDUCE = "trustRemarkReduce"; public static final String TRUST_REMARK_REDUCE = "trustRemarkReduce";
//社保派减委托备注 //社保派减委托备注
public static final String TRUST_REMARK_ADD = "trustRemarkAdd"; public static final String TRUST_REMARK_ADD = "trustRemark";
} }
...@@ -266,23 +266,23 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -266,23 +266,23 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfoList.add(socialInfo); socialInfoList.add(socialInfo);
//金额累加 //金额累加
//预估单位合计 //预估单位合计
ygDwSum = ygDwSum.add(BigDecimal.valueOf(socialInfo.getFd_3adfeb4e8064a8())); ygDwSum = ygDwSum.add(Common.isEmpty(socialInfo.getFd_3adfeb4e8064a8()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3adfeb4e8064a8()));
//实缴单位合计 //实缴单位合计
sjDwSum = sjDwSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f2e9208e4e())); sjDwSum = sjDwSum.add(Common.isEmpty(socialInfo.getFd_3af9f2e9208e4e()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f2e9208e4e()));
//实缴个人合计 //实缴个人合计
sjPersonSum = sjPersonSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f303037214())); sjPersonSum = sjPersonSum.add(Common.isEmpty(socialInfo.getFd_3af9f303037214()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f303037214()));
//预估合计 //预估合计
ygSum = ygSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f2883941b4())); ygSum = ygSum.add(Common.isEmpty(socialInfo.getFd_3af9f2883941b4()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f2883941b4()));
//预估个人合计 //预估个人合计
ygPersonSum = ygPersonSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f285ee1e38())); ygPersonSum = ygPersonSum.add(Common.isEmpty(socialInfo.getFd_3af9f285ee1e38()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f285ee1e38()));
//实缴合计 //实缴合计
sjSum = sjSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f3059e5b9c())); sjSum = sjSum.add(Common.isEmpty(socialInfo.getFd_3af9f3059e5b9c()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f3059e5b9c()));
//应收 //应收
ys = ys.add(BigDecimal.valueOf(socialInfo.getFd_3adfeb7b624f06())); ys = ys.add(Common.isEmpty(socialInfo.getFd_3adfeb7b624f06()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3adfeb7b624f06()));
//个人应收 //个人应收
personYs = personYs.add(BigDecimal.valueOf(socialInfo.getFd_3b35a57aee1428())); personYs = personYs.add(Common.isEmpty(socialInfo.getFd_3b35a57aee1428()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3b35a57aee1428()));
//单位应收 //单位应收
dwYs = dwYs.add(BigDecimal.valueOf(socialInfo.getFd_3b35a57b6e9d0a())); dwYs = dwYs.add(Common.isEmpty(socialInfo.getFd_3b35a57b6e9d0a()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3b35a57b6e9d0a()));
if (CommonConstants.ZERO_STRING.equals(socialParam.getYgFlag())) { if (CommonConstants.ZERO_STRING.equals(socialParam.getYgFlag())) {
stringBuilder.append(socialParam.getSocialIds()).append(","); stringBuilder.append(socialParam.getSocialIds()).append(",");
......
...@@ -507,7 +507,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable { ...@@ -507,7 +507,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
* 委托备注 * 委托备注
*/ */
@Length(max = 100, message = "委托备注 不能超过100 个字符" ) @Length(max = 100, message = "委托备注 不能超过100 个字符" )
@ExcelAttribute(name = "委托备注", maxLength = 100,isDataId = true,dataType = ExcelAttributeConstants.TRUST_REMARK_REDUCE) @ExcelAttribute(name = "委托备注", maxLength = 100,isDataId = true,dataType = ExcelAttributeConstants.TRUST_REMARK_ADD,isConvert = false)
@Schema(description = "委托备注" ) @Schema(description = "委托备注" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("委托备注" ) @ExcelProperty("委托备注" )
......
...@@ -104,7 +104,7 @@ public class TDispatchReduceVo extends RowIndex implements Serializable { ...@@ -104,7 +104,7 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
/** /**
* 委托备注 * 委托备注
*/ */
@ExcelAttribute(name = "委托备注" , maxLength = 200,isDataId = true,dataType = ExcelAttributeConstants.TRUST_REMARK_ADD) @ExcelAttribute(name = "委托备注" , maxLength = 200,isDataId = true,dataType = ExcelAttributeConstants.TRUST_REMARK_REDUCE,isConvert = false)
@Schema(description = "委托备注" ) @Schema(description = "委托备注" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("委托备注" ) @ExcelProperty("委托备注" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment