|
@@ -977,6 +977,12 @@ public class XgStudentMsgBatchServiceImpl implements IXgStudentMsgBatchService {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ batchVo = baseMapper.selectVoOne(
|
|
|
|
|
+ Wrappers.<XgStudentMsgBatch>lambdaQuery()
|
|
|
|
|
+ .eq(XgStudentMsgBatch::getBatchId, batchId)
|
|
|
|
|
+ .eq(XgStudentMsgBatch::getId, userId)
|
|
|
|
|
+ .eq(XgStudentMsgBatch::getDeleted, 0));
|
|
|
|
|
+
|
|
|
// 第二步:将 xg_student_msg_batch 的数据更新到 xg_student_msg 表
|
|
// 第二步:将 xg_student_msg_batch 的数据更新到 xg_student_msg 表
|
|
|
// 手动将 XgStudentMsgBatchVo 转换为 XgStudentMsgBo
|
|
// 手动将 XgStudentMsgBatchVo 转换为 XgStudentMsgBo
|
|
|
org.dromara.xg.domain.bo.XgStudentMsgBo studentMsgBo = new org.dromara.xg.domain.bo.XgStudentMsgBo();
|
|
org.dromara.xg.domain.bo.XgStudentMsgBo studentMsgBo = new org.dromara.xg.domain.bo.XgStudentMsgBo();
|
|
@@ -1169,81 +1175,145 @@ public class XgStudentMsgBatchServiceImpl implements IXgStudentMsgBatchService {
|
|
|
|
|
|
|
|
// 比较字段差异
|
|
// 比较字段差异
|
|
|
compareAndAddChange(changedFields, "姓名", "name", originalData.getName(), batchData.getName());
|
|
compareAndAddChange(changedFields, "姓名", "name", originalData.getName(), batchData.getName());
|
|
|
- compareAndAddChange(changedFields, "英文姓名", "nameEnglish", originalData.getNameEnglish(), batchData.getNameEnglish());
|
|
|
|
|
- compareAndAddChange(changedFields, "曾用名", "formerName", originalData.getFormerName(), batchData.getFormerName());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "英文姓名", "nameEnglish", originalData.getNameEnglish(),
|
|
|
|
|
+ batchData.getNameEnglish());
|
|
|
|
|
+ compareAndAddChange(changedFields, "曾用名", "formerName", originalData.getFormerName(),
|
|
|
|
|
+ batchData.getFormerName());
|
|
|
compareAndAddChange(changedFields, "性别", "gender", originalData.getGender(), batchData.getGender());
|
|
compareAndAddChange(changedFields, "性别", "gender", originalData.getGender(), batchData.getGender());
|
|
|
- compareAndAddChange(changedFields, "出生日期", "birthDate", originalData.getBirthDate(), batchData.getBirthDate());
|
|
|
|
|
- compareAndAddChange(changedFields, "民族", "nationality", originalData.getNationality(), batchData.getNationality());
|
|
|
|
|
- compareAndAddChange(changedFields, "籍贯", "nativePlace", originalData.getNativePlace(), batchData.getNativePlace());
|
|
|
|
|
- compareAndAddChange(changedFields, "政治面貌", "politicalStatus", originalData.getPoliticalStatus(), batchData.getPoliticalStatus());
|
|
|
|
|
- compareAndAddChange(changedFields, "户籍所在地", "hukouLocation", originalData.getHukouLocation(), batchData.getHukouLocation());
|
|
|
|
|
- compareAndAddChange(changedFields, "家庭地址", "homeAddress", originalData.getHomeAddress(), batchData.getHomeAddress());
|
|
|
|
|
- compareAndAddChange(changedFields, "现住址", "currentAddress", originalData.getCurrentAddress(), batchData.getCurrentAddress());
|
|
|
|
|
- compareAndAddChange(changedFields, "邮政编码", "postalCode", originalData.getPostalCode(), batchData.getPostalCode());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "出生日期", "birthDate", originalData.getBirthDate(),
|
|
|
|
|
+ batchData.getBirthDate());
|
|
|
|
|
+ compareAndAddChange(changedFields, "民族", "nationality", originalData.getNationality(),
|
|
|
|
|
+ batchData.getNationality());
|
|
|
|
|
+ compareAndAddChange(changedFields, "籍贯", "nativePlace", originalData.getNativePlace(),
|
|
|
|
|
+ batchData.getNativePlace());
|
|
|
|
|
+ compareAndAddChange(changedFields, "政治面貌", "politicalStatus", originalData.getPoliticalStatus(),
|
|
|
|
|
+ batchData.getPoliticalStatus());
|
|
|
|
|
+ compareAndAddChange(changedFields, "户籍所在地", "hukouLocation", originalData.getHukouLocation(),
|
|
|
|
|
+ batchData.getHukouLocation());
|
|
|
|
|
+ compareAndAddChange(changedFields, "家庭地址", "homeAddress", originalData.getHomeAddress(),
|
|
|
|
|
+ batchData.getHomeAddress());
|
|
|
|
|
+ compareAndAddChange(changedFields, "现住址", "currentAddress", originalData.getCurrentAddress(),
|
|
|
|
|
+ batchData.getCurrentAddress());
|
|
|
|
|
+ compareAndAddChange(changedFields, "邮政编码", "postalCode", originalData.getPostalCode(),
|
|
|
|
|
+ batchData.getPostalCode());
|
|
|
compareAndAddChange(changedFields, "手机号码", "phone", originalData.getPhone(), batchData.getPhone());
|
|
compareAndAddChange(changedFields, "手机号码", "phone", originalData.getPhone(), batchData.getPhone());
|
|
|
- compareAndAddChange(changedFields, "是否住校", "isBoarder", originalData.getIsBoarder(), batchData.getIsBoarder());
|
|
|
|
|
- compareAndAddChange(changedFields, "文化程度", "educationLevel", originalData.getEducationLevel(), batchData.getEducationLevel());
|
|
|
|
|
- compareAndAddChange(changedFields, "户口类型", "householdRegisterType", originalData.getHouseholdRegisterType(), batchData.getHouseholdRegisterType());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "是否住校", "isBoarder", originalData.getIsBoarder(),
|
|
|
|
|
+ batchData.getIsBoarder());
|
|
|
|
|
+ compareAndAddChange(changedFields, "文化程度", "educationLevel", originalData.getEducationLevel(),
|
|
|
|
|
+ batchData.getEducationLevel());
|
|
|
|
|
+ compareAndAddChange(changedFields, "户口类型", "householdRegisterType", originalData.getHouseholdRegisterType(),
|
|
|
|
|
+ batchData.getHouseholdRegisterType());
|
|
|
compareAndAddChange(changedFields, "宗教信仰", "religion", originalData.getReligion(), batchData.getReligion());
|
|
compareAndAddChange(changedFields, "宗教信仰", "religion", originalData.getReligion(), batchData.getReligion());
|
|
|
- compareAndAddChange(changedFields, "生源地区", "sourceRegion", originalData.getSourceRegion(), batchData.getSourceRegion());
|
|
|
|
|
- compareAndAddChange(changedFields, "毕业院校", "graduateSchool", originalData.getGraduateSchool(), batchData.getGraduateSchool());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "生源地区", "sourceRegion", originalData.getSourceRegion(),
|
|
|
|
|
+ batchData.getSourceRegion());
|
|
|
|
|
+ compareAndAddChange(changedFields, "毕业院校", "graduateSchool", originalData.getGraduateSchool(),
|
|
|
|
|
+ batchData.getGraduateSchool());
|
|
|
compareAndAddChange(changedFields, "电子邮箱", "email", originalData.getEmail(), batchData.getEmail());
|
|
compareAndAddChange(changedFields, "电子邮箱", "email", originalData.getEmail(), batchData.getEmail());
|
|
|
compareAndAddChange(changedFields, "QQ号码", "qq", originalData.getQq(), batchData.getQq());
|
|
compareAndAddChange(changedFields, "QQ号码", "qq", originalData.getQq(), batchData.getQq());
|
|
|
compareAndAddChange(changedFields, "微信号", "wechat", originalData.getWechat(), batchData.getWechat());
|
|
compareAndAddChange(changedFields, "微信号", "wechat", originalData.getWechat(), batchData.getWechat());
|
|
|
- compareAndAddChange(changedFields, "婚姻状况", "maritalStatus", originalData.getMaritalStatus(), batchData.getMaritalStatus());
|
|
|
|
|
- compareAndAddChange(changedFields, "紧急联系人姓名", "emergencyContactName", originalData.getEmergencyContactName(), batchData.getEmergencyContactName());
|
|
|
|
|
- compareAndAddChange(changedFields, "紧急联系人电话", "emergencyContactPhone", originalData.getEmergencyContactPhone(), batchData.getEmergencyContactPhone());
|
|
|
|
|
- compareAndAddChange(changedFields, "紧急联系人关系", "emergencyContactRelation", originalData.getEmergencyContactRelation(), batchData.getEmergencyContactRelation());
|
|
|
|
|
- compareAndAddChange(changedFields, "是否贫困生", "isPoorStudent", originalData.getIsPoorStudent(), batchData.getIsPoorStudent());
|
|
|
|
|
- compareAndAddChange(changedFields, "是否少数民族", "isMinority", originalData.getIsMinority(), batchData.getIsMinority());
|
|
|
|
|
- compareAndAddChange(changedFields, "是否残疾", "isDisabled", originalData.getIsDisabled(), batchData.getIsDisabled());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "婚姻状况", "maritalStatus", originalData.getMaritalStatus(),
|
|
|
|
|
+ batchData.getMaritalStatus());
|
|
|
|
|
+ compareAndAddChange(changedFields, "紧急联系人姓名", "emergencyContactName",
|
|
|
|
|
+ originalData.getEmergencyContactName(), batchData.getEmergencyContactName());
|
|
|
|
|
+ compareAndAddChange(changedFields, "紧急联系人电话", "emergencyContactPhone",
|
|
|
|
|
+ originalData.getEmergencyContactPhone(), batchData.getEmergencyContactPhone());
|
|
|
|
|
+ compareAndAddChange(changedFields, "紧急联系人关系", "emergencyContactRelation",
|
|
|
|
|
+ originalData.getEmergencyContactRelation(), batchData.getEmergencyContactRelation());
|
|
|
|
|
+ compareAndAddChange(changedFields, "是否贫困生", "isPoorStudent", originalData.getIsPoorStudent(),
|
|
|
|
|
+ batchData.getIsPoorStudent());
|
|
|
|
|
+ compareAndAddChange(changedFields, "是否少数民族", "isMinority", originalData.getIsMinority(),
|
|
|
|
|
+ batchData.getIsMinority());
|
|
|
|
|
+ compareAndAddChange(changedFields, "是否残疾", "isDisabled", originalData.getIsDisabled(),
|
|
|
|
|
+ batchData.getIsDisabled());
|
|
|
compareAndAddChange(changedFields, "是否孤儿", "isOrphan", originalData.getIsOrphan(), batchData.getIsOrphan());
|
|
compareAndAddChange(changedFields, "是否孤儿", "isOrphan", originalData.getIsOrphan(), batchData.getIsOrphan());
|
|
|
- compareAndAddChange(changedFields, "是否留守儿童", "isLeftBehindChild", originalData.getIsLeftBehindChild(), batchData.getIsLeftBehindChild());
|
|
|
|
|
- compareAndAddChange(changedFields, "是否独生子女", "isSingleChild", originalData.getIsSingleChild(), batchData.getIsSingleChild());
|
|
|
|
|
- compareAndAddChange(changedFields, "是否低保", "isLowIncome", originalData.getIsLowIncome(), batchData.getIsLowIncome());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "是否留守儿童", "isLeftBehindChild", originalData.getIsLeftBehindChild(),
|
|
|
|
|
+ batchData.getIsLeftBehindChild());
|
|
|
|
|
+ compareAndAddChange(changedFields, "是否独生子女", "isSingleChild", originalData.getIsSingleChild(),
|
|
|
|
|
+ batchData.getIsSingleChild());
|
|
|
|
|
+ compareAndAddChange(changedFields, "是否低保", "isLowIncome", originalData.getIsLowIncome(),
|
|
|
|
|
+ batchData.getIsLowIncome());
|
|
|
compareAndAddChange(changedFields, "是否有助学贷款", "hasLoan", originalData.getHasLoan(), batchData.getHasLoan());
|
|
compareAndAddChange(changedFields, "是否有助学贷款", "hasLoan", originalData.getHasLoan(), batchData.getHasLoan());
|
|
|
- compareAndAddChange(changedFields, "助学贷款金额", "loanAmount", originalData.getLoanAmount(), batchData.getLoanAmount());
|
|
|
|
|
- compareAndAddChange(changedFields, "特长爱好", "specialties", originalData.getSpecialties(), batchData.getSpecialties());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "助学贷款金额", "loanAmount", originalData.getLoanAmount(),
|
|
|
|
|
+ batchData.getLoanAmount());
|
|
|
|
|
+ compareAndAddChange(changedFields, "特长爱好", "specialties", originalData.getSpecialties(),
|
|
|
|
|
+ batchData.getSpecialties());
|
|
|
compareAndAddChange(changedFields, "获奖情况", "awards", originalData.getAwards(), batchData.getAwards());
|
|
compareAndAddChange(changedFields, "获奖情况", "awards", originalData.getAwards(), batchData.getAwards());
|
|
|
- compareAndAddChange(changedFields, "违纪记录", "violations", originalData.getViolations(), batchData.getViolations());
|
|
|
|
|
- compareAndAddChange(changedFields, "社会活动", "socialActivities", originalData.getSocialActivities(), batchData.getSocialActivities());
|
|
|
|
|
- compareAndAddChange(changedFields, "父亲姓名", "fatherName", originalData.getFatherName(), batchData.getFatherName());
|
|
|
|
|
- compareAndAddChange(changedFields, "父亲电话", "fatherPhone", originalData.getFatherPhone(), batchData.getFatherPhone());
|
|
|
|
|
- compareAndAddChange(changedFields, "父亲工作单位", "fatherWorkUnit", originalData.getFatherWorkUnit(), batchData.getFatherWorkUnit());
|
|
|
|
|
- compareAndAddChange(changedFields, "母亲姓名", "motherName", originalData.getMotherName(), batchData.getMotherName());
|
|
|
|
|
- compareAndAddChange(changedFields, "母亲电话", "motherPhone", originalData.getMotherPhone(), batchData.getMotherPhone());
|
|
|
|
|
- compareAndAddChange(changedFields, "母亲工作单位", "motherWorkUnit", originalData.getMotherWorkUnit(), batchData.getMotherWorkUnit());
|
|
|
|
|
- compareAndAddChange(changedFields, "监护人姓名", "guardianName", originalData.getGuardianName(), batchData.getGuardianName());
|
|
|
|
|
- compareAndAddChange(changedFields, "监护人电话", "guardianPhone", originalData.getGuardianPhone(), batchData.getGuardianPhone());
|
|
|
|
|
- compareAndAddChange(changedFields, "监护人关系", "guardianRelation", originalData.getGuardianRelation(), batchData.getGuardianRelation());
|
|
|
|
|
- compareAndAddChange(changedFields, "家庭年收入", "familyIncome", originalData.getFamilyIncome(), batchData.getFamilyIncome());
|
|
|
|
|
- compareAndAddChange(changedFields, "人均收入", "perCapitaIncome", originalData.getPerCapitaIncome(), batchData.getPerCapitaIncome());
|
|
|
|
|
- compareAndAddChange(changedFields, "收入来源", "incomeSource", originalData.getIncomeSource(), batchData.getIncomeSource());
|
|
|
|
|
- compareAndAddChange(changedFields, "家庭经济状况", "familyEconomicStatus", originalData.getFamilyEconomicStatus(), batchData.getFamilyEconomicStatus());
|
|
|
|
|
- compareAndAddChange(changedFields, "家庭成员数量", "familyMembers", originalData.getFamilyMembers(), batchData.getFamilyMembers());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "违纪记录", "violations", originalData.getViolations(),
|
|
|
|
|
+ batchData.getViolations());
|
|
|
|
|
+ compareAndAddChange(changedFields, "社会活动", "socialActivities", originalData.getSocialActivities(),
|
|
|
|
|
+ batchData.getSocialActivities());
|
|
|
|
|
+ compareAndAddChange(changedFields, "父亲姓名", "fatherName", originalData.getFatherName(),
|
|
|
|
|
+ batchData.getFatherName());
|
|
|
|
|
+ compareAndAddChange(changedFields, "父亲电话", "fatherPhone", originalData.getFatherPhone(),
|
|
|
|
|
+ batchData.getFatherPhone());
|
|
|
|
|
+ compareAndAddChange(changedFields, "父亲工作单位", "fatherWorkUnit", originalData.getFatherWorkUnit(),
|
|
|
|
|
+ batchData.getFatherWorkUnit());
|
|
|
|
|
+ compareAndAddChange(changedFields, "母亲姓名", "motherName", originalData.getMotherName(),
|
|
|
|
|
+ batchData.getMotherName());
|
|
|
|
|
+ compareAndAddChange(changedFields, "母亲电话", "motherPhone", originalData.getMotherPhone(),
|
|
|
|
|
+ batchData.getMotherPhone());
|
|
|
|
|
+ compareAndAddChange(changedFields, "母亲工作单位", "motherWorkUnit", originalData.getMotherWorkUnit(),
|
|
|
|
|
+ batchData.getMotherWorkUnit());
|
|
|
|
|
+ compareAndAddChange(changedFields, "监护人姓名", "guardianName", originalData.getGuardianName(),
|
|
|
|
|
+ batchData.getGuardianName());
|
|
|
|
|
+ compareAndAddChange(changedFields, "监护人电话", "guardianPhone", originalData.getGuardianPhone(),
|
|
|
|
|
+ batchData.getGuardianPhone());
|
|
|
|
|
+ compareAndAddChange(changedFields, "监护人关系", "guardianRelation", originalData.getGuardianRelation(),
|
|
|
|
|
+ batchData.getGuardianRelation());
|
|
|
|
|
+ compareAndAddChange(changedFields, "家庭年收入", "familyIncome", originalData.getFamilyIncome(),
|
|
|
|
|
+ batchData.getFamilyIncome());
|
|
|
|
|
+ compareAndAddChange(changedFields, "人均收入", "perCapitaIncome", originalData.getPerCapitaIncome(),
|
|
|
|
|
+ batchData.getPerCapitaIncome());
|
|
|
|
|
+ compareAndAddChange(changedFields, "收入来源", "incomeSource", originalData.getIncomeSource(),
|
|
|
|
|
+ batchData.getIncomeSource());
|
|
|
|
|
+ compareAndAddChange(changedFields, "家庭经济状况", "familyEconomicStatus", originalData.getFamilyEconomicStatus(),
|
|
|
|
|
+ batchData.getFamilyEconomicStatus());
|
|
|
|
|
+ compareAndAddChange(changedFields, "家庭成员数量", "familyMembers", originalData.getFamilyMembers(),
|
|
|
|
|
+ batchData.getFamilyMembers());
|
|
|
compareAndAddChange(changedFields, "身高", "height", originalData.getHeight(), batchData.getHeight());
|
|
compareAndAddChange(changedFields, "身高", "height", originalData.getHeight(), batchData.getHeight());
|
|
|
compareAndAddChange(changedFields, "体重", "weight", originalData.getWeight(), batchData.getWeight());
|
|
compareAndAddChange(changedFields, "体重", "weight", originalData.getWeight(), batchData.getWeight());
|
|
|
- compareAndAddChange(changedFields, "血型", "bloodType", originalData.getBloodType(), batchData.getBloodType());
|
|
|
|
|
- compareAndAddChange(changedFields, "健康状况", "healthStatus", originalData.getHealthStatus(), batchData.getHealthStatus());
|
|
|
|
|
- compareAndAddChange(changedFields, "特殊体质或疾病", "specialCondition", originalData.getSpecialCondition(), batchData.getSpecialCondition());
|
|
|
|
|
- compareAndAddChange(changedFields, "病史", "medicalHistory", originalData.getMedicalHistory(), batchData.getMedicalHistory());
|
|
|
|
|
- compareAndAddChange(changedFields, "过敏史", "allergies", originalData.getAllergies(), batchData.getAllergies());
|
|
|
|
|
- compareAndAddChange(changedFields, "残疾类型", "disabilityType", originalData.getDisabilityType(), batchData.getDisabilityType());
|
|
|
|
|
- compareAndAddChange(changedFields, "残疾等级", "disabilityLevel", originalData.getDisabilityLevel(), batchData.getDisabilityLevel());
|
|
|
|
|
- compareAndAddChange(changedFields, "录取类别", "admissionCategory", originalData.getAdmissionCategory(), batchData.getAdmissionCategory());
|
|
|
|
|
- compareAndAddChange(changedFields, "学籍状态", "studentStatus", originalData.getStudentStatus(), batchData.getStudentStatus());
|
|
|
|
|
- compareAndAddChange(changedFields, "入学年份", "enrollmentYear", originalData.getEnrollmentYear(), batchData.getEnrollmentYear());
|
|
|
|
|
- compareAndAddChange(changedFields, "入学日期", "enrollmentDate", originalData.getEnrollmentDate(), batchData.getEnrollmentDate());
|
|
|
|
|
- compareAndAddChange(changedFields, "银行卡号", "bankCardNo", originalData.getBankCardNo(), batchData.getBankCardNo());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "血型", "bloodType", originalData.getBloodType(),
|
|
|
|
|
+ batchData.getBloodType());
|
|
|
|
|
+ compareAndAddChange(changedFields, "健康状况", "healthStatus", originalData.getHealthStatus(),
|
|
|
|
|
+ batchData.getHealthStatus());
|
|
|
|
|
+ compareAndAddChange(changedFields, "特殊体质或疾病", "specialCondition", originalData.getSpecialCondition(),
|
|
|
|
|
+ batchData.getSpecialCondition());
|
|
|
|
|
+ compareAndAddChange(changedFields, "病史", "medicalHistory", originalData.getMedicalHistory(),
|
|
|
|
|
+ batchData.getMedicalHistory());
|
|
|
|
|
+ compareAndAddChange(changedFields, "过敏史", "allergies", originalData.getAllergies(),
|
|
|
|
|
+ batchData.getAllergies());
|
|
|
|
|
+ compareAndAddChange(changedFields, "残疾类型", "disabilityType", originalData.getDisabilityType(),
|
|
|
|
|
+ batchData.getDisabilityType());
|
|
|
|
|
+ compareAndAddChange(changedFields, "残疾等级", "disabilityLevel", originalData.getDisabilityLevel(),
|
|
|
|
|
+ batchData.getDisabilityLevel());
|
|
|
|
|
+ compareAndAddChange(changedFields, "录取类别", "admissionCategory", originalData.getAdmissionCategory(),
|
|
|
|
|
+ batchData.getAdmissionCategory());
|
|
|
|
|
+ compareAndAddChange(changedFields, "学籍状态", "studentStatus", originalData.getStudentStatus(),
|
|
|
|
|
+ batchData.getStudentStatus());
|
|
|
|
|
+ compareAndAddChange(changedFields, "入学年份", "enrollmentYear", originalData.getEnrollmentYear(),
|
|
|
|
|
+ batchData.getEnrollmentYear());
|
|
|
|
|
+ compareAndAddChange(changedFields, "入学日期", "enrollmentDate", originalData.getEnrollmentDate(),
|
|
|
|
|
+ batchData.getEnrollmentDate());
|
|
|
|
|
+ compareAndAddChange(changedFields, "银行卡号", "bankCardNo", originalData.getBankCardNo(),
|
|
|
|
|
+ batchData.getBankCardNo());
|
|
|
compareAndAddChange(changedFields, "开户银行", "bankName", originalData.getBankName(), batchData.getBankName());
|
|
compareAndAddChange(changedFields, "开户银行", "bankName", originalData.getBankName(), batchData.getBankName());
|
|
|
- compareAndAddChange(changedFields, "开户支行", "bankBranch", originalData.getBankBranch(), batchData.getBankBranch());
|
|
|
|
|
- compareAndAddChange(changedFields, "持卡人姓名", "cardHolderName", originalData.getCardHolderName(), batchData.getCardHolderName());
|
|
|
|
|
- compareAndAddChange(changedFields, "扩展字段1", "extField1", originalData.getExtField1(), batchData.getExtField1());
|
|
|
|
|
- compareAndAddChange(changedFields, "扩展字段2", "extField2", originalData.getExtField2(), batchData.getExtField2());
|
|
|
|
|
- compareAndAddChange(changedFields, "扩展字段3", "extField3", originalData.getExtField3(), batchData.getExtField3());
|
|
|
|
|
- compareAndAddChange(changedFields, "扩展字段4", "extField4", originalData.getExtField4(), batchData.getExtField4());
|
|
|
|
|
- compareAndAddChange(changedFields, "扩展字段5", "extField5", originalData.getExtField5(), batchData.getExtField5());
|
|
|
|
|
|
|
+ compareAndAddChange(changedFields, "开户支行", "bankBranch", originalData.getBankBranch(),
|
|
|
|
|
+ batchData.getBankBranch());
|
|
|
|
|
+ compareAndAddChange(changedFields, "持卡人姓名", "cardHolderName", originalData.getCardHolderName(),
|
|
|
|
|
+ batchData.getCardHolderName());
|
|
|
|
|
+ compareAndAddChange(changedFields, "扩展字段1", "extField1", originalData.getExtField1(),
|
|
|
|
|
+ batchData.getExtField1());
|
|
|
|
|
+ compareAndAddChange(changedFields, "扩展字段2", "extField2", originalData.getExtField2(),
|
|
|
|
|
+ batchData.getExtField2());
|
|
|
|
|
+ compareAndAddChange(changedFields, "扩展字段3", "extField3", originalData.getExtField3(),
|
|
|
|
|
+ batchData.getExtField3());
|
|
|
|
|
+ compareAndAddChange(changedFields, "扩展字段4", "extField4", originalData.getExtField4(),
|
|
|
|
|
+ batchData.getExtField4());
|
|
|
|
|
+ compareAndAddChange(changedFields, "扩展字段5", "extField5", originalData.getExtField5(),
|
|
|
|
|
+ batchData.getExtField5());
|
|
|
compareAndAddChange(changedFields, "备注信息", "remark", originalData.getRemark(), batchData.getRemark());
|
|
compareAndAddChange(changedFields, "备注信息", "remark", originalData.getRemark(), batchData.getRemark());
|
|
|
|
|
+ compareAndAddChange(changedFields, "培养方式", "trainingType", originalData.getTrainingType(),
|
|
|
|
|
+ batchData.getTrainingType());
|
|
|
|
|
|
|
|
result.put("hasOriginalData", true);
|
|
result.put("hasOriginalData", true);
|
|
|
result.put("hasBatchData", true);
|
|
result.put("hasBatchData", true);
|
|
@@ -1272,7 +1342,7 @@ public class XgStudentMsgBatchServiceImpl implements IXgStudentMsgBatchService {
|
|
|
* @param originalValue 原始值
|
|
* @param originalValue 原始值
|
|
|
* @param newValue 新值
|
|
* @param newValue 新值
|
|
|
*/
|
|
*/
|
|
|
- private void compareAndAddChange(List<Map<String, Object>> changedFields, String fieldLabel, String fieldName,
|
|
|
|
|
|
|
+ private void compareAndAddChange(List<Map<String, Object>> changedFields, String fieldLabel, String fieldName,
|
|
|
Object originalValue, Object newValue) {
|
|
Object originalValue, Object newValue) {
|
|
|
// 处理null值比较
|
|
// 处理null值比较
|
|
|
boolean isChanged = false;
|
|
boolean isChanged = false;
|