代码提交

liusheng

4 小时以前 c4fe2f14252c10288ed85bf2147cdd3cba9208f4

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java

@@ -861,24 +861,26 @@
            }
        }
        dataMap.put("ZYQS", serviceDonatebaseinfo.getMajorrelatives() == null ? "" : serviceDonatebaseinfo.getMajorrelatives());
        dataMap.put("YJXZGX", serviceDonatebaseinfo.getFamilyrelations() == null ? "" : serviceDonatebaseinfo.getFamilyrelations());
//        dataMap.put("YJXZGX", serviceDonatebaseinfo.getFamilyrelations() == null ? "" : serviceDonatebaseinfo.getFamilyrelations());

        if (serviceDonatebaseinfo.getFamilyrelations() == null) {
            dataMap.put("YJXZGX", "");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("0")) {
            dataMap.put("YJXZGX", "本人");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("1")) {
        }  else if (serviceDonatebaseinfo.getFamilyrelations().equals("0")) {
            dataMap.put("YJXZGX", "配偶");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("1")) {
            dataMap.put("YJXZGX", "父子");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("2")) {
            dataMap.put("YJXZGX", "子");
            dataMap.put("YJXZGX", "父女");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("3")) {
            dataMap.put("YJXZGX", "女");
            dataMap.put("YJXZGX", "母子");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("4")) {
            dataMap.put("YJXZGX", "父母");
            dataMap.put("YJXZGX", "母女");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("5")) {
            dataMap.put("YJXZGX", "爷爷");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("6")) {
            dataMap.put("YJXZGX", "其他");
            dataMap.put("YJXZGX", "兄弟姐妹");
        }else if (serviceDonatebaseinfo.getFamilyrelations().equals("6")) {
            dataMap.put("YJXZGX", "姐妹");
        }else if (serviceDonatebaseinfo.getFamilyrelations().equals("7")) {
            dataMap.put("YJXZGX", "受委托人");
        }
        //信息来源
        if (serviceDonatebaseinfo.getInfosources().contains("红十字会")) {