diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/CjStudentController.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/CjStudentController.java index 5ca9adc..eb00416 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/CjStudentController.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/CjStudentController.java @@ -148,7 +148,7 @@ public class CjStudentController extends BaseController if (successNum > 0) { return AjaxResult.success("成功导入" + successNum + "条数据"); }else if (successNum == 0){ - return AjaxResult.success("导入数据量为0,请检查导入的Excel是否与模板相同"); + return AjaxResult.success("导入数据量为0,请检查导入的Excel是否与模板相同,并保证更新内容"); }else { return AjaxResult.error("导入失败,请检查信息采集内容是否正确"); } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java index d05bb68..e1ef79d 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java @@ -243,7 +243,7 @@ public class XyCheckController extends BaseController { check.setWxCount(check.getGxCount() - check.getYxCount()); check.setBzCount(bzs.get(i).getDataCount()); check.setBzYxCount(bzyx.get(i).getDataCount()); - check.setBzWxCount(check.getBzCount() - check.getYxCount()); + check.setBzWxCount(check.getBzCount() - check.getBzYxCount()); checks.add(check); } return checks; diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/CjStudent.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/CjStudent.java index 05bf106..0825df4 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/CjStudent.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/CjStudent.java @@ -1,6 +1,7 @@ package com.ruoyi.dw.domain; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.utils.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -379,4 +380,189 @@ public class CjStudent .append("sfqr", getSfqr()) .toString(); } + + public boolean compareValue(CjStudent old){ + //比较姓名 + if (StringUtils.isNotEmpty(this.xm)){ + if (!this.xm.equals(old.xm)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.xm)){ + return false; + } + } + //比较学号 + if (StringUtils.isNotEmpty(this.xh)){ + if (!this.xh.equals(old.xh)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.xh)){ + return false; + } + } + //比较性别 + if (StringUtils.isNotEmpty(this.xb)){ + if (!this.xb.equals(old.xb)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.xb)){ + return false; + } + } + //比较省 + if (StringUtils.isNotEmpty(this.sydsh)){ + if (!this.sydsh.equals(old.sydsh)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.sydsh)){ + return false; + } + } + //比较市 + if (StringUtils.isNotEmpty(this.sydshi)){ + if (!this.sydshi.equals(old.sydshi)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.sydshi)){ + return false; + } + } + //比较专业 + if (StringUtils.isNotEmpty(this.zy)){ + if (!this.zy.equals(old.zy)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.zy)){ + return false; + } + } + //比较学院 + if (StringUtils.isNotEmpty(this.xy)){ + if (!this.xy.equals(old.xy)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.xy)){ + return false; + } + } + //比较毕业年份 + if (this.bynf != null){ + if (!this.bynf.equals(old.bynf)){ + return false; + } + }else { + if (old.bynf != null){ + return false; + } + } + //比较最高学历 + if (StringUtils.isNotEmpty(this.zgyl)){ + if (!this.zgyl.equals(old.zgyl)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.zgyl)){ + return false; + } + } + //比较工作单位 + if (StringUtils.isNotEmpty(this.gzdw)){ + if (!this.gzdw.equals(old.gzdw)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.gzdw)){ + return false; + } + } + //比较单位性质 + if (StringUtils.isNotEmpty(this.dwxz)){ + if (!this.dwxz.equals(old.dwxz)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.dwxz)){ + return false; + } + } + //比较单位地址 + if (StringUtils.isNotEmpty(this.dwdz)){ + if (!this.dwdz.equals(old.dwdz)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.dwdz)){ + return false; + } + } + //比较职务级别 + if (StringUtils.isNotEmpty(this.zwjb)){ + if (!this.zwjb.equals(old.zwjb)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.zwjb)){ + return false; + } + } + //比较社会兼职 + if (StringUtils.isNotEmpty(this.shjz)){ + if (!this.shjz.equals(old.shjz)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.shjz)){ + return false; + } + } + //比较代表荣誉 + if (StringUtils.isNotEmpty(this.dbry)){ + if (!this.dbry.equals(old.dbry)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.dbry)){ + return false; + } + } + //比较手机 + if (StringUtils.isNotEmpty(this.sj)){ + if (!this.sj.equals(old.sj)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.sj)){ + return false; + } + } + //比较邮箱 + if (StringUtils.isNotEmpty(this.yx)){ + if (!this.yx.equals(old.yx)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.yx)){ + return false; + } + } + //比较班级 + if (StringUtils.isNotEmpty(this.bj)){ + if (!this.bj.equals(old.bj)){ + return false; + } + }else { + if (StringUtils.isNotEmpty(old.bj)){ + return false; + } + } + return true; + } + } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java index 7111aee..3082e43 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java @@ -343,7 +343,7 @@ public class CjStudentServiceImpl implements ICjStudentService cjStudentMapper.insertCjStudent(cjStudent); j++; }else { - if (!BeanUtil.isCommonFieldsEqual(cjStudent, old)) { + if (!cjStudent.compareValue(old)) { cjStudentMapper.updateCjStudent(cjStudent); j++; }