fix dangAn

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -238,7 +238,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public List<UserVo> dangAnList(UserQueryBo bo) {
         List<User> list = baseMapper.dangAnList(bo);
-        return entity2Vo(list);
+        return entity2UserVo(list);
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -501,7 +501,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         String keyValue = bo.getKeyValue();
         if (Validator.isNotEmpty(keyValue)) {
             Map<String, String> maps = JSONObject.parseObject(keyValue, Map.class);
-            String recent_photos, idcard_face_photo, idcard_national_photo,work_unit,idcard,name,education,apply_post,telphone,sex;
+            String recent_photos, idcard_face_photo, idcard_national_photo,work_unit,idcard,name,education,apply_post,telphone,sex,school,unit_contact,unit_tel;
             LambdaUpdateWrapper<User> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
             objectLambdaUpdateWrapper.eq(User::getUserId, bo.getUserId());
             UserVo user = iUserService.queryById(bo.getUserId());
@@ -582,6 +582,24 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
                     objectLambdaUpdateWrapper.set(User::getSex, sex.equals("男")?1:2);
                 }
             }
+            if (maps.containsKey("school")) {
+                school = JSONObject.parseObject(String.valueOf(maps.get("school")), UserProfileFit.class).getValue();
+                if(Validator.isNotEmpty(school)){
+                    objectLambdaUpdateWrapper.set(User::getSchool, school);
+                }
+            }
+            if (maps.containsKey("unit_contact")) {
+                unit_contact = JSONObject.parseObject(String.valueOf(maps.get("unit_contact")), UserProfileFit.class).getValue();
+                if(Validator.isNotEmpty(unit_contact)){
+                    objectLambdaUpdateWrapper.set(User::getUnitContact, unit_contact);
+                }
+            }
+            if (maps.containsKey("unit_tel")) {
+                unit_tel = JSONObject.parseObject(String.valueOf(maps.get("unit_tel")), UserProfileFit.class).getValue();
+                if(Validator.isNotEmpty(unit_tel)){
+                    objectLambdaUpdateWrapper.set(User::getUnitTel, unit_tel);
+                }
+            }
             objectLambdaUpdateWrapper.set(User::getUpdateTime, DateUtils.getNowTime());
             iUserService.update(null, objectLambdaUpdateWrapper);
         }

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

@@ -1621,6 +1621,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     exportVo.setStatus(0);
                     exportVo.setDurationTime(classPeriodSectionVo.getDurationTime());
                     exportVo.setSectionType(classPeriodSectionVo.getSectionType());
+                    exportVo.setFromPlat(vo.getFromPlat());
                     studyList.add(exportVo);
                 }
                 endTime = vo.getEndTime();
@@ -2804,15 +2805,20 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         Long startTotalTime = 0L;
         Long endTotalTime = 0L;
         Long secTotalTime = 0L;
+        Long moduleTotal = 0L;
+        Long chapterTotal = 0L;
+        Long sectionTotal = 0L;
         for (ClassPeriodVo classPeriodVo : classPeriodVos) {
             //为模块搜索下面的章 和节 并搜索学时记录
             if (classPeriodVo.getType() == 1) {
+                moduleTotal++;
                 CourseModuleVo moduleVo = iCourseModuleService.queryById(classPeriodVo.getId());
                 List<ClassPeriodChapterVo> classPeriodChapterVos = baseMapper.listperiodChapter(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId(), bo.getGradeId(),bo.getOrderGoodsId());
                 Collections.sort(classPeriodChapterVos);
                 classPeriodChapterVos.addAll(baseMapper.listperiodModuleExam(bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId(), classPeriodVo.getId()));
                 for (ClassPeriodChapterVo classPeriodChapterVo : classPeriodChapterVos) {
                     if (classPeriodChapterVo.getType() == 2) {
+                        chapterTotal++;
                         Long ChapterEndTime = 0L;
                         Long ChapterStartTime = 0L;
                         List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodChapterVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
@@ -2820,6 +2826,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         classPeriodSectionVos.addAll(baseMapper.listperiodExam(classPeriodChapterVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId(), classPeriodVo.getId()));
                         for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
                             if (classPeriodSectionVo.getType() == 3) {
+                                sectionTotal++;
                                 secTotalTime += classPeriodSectionVo.getDurationTime();
                                 //节
                                 UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
@@ -2973,11 +2980,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }
             //为章搜索节记录和学时记录
             if (classPeriodVo.getType() == 2) {
+                chapterTotal++;
                 Long ChapterEndTime = 0L;
                 Long ChapterStartTime = 0L;
                 List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                 Collections.sort(classPeriodSectionVos);
                 for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
+                    sectionTotal++;
                     secTotalTime += classPeriodSectionVo.getDurationTime();
                     UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
                     userPeriodQueryBo.setSectionId(classPeriodSectionVo.getId());
@@ -3094,6 +3103,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
             //为节搜索学时记录
             if (classPeriodVo.getType() == 3) {
+                sectionTotal++;
                 secTotalTime += classPeriodVo.getDurationTime();
                 UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
                 userPeriodQueryBo.setSectionId(classPeriodVo.getId());
@@ -3151,6 +3161,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             classPeriodVos.get(0).setStartTotalTime(startTotalTime);
             classPeriodVos.get(0).setEndTotalTime(endTotalTime);
             classPeriodVos.get(0).setSecTotalTime(secTotalTime);
+            classPeriodVos.get(0).setModuleTotal(moduleTotal);
+            classPeriodVos.get(0).setChapterTotal(chapterTotal);
+            classPeriodVos.get(0).setSectionTotal(sectionTotal);
 
         }
         return classPeriodVos;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -252,4 +252,7 @@ public class ClassPeriodStudentVo {
 	@ApiModelProperty("教育名")
 	private String educationName;
 
+	@ApiModelProperty("专业名")
+	private String categoryName;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodUserVo.java

@@ -146,4 +146,8 @@ public class ClassPeriodUserVo {
 	@ApiModelProperty("官方班级")
 	private String officialName;
 	private String sevenYear;
+
+	private Integer sex;
+	@ApiModelProperty("1有效 0无效")
+	private Integer gradeStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -217,6 +217,10 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	private Integer doType;
 	@ApiModelProperty("公共标识：1公共章 0非公共章")
 	private Integer commonSign;
+
+	private Long moduleTotal;
+	private Long chapterTotal;
+	private Long sectionTotal;
 	@Override
 	public int compareTo(ClassPeriodVo o) {
 		if(o.getCourseSort()==this.getCourseSort()){

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/UserPeriodItemExportVo.java

@@ -43,5 +43,7 @@ public class UserPeriodItemExportVo {
 	@com.zhongzheng.common.annotation.Excel(name = "准确率")
 	@ApiModelProperty("准确率")
 	private BigDecimal rightRate;
+	@ApiModelProperty("来源平台 1小程序 2PC网站 3h5")
+	private Integer fromPlat;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -248,4 +248,10 @@ public class OrderListVo {
 
     @ApiModelProperty("审批状态 0 待审核 1初审通过 2复审通过待退款  -1初审不通过 -2复审不通过 3已退款")
     private Integer periodStatus;
+
+    @ApiModelProperty("服务有效期开始")
+    private Long serviceStartTime;
+
+    @ApiModelProperty("服务有效期结束")
+    private Long serviceEndTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -228,10 +228,10 @@ private static final long serialVersionUID=1L;
     /** 题库商家名称 */
     private String questionMerchantName;
 
-
     private String unitContact;
 
-
     private String unitTel;
 
+    private String school;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/SectionStudyRecordVo.java

@@ -128,4 +128,6 @@ public class SectionStudyRecordVo {
     private Long examId;
     /** 题卷类型 1章卷 2节卷 3模块卷 */
     private Integer examType;
+    @ApiModelProperty("来源平台 1小程序 2PC网站 3h5")
+    private Integer fromPlat;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -303,6 +303,9 @@ public class UserVo {
 	@ApiModelProperty("单位联系电话")
 	private String unitTel;
 
+	@ApiModelProperty("毕业院校")
+	private String school;
+
 	public void setNull(){
 		this.setOpenId(null);
 /*		this.setIdCardImg1(null);

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -139,6 +139,7 @@
         <result property="businessName" column="business_name"/>
         <result property="projectName" column="project_name"/>
         <result property="educationName" column="education_name"/>
+        <result property="categoryName" column="category_name"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodUserVo" id="ClassPeriodUserVo">
@@ -171,6 +172,8 @@
         <result property="classEndTime" column="class_end_time"/>
         <result property="officialName" column="official_name"/>
         <result property="sevenYear" column="seven_year"/>
+        <result property="gradeStatus" column="grade_status"/>
+        <result property="sex" column="sex"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodVo" id="ClassPeriodVo">
@@ -868,6 +871,7 @@
         u.id_card,
         u.user_id,
         u.telphone,
+        u.sex,
         g.goods_id,
         g.goods_name,
         cg.class_name,
@@ -875,6 +879,7 @@
         cg.class_start_time,
         cg.class_end_time,
         cg.official_name,
+        cg.status as grade_status,
         g.class_hours,
         u.one_inch_photos,
         u.id_card_img1,
@@ -1790,6 +1795,7 @@
         (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.`type` in (1,3) and ubr.report_status=1 and ubr.order_goods_id = cgu.order_goods_id and ubr.grade_id = cgu.grade_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num,
         cet.education_name,
         cpt.project_name,
+        m.category_name,
         cb.business_name
         FROM
         class_grade_user cgu
@@ -1800,6 +1806,7 @@
         LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN course_business cb ON g.business_id = cb.id
+        LEFT JOIN major m ON g.major_id = m.id
         LEFT JOIN (SELECT
         COUNT( m.id ) AS exam_num,
         c.goods_id
@@ -1865,6 +1872,9 @@
             or g.goods_name like concat('%', #{searchKey}, '%')
             or cg.class_name like concat('%', #{searchKey}, '%'))
         </if>
+        <if test="userId != null and userId !='' ">
+            AND u.user_id = #{userId}
+        </if>
         <if test="idCard != null and idCard !='' ">
             AND u.id_card = #{idCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}
         </if>

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -76,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsPayStatus" column="goods_pay_status"/>
         <result property="goodsType" column="goods_type"/>
         <result property="invoiceStatus" column="invoice_status"/>
+        <result property="serviceStartTime" column="service_start_time"/>
+        <result property="serviceEndTime" column="service_end_time"/>
     </resultMap>
 
     <select id="getGradePeriod" parameterType="Map" resultType="integer">
@@ -220,7 +222,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cb.business_name,
         og.goods_received,
         og.refund_status,
-        og.pay_status as goods_pay_status
+        og.pay_status as goods_pay_status,
+        og.service_start_time,
+        og.service_end_time
         FROM
         `order` o
         LEFT JOIN order_goods og ON o.order_sn = og.order_sn

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pwdTime" column="pwd_time"/>
         <result property="unitContact" column="unit_contact"/>
         <result property="unitTel" column="unit_tel"/>
+        <result property="school" column="school"/>
     </resultMap>
 
 
@@ -711,6 +712,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="companyName != null and companyName != ''" >
             AND u.company_name like concat('%', #{companyName}, '%')
         </if>
+        order by u.user_id desc
     </select>
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -99,6 +99,7 @@
         <result property="liveEndTime" column="live_end_time"/>
         <result property="recordingUrl" column="recording_url"/>
         <result property="updateTime" column="update_time"/>
+        <result property="fromPlat" column="from_plat"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.ExamStudyRecordVo" id="ExamStudyRecordVoResult">