change před 3 roky
rodič
revize
34419289dd

+ 0 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -229,7 +229,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public List<GoodsUserVo> goodsList(CourseQueryBo bo) {
-        bo.setUserId(4L);
         List<GoodsUserVo> goodsUserVos = baseMapper.goodsList(bo);
         for (GoodsUserVo goodsUserVo : goodsUserVos) {
             Long secLong = 0L;

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSubscribeMapper.java

@@ -21,4 +21,8 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
     Long selectGoodsId(String code);
 
     Long selectUserId(@Param("userName") String userName,@Param("idCard")  Long idCard);
+
+    Long selectBeforeId(String beforeName);
+
+    Long selectApplyId(String applyName);
 }

+ 128 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
@@ -209,8 +210,134 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             if (userSubscribeImport.getSubscribeStatus().equals("取消")){
                 userSubscribeAddBo.setSubscribeStatus(0);
             }
-            
 
+            if (!StringUtils.isEmpty(userSubscribeImport.getBeforeStatus()) && !StringUtils.isEmpty(userSubscribeImport.getBeforeName())){
+                Long beforeId = baseMapper.selectBeforeId(userSubscribeImport.getBeforeName());
+                if (beforeId == null){
+                    userSubscribeImport.setCause("前培标题有误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+                userSubscribeAddBo.setBeforeStatus(1);
+                userSubscribeAddBo.setBeforeId(beforeId);
+                userSubscribeAddBo.setBeforeExpend(1);
+            }
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getExamStatus())){
+                if (userSubscribeImport.getExamStatus().equals("待登记")){
+                    userSubscribeAddBo.setExamStatus(0);
+                }else if(userSubscribeImport.getExamStatus().equals("正常")){
+                    userSubscribeAddBo.setExamStatus(1);
+                }else if (userSubscribeImport.getExamStatus().equals("缺考")){
+                    userSubscribeAddBo.setExamStatus(2);
+                }else if (userSubscribeImport.getExamStatus().equals("作弊")){
+                    userSubscribeAddBo.setExamStatus(3);
+                }else if (userSubscribeImport.getExamStatus().equals("替考")){
+                    userSubscribeAddBo.setExamStatus(4);
+                }
+            }
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getResult())){
+                if (userSubscribeImport.getResult().equals("不通过")){
+                    userSubscribeAddBo.setResult(0);
+                }else if(userSubscribeImport.getResult().equals("通过")){
+                    userSubscribeAddBo.setResult(1);
+                }
+            }
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getCertificateCode())){
+                    userSubscribeAddBo.setCertificateCode(userSubscribeImport.getCertificateCode());
+            }
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getApplyName())){
+                Long applyId = baseMapper.selectApplyId(userSubscribeImport.getApplyName());
+                if (applyId == null){
+                    userSubscribeImport.setCause("考试标题有误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+                userSubscribeAddBo.setApplyId(applyId);
+            }else{
+                userSubscribeImport.setCause("考试标题有误");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())){
+                if (userSubscribeImport.getStudentTypeName().equals("非补考学员")){
+                    userSubscribeAddBo.setStudentType(1);
+                }else{
+                    userSubscribeAddBo.setStudentType(2);
+                }
+            }else {
+                userSubscribeImport.setCause("学员报名类型有误");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddress())){
+                userSubscribeAddBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
+            }else {
+                userSubscribeImport.setCause("地址未填");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+            if (userSubscribeImport.getApplySiteExamTime() != null){
+                userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(userSubscribeImport.getApplySiteExamTime().getDay()));
+            }else {
+                userSubscribeImport.setCause("考试时间未填");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTime())){
+                String[] split = userSubscribeImport.getApplySiteTime().split("-");
+                if (split.length < 2){
+                    userSubscribeImport.setCause("考试时间段错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+                String startTime=split[0];
+                String endTime=split[1];
+                startTime = startTime.replace(":","-");
+                endTime = endTime.replace(":","-");
+
+                userSubscribeAddBo.setApplySiteStartTime(startTime);
+                userSubscribeAddBo.setApplySiteEndTime(endTime);
+            }else {
+                userSubscribeImport.setCause("考试时间段未填");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddressTrain())){
+                userSubscribeAddBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
+            }
+
+            if (userSubscribeImport.getApplySiteExamTrainTime() != null){
+                userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(userSubscribeImport.getApplySiteExamTrainTime().getDay()));
+            }
+
+            if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())){
+                String[] split = userSubscribeImport.getApplySiteTrainTime().split("-");
+                if (split.length < 2){
+                    userSubscribeImport.setCause("考试时间段错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+                String startTime=split[0];
+                String endTime=split[1];
+                startTime = startTime.replace(":","-");
+                endTime = endTime.replace(":","-");
+
+                userSubscribeAddBo.setApplySiteStartTrainTime(startTime);
+                userSubscribeAddBo.setApplySiteEndTrainTime(endTime);
+            }
+
+            userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
+            userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
             this.insertByAddBo(userSubscribeAddBo);
         }
         return userSubscribeImports;

+ 9 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -113,10 +113,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectGoodsId" parameterType="string"  resultType="Long">
-        SELECT g.goods_id FROM goods g where g.`code`=#{code}
+        SELECT g.goods_id FROM goods g where g.`code`=#{code} and g.status = 1
     </select>
 
     <select id="selectUserId" parameterType="map"  resultType="Long">
         SELECT u.userId FROM `user` u where u.renalname=#{userName} and u.id_card=#{idCard}
     </select>
+
+    <select id="selectBeforeId" parameterType="map"  resultType="Long">
+        SELECT eb.before_id FROM exam_before eb where eb.before_name=#{beforeName} and eb.status = 1
+    </select>
+
+    <select id="selectApplyId" parameterType="map"  resultType="Long">
+        SELECT ea.apply_id FROM exam_apply ea where ea.apply_name=#{applyName} and ea.status = 1
+    </select>
 </mapper>