拼接备注

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -327,10 +327,32 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                         sysDeptAccountHistory.setToBankCard(null);
                         sysDeptAccountHistory.setUserId(BaseController.getUser().getId());
                         sysDeptAccountHistory.setCreateTime(new Date());
-                        sysDeptAccountHistory.setRemark("交强" + i + "级机构管理费:" + jqDeptPremiumsLevels[i - 1] +
-                                ",商业" + i + "级机构管理费:" + syDeptPremiumsLevels[i - 1] +
-                                ",非车" + i + "级机构管理费:" + noDeptPremiumsLevels[i - 1] +
-                                ",分销费:" + distributionFee);
+                        // 拼接备注
+                        StringBuilder remarkBuilder = new StringBuilder();
+                        if (jqDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("交强").append(i).append("级机构管理费:");
+                            remarkBuilder.append(jqDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (syDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("商业").append(i).append("级机构管理费:");
+                            remarkBuilder.append(syDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (noDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("非车").append(i).append("级机构管理费:");
+                            remarkBuilder.append(noDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (distributionFee.compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("分销费:").append(distributionFee).append(",");
+                        }
+                        String remark = remarkBuilder.toString();
+                        if (remark.endsWith(",")) {
+                            remark = remark.substring(0, remark.length() - 1);
+                        }
+                        sysDeptAccountHistory.setRemark(remark);
+//                        sysDeptAccountHistory.setRemark("交强" + i + "级机构管理费:" + jqDeptPremiumsLevels[i - 1] +
+//                                ",商业" + i + "级机构管理费:" + syDeptPremiumsLevels[i - 1] +
+//                                ",非车" + i + "级机构管理费:" + noDeptPremiumsLevels[i - 1] +
+//                                ",分销费:" + distributionFee);
                         sysDeptAccountHistoryService.save(sysDeptAccountHistory);
                     } else {
                         // 如果机构信息为空，新建机构信息并记录历史
@@ -351,10 +373,32 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                         sysDeptAccountHistory.setToBankCard(null);
                         sysDeptAccountHistory.setUserId(BaseController.getUser().getId());
                         sysDeptAccountHistory.setCreateTime(new Date());
-                        sysDeptAccountHistory.setRemark("交强" + i + "级机构管理费:" + jqDeptPremiumsLevels[i - 1] +
-                                ",商业" + i + "级机构管理费:" + syDeptPremiumsLevels[i - 1] +
-                                ",非车" + i + "级机构管理费:" + noDeptPremiumsLevels[i - 1] +
-                                ",分销费:" + distributionFee);
+                        // 拼接备注信息
+                        StringBuilder remarkBuilder = new StringBuilder();
+                        if (jqDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("交强").append(i).append("级机构管理费:");
+                            remarkBuilder.append(jqDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (syDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("商业").append(i).append("级机构管理费:");
+                            remarkBuilder.append(syDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (noDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("非车").append(i).append("级机构管理费:");
+                            remarkBuilder.append(noDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (distributionFee.compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("分销费:").append(distributionFee).append(",");
+                        }
+                        String remark = remarkBuilder.toString();
+                        if (remark.endsWith(",")) {
+                            remark = remark.substring(0, remark.length() - 1);
+                        }
+                        sysDeptAccountHistory.setRemark(remark);
+//                        sysDeptAccountHistory.setRemark("交强" + i + "级机构管理费:" + jqDeptPremiumsLevels[i - 1] +
+//                                ",商业" + i + "级机构管理费:" + syDeptPremiumsLevels[i - 1] +
+//                                ",非车" + i + "级机构管理费:" + noDeptPremiumsLevels[i - 1] +
+//                                ",分销费:" + distributionFee);
                         sysDeptAccountHistoryService.save(sysDeptAccountHistory);
                     }
                 }
@@ -564,10 +608,32 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                         sysDeptAccountHistory.setToBankCard(null);
                         sysDeptAccountHistory.setUserId(BaseController.getUser().getId());
                         sysDeptAccountHistory.setCreateTime(new Date());
-                        sysDeptAccountHistory.setRemark("交强" + i + "级机构管理费:" + jqDeptPremiumsLevels[i - 1] +
-                                ",商业" + i + "级机构管理费:" + syDeptPremiumsLevels[i - 1] +
-                                ",非车" + i + "级机构管理费:" + noDeptPremiumsLevels[i - 1] +
-                                ",分销费:" + distributionFee);
+                        // 拼接备注信息
+                        StringBuilder remarkBuilder = new StringBuilder();
+                        if (jqDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("交强").append(i).append("级机构管理费:");
+                            remarkBuilder.append(jqDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (syDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("商业").append(i).append("级机构管理费:");
+                            remarkBuilder.append(syDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (noDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("非车").append(i).append("级机构管理费:");
+                            remarkBuilder.append(noDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (distributionFee.compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("分销费:").append(distributionFee).append(",");
+                        }
+                        String remark = remarkBuilder.toString();
+                        if (remark.endsWith(",")) {
+                            remark = remark.substring(0, remark.length() - 1);
+                        }
+                        sysDeptAccountHistory.setRemark(remark);
+//                        sysDeptAccountHistory.setRemark("交强" + i + "级机构管理费:" + jqDeptPremiumsLevels[i - 1] +
+//                                ",商业" + i + "级机构管理费:" + syDeptPremiumsLevels[i - 1] +
+//                                ",非车" + i + "级机构管理费:" + noDeptPremiumsLevels[i - 1] +
+//                                ",分销费:" + distributionFee);
                         sysDeptAccountHistoryService.save(sysDeptAccountHistory);
                     } else {
                         // 如果机构信息为空，新建机构信息并记录历史
@@ -588,10 +654,32 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                         sysDeptAccountHistory.setToBankCard(null);
                         sysDeptAccountHistory.setUserId(BaseController.getUser().getId());
                         sysDeptAccountHistory.setCreateTime(new Date());
-                        sysDeptAccountHistory.setRemark("交强" + i + "级机构管理费:" + jqDeptPremiumsLevels[i - 1] +
-                                ",商业" + i + "级机构管理费:" + syDeptPremiumsLevels[i - 1] +
-                                ",非车" + i + "级机构管理费:" + noDeptPremiumsLevels[i - 1] +
-                                ",分销费:" + distributionFee);
+                        // 拼接备注信息
+                        StringBuilder remarkBuilder = new StringBuilder();
+                        if (jqDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("交强").append(i).append("级机构管理费:");
+                            remarkBuilder.append(jqDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (syDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("商业").append(i).append("级机构管理费:");
+                            remarkBuilder.append(syDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (noDeptPremiumsLevels[i - 1].compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("非车").append(i).append("级机构管理费:");
+                            remarkBuilder.append(noDeptPremiumsLevels[i - 1]).append(",");
+                        }
+                        if (distributionFee.compareTo(BigDecimal.ZERO) != 0) {
+                            remarkBuilder.append("分销费:").append(distributionFee).append(",");
+                        }
+                        String remark = remarkBuilder.toString();
+                        if (remark.endsWith(",")) {
+                            remark = remark.substring(0, remark.length() - 1);
+                        }
+                        sysDeptAccountHistory.setRemark(remark);
+//                        sysDeptAccountHistory.setRemark("交强" + i + "级机构管理费:" + jqDeptPremiumsLevels[i - 1] +
+//                                ",商业" + i + "级机构管理费:" + syDeptPremiumsLevels[i - 1] +
+//                                ",非车" + i + "级机构管理费:" + noDeptPremiumsLevels[i - 1] +
+//                                ",分销费:" + distributionFee);
                         sysDeptAccountHistoryService.save(sysDeptAccountHistory);
                     }
                 }