fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -723,13 +723,28 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 return null;
             } else {
                 //推送失败
-                LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-                objectLambdaUpdateWrapper.eq(ClassGradeUser::getId, userVo.getId());
-                objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusMsg, respone);
-                objectLambdaUpdateWrapper.set(ClassGradeUser::getUpdateTime, DateUtils.getNowTime());
-                objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusTime, DateUtils.getNowTime());
-                this.update(null, objectLambdaUpdateWrapper);
-                return respone;
+                if("ERROR|该学员已经存在本班".equals(respone)){
+                    LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                    objectLambdaUpdateWrapper.eq(ClassGradeUser::getId, userVo.getId());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatus, 1);
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusMsg, "OK||"+dataTxt);
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getUpdateTime, DateUtils.getNowTime());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusTime, DateUtils.getNowTime());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusNum, userVo.getOfficialStatusNum() + 1);
+                    this.update(null, objectLambdaUpdateWrapper);
+
+                    //修改资料变更状态
+
+                    return null;
+                }else{
+                    LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                    objectLambdaUpdateWrapper.eq(ClassGradeUser::getId, userVo.getId());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusMsg, respone);
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getUpdateTime, DateUtils.getNowTime());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusTime, DateUtils.getNowTime());
+                    this.update(null, objectLambdaUpdateWrapper);
+                    return respone;
+                }
             }
         } catch (IOException e) {
             //    throw new CustomException("请求错误");
@@ -934,13 +949,31 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 return null;
             } else {
                 //推送失败
-                LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-                objectLambdaUpdateWrapper.eq(ClassGradeUser::getId, userVo.getId());
-                objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusMsg, respone);
-                objectLambdaUpdateWrapper.set(ClassGradeUser::getUpdateTime, DateUtils.getNowTime());
-                objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusTime, DateUtils.getNowTime());
-                this.update(null, objectLambdaUpdateWrapper);
-                return respone;
+                if("ERROR|该学员已经存在本班".equals(respone)){
+                    //推送成功
+                    LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                    objectLambdaUpdateWrapper.eq(ClassGradeUser::getId, userVo.getId());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatus, 1);
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusMsg, "OK||"+dataTxt);
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getUpdateTime, DateUtils.getNowTime());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusTime, DateUtils.getNowTime());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusNum, userVo.getOfficialStatusNum() + 1);
+                    this.update(null, objectLambdaUpdateWrapper);
+
+                    //修改资料变更状态
+
+                    return null;
+                }else{
+                    //推送失败
+                    LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                    objectLambdaUpdateWrapper.eq(ClassGradeUser::getId, userVo.getId());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusMsg, respone);
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getUpdateTime, DateUtils.getNowTime());
+                    objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusTime, DateUtils.getNowTime());
+                    this.update(null, objectLambdaUpdateWrapper);
+                    return respone;
+                }
+
             }
         } catch (IOException e) {
             //    throw new CustomException("请求错误");