merge

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

@@ -150,6 +150,8 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         sysTenant.setHostPc(bo.getHostPc());
         sysTenant.setHostH5(bo.getHostH5());
         sysTenant.setHostLive(bo.getHostLive());
+        sysTenant.setHostH5Seller(null);
+        sysTenant.setHostAdmin(null);
         //生成tenantId
         Long newTenantId = createTenantId();
         sysTenant.setTenantId(newTenantId);
@@ -341,13 +343,6 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     }
 
     private void initConfigAndDict(Long newTenantId, Long tenantId) {
-        SysConfig config = iSysConfigService.getSysConfigByKeyTenant("home.header", newTenantId);
-        if (ObjectUtils.isNull(config)){
-            SysConfig sysConfigByKeyTenant = iSysConfigService.getSysConfigByKeyTenant("home.header", tenantId);
-            sysConfigByKeyTenant.setTenantId(newTenantId);
-            sysConfigByKeyTenant.setConfigId(null);
-            iSysConfigService.save(sysConfigByKeyTenant);
-        }
         //字典
         List<SysDictType> dictTypes = iSysDictTypeService.getListByTenant(tenantId);
         if (CollectionUtils.isEmpty(dictTypes)){

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -54,6 +54,8 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<Long> selectStart(@Param("userId") Long userId,@Param("goodsId") Long goodsId,@Param("gradeId") Long gradeId);
 
+    List<Long> selectEnd(@Param("userId") Long userId,@Param("goodsId") Long goodsId,@Param("gradeId") Long gradeId);
+
     List<ClassGradeUserGoodsVo> sendClassGradeUser();
 
     Long checkSendClassGradeUser(@Param("remindId") Integer remindId,@Param("userId") Long userId,@Param("gradeId") Long gradeId);

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

@@ -1102,7 +1102,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 //查找开始学习时间
                 classPeriodStudentVo.setStartTime(baseMapper.selectStart(classPeriodStudentVo.getUserId(), classPeriodStudentVo.getGoodsId(), classPeriodStudentVo.getGradeId()).get(0));
             }
-
             //当审核状态状态为通过是采取解析身份证和一寸照
             if ("1".equals(classPeriodStudentVo.getProfileStatus()) && Validator.isNotEmpty(bo.getUserPhoto()) && bo.getUserPhoto() == 1) {
                 //解析身份证和一寸照
@@ -1132,7 +1131,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             //查询学员最近人脸照
             LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
             lqw.eq(UserStudyRecordPhoto::getUserId, classPeriodStudentVo.getUserId());
-            lqw.orderByDesc(UserStudyRecordPhoto::getCreateTime);
+            lqw.orderByDesc(UserStudyRecordPhoto::getCreateTime).last(" limit 5");
             List<UserStudyRecordPhoto> userStudyRecordPhotoList = iUserStudyRecordPhotoService.list(lqw);
             List<String> recenPhotosList = new ArrayList<>();
             userStudyRecordPhotoList.forEach(userStudyRecordPhoto -> {

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

@@ -420,8 +420,8 @@ public class SysWebServiceImpl implements ISysWebService {
                 "    }\n" +
                 "\n" +
                 "    #SSL配置\n" +
-                "    ssl_certificate      /mydata/nginx/ssl/zzyxt.net.pem; # 配置证书\n" +
-                "    ssl_certificate_key  /mydata/nginx/ssl/zzyxt.net.key; # 配置证书私钥\n" +
+                "    ssl_certificate      /mydata/nginx/ssl/gdzzkj.net.pem; # 配置证书\n" +
+                "    ssl_certificate_key  /mydata/nginx/ssl/gdzzkj.net.key; # 配置证书私钥\n" +
                 "    ssl_protocols        TLSv1 TLSv1.1 TLSv1.2; # 配置SSL协议版本 # 配置SSL加密算法\n" +
                 "    ssl_ciphers          ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;\n" +
                 "    ssl_prefer_server_ciphers  on; # 优先采取服务器算法\n" +

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

@@ -384,7 +384,7 @@
         <if test="userPhoto != null and userPhoto == 1">
             up.key_value,
         </if>
-        cgu.period_time as end_time,
+        cgu.period_wait_time as end_time,
         (SELECT og.service_start_time FROM order_goods og  where og.order_goods_id = cgu.order_goods_id ) as service_start_time,
         (SELECT og.service_end_time FROM order_goods og  where og.order_goods_id = cgu.order_goods_id ) as service_end_time,
         (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.grade_id = cgu.grade_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num
@@ -1150,6 +1150,26 @@
         ORDER BY create_time ASC
     </select>
 
+    <select id="selectEnd" parameterType="map" resultType="long">
+        SELECT
+            usr.end_time
+        FROM
+            user_study_record usr
+        WHERE
+            usr.goods_id = #{goodsId}
+          AND usr.grade_id = #{gradeId}
+          AND usr.user_id = #{userId} UNION
+        SELECT
+            ubr.update_time as end_time
+        FROM
+            user_bank_record ubr
+        WHERE
+            ubr.goods_id =#{goodsId}
+          AND ubr.grade_id = #{gradeId}
+          AND ubr.user_id = #{userId}
+        ORDER BY end_time DESC
+    </select>
+
     <select id="sendClassGradeUser"  resultMap="ClassGradeUserGoodsVoResult">
         SELECT
         cgu.user_id,