|
@@ -35,6 +35,8 @@ import com.zhongzheng.modules.base.bo.ConfigQueryBo;
|
|
|
import com.zhongzheng.modules.base.service.ICertificateTpService;
|
|
|
import com.zhongzheng.modules.course.bo.ExternalQuestionBo;
|
|
|
import com.zhongzheng.modules.course.bo.ReplenishExamBo;
|
|
|
+import com.zhongzheng.modules.course.domain.Major;
|
|
|
+import com.zhongzheng.modules.course.service.IMajorService;
|
|
|
import com.zhongzheng.modules.course.vo.CourseChapterVo;
|
|
|
import com.zhongzheng.modules.course.vo.ExternalQuestionVo;
|
|
|
import com.zhongzheng.modules.course.vo.ReplenishExamVo;
|
|
@@ -54,9 +56,11 @@ import com.zhongzheng.modules.goods.bo.UserGoodsListBo;
|
|
|
import com.zhongzheng.modules.goods.service.IGoodsService;
|
|
|
import com.zhongzheng.modules.goods.vo.*;
|
|
|
import com.zhongzheng.modules.grade.bo.*;
|
|
|
+import com.zhongzheng.modules.grade.mapper.ClassGradeUserMapper;
|
|
|
import com.zhongzheng.modules.grade.service.IClassGradeService;
|
|
|
import com.zhongzheng.modules.grade.service.IClassGradeUserService;
|
|
|
import com.zhongzheng.modules.grade.service.IUserPeriodService;
|
|
|
+import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
|
|
|
import com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
|
|
|
import com.zhongzheng.modules.grade.vo.SyncGoodsExport;
|
|
|
import com.zhongzheng.modules.order.bo.TopOldOrderRefundBo;
|
|
@@ -166,6 +170,12 @@ public class CommonController extends BaseController {
|
|
|
private OssService ossService;
|
|
|
@Autowired
|
|
|
private ICertificateTpService iCertificateTpService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ClassGradeUserMapper classGradeUserMapper;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IMajorService iMajorService;
|
|
|
/**
|
|
|
* 通用下载请求
|
|
|
*
|
|
@@ -780,7 +790,7 @@ public class CommonController extends BaseController {
|
|
|
return AjaxResult.success(iClassGradeUserService.pushOfficialPeriodMore(list));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
@ApiOperation("测试获取山东题库")
|
|
|
@PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
|
|
@@ -796,7 +806,24 @@ public class CommonController extends BaseController {
|
|
|
@ApiOperation("旧系统post请求")
|
|
|
@PostMapping("/common/free/clientPost")
|
|
|
public AjaxResult<Void> clientPost(@RequestBody ClientPostAddBo bo) {
|
|
|
- return AjaxResult.success(iClassGradeUserService.sendClientPost(bo));
|
|
|
+ ClassGradeUserQueryBo queryBo = new ClassGradeUserQueryBo();
|
|
|
+ queryBo.setUserId(434L);
|
|
|
+ queryBo.setGradeId(1738L);
|
|
|
+ queryBo.setOrderGoodsId(5252L);
|
|
|
+ ClassGradeUserVo userVo = classGradeUserMapper.selectUser(queryBo);
|
|
|
+ Major major = iMajorService.getOne(new LambdaQueryWrapper<Major>()
|
|
|
+ .eq(Major::getId, 38));
|
|
|
+ if("材料员".equals(major.getCategoryName())||"劳务员".equals(major.getCategoryName())||"资料员".equals(major.getCategoryName())){
|
|
|
+ if(userVo.getEduLevel().equals("小学")||userVo.getEduLevel().equals("中学")){
|
|
|
+ userVo.setEduLevel("高中");
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ if(userVo.getEduLevel().equals("小学")||userVo.getEduLevel().equals("中学")||userVo.getEduLevel().equals("职高")||userVo.getEduLevel().equals("高中")){
|
|
|
+ userVo.setEduLevel("专科");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ System.out.println(userVo);
|
|
|
+ return AjaxResult.success();
|
|
|
}
|
|
|
|
|
|
|