fix

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -176,6 +176,8 @@ invoice:
 
 liveHost: http://192.168.1.222:6009
 
+fileHost: http://39.108.7.155:9099
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

zhongzheng-admin-saas/src/main/resources/application-pre.yml

@@ -176,6 +176,8 @@ invoice:
 
 liveHost: http://192.168.1.222:6009
 
+fileHost: http://39.108.7.155:9099
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

zhongzheng-admin-saas/src/main/resources/application-prod.yml

@@ -176,6 +176,8 @@ invoice:
 
 liveHost: https://sso.xyyxt.net
 
+fileHost: http://39.108.7.155:9099
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -177,6 +177,8 @@ invoice:
 
 liveHost: http://192.168.1.222:6009
 
+fileHost: http://192.168.1.24:9099
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

zhongzheng-admin/src/main/resources/application-pre.yml

@@ -176,6 +176,8 @@ invoice:
 
 liveHost: http://192.168.1.222:6009
 
+fileHost: http://192.168.1.24:9099
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -176,6 +176,8 @@ invoice:
 
 liveHost: https://sso.xyyxt.net
 
+fileHost: http://39.108.7.155:9099
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

zhongzheng-api/src/main/resources/application-dev.yml

@@ -179,6 +179,8 @@ invoice:
 
 liveHost: http://192.168.1.222:6009
 
+fileHost: http://192.168.1.24:9099
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

zhongzheng-api/src/main/resources/application-pre.yml

@@ -176,6 +176,8 @@ invoice:
 
 liveHost: http://192.168.1.222:6009
 
+fileHost: http://192.168.1.24:9099
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

zhongzheng-api/src/main/resources/application-prod.yml

@@ -188,6 +188,9 @@ invoice:
 
 liveHost: https://sso.xyyxt.net
 
+fileHost: http://39.108.7.155:9099
+
+
 exam:
     applySave: http://192.168.1.7:9099/cd/exam/save
     applyUpdate: http://192.168.1.7:9099/cd/exam/update

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

@@ -148,6 +148,7 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
         SysDictData info = getOne(new LambdaQueryWrapper<SysDictData>()
                 .eq(SysDictData::getDictValue,entity.getDictValue())
                 .eq(SysDictData::getDictType,entity.getDictType())
+                .ne(Validator.isNotEmpty(entity.getDictCode()),SysDictData::getDictCode,entity.getDictCode())
                 .last("limit 1"));
         if (Validator.isNotNull(info)) {
             return true;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -117,4 +117,8 @@ public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
     UserPeriod selectSevenUserPeriod(UserStudyRecord bo);
 
     GoodsSectionNumVo getGoodsSectionNum(SubjectStudyRecordQueryBo queryBo);
+
+    List<CdUserStudyLogVo> syncUserDateStudyLog(UserStudyRecordQueryBo bo);
+
+    List<CdUserStudyLogVo> syncUserDateStudyExamLog(UserStudyRecordQueryBo bo);
 }

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

@@ -1376,6 +1376,38 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         Long zeroTime = DateUtils.getTodayZeroTime();
         zeroTime = zeroTime - 24 * 3600;
         Long endTime = zeroTime -1;
+        UserStudyRecordQueryBo queryBo1 = new UserStudyRecordQueryBo();
+        queryBo1.setStartTime(zeroTime);
+        queryBo1.setEndTime(endTime);
+        List<CdUserStudyLogVo> list = baseMapper.syncUserDateStudyLog(queryBo1);
+        List<CdUserStudyLogVo> examList = baseMapper.syncUserDateStudyLog(queryBo1);
+        for(CdUserStudyLogVo vo : list){
+            for(CdUserStudyLogVo voExam : examList){
+                if(vo.getOrderGoodsId()==voExam.getOrderGoodsId()){
+                    vo.setDoQuestionNum(voExam.getDoQuestionNum());
+                    vo.setRightQuestionNum(voExam.getRightQuestionNum());
+                    vo.setTotalQuestionNum(voExam.getTotalQuestionNum());
+                    vo.setPerformance(voExam.getPerformance());
+                    vo.setStudyTime(vo.getStudyTime().longValue()+voExam.getStudyTime().longValue());
+                    if(vo.getOnlineTime().longValue()>voExam.getOnlineTime().longValue()){
+                        vo.setOnlineTime(voExam.getOnlineTime());
+                    }
+                }else{
+                    list.add(voExam);
+                }
+            }
+        }
+        for(CdUserStudyLogVo vo : list){
+            User user = iUserService.getOne(new LambdaQueryWrapper<User>().eq(User::getUserId, vo.getUserId()).last("limit 1"));
+            vo.setIdCard(user.getIdCard());
+            vo.setTelphone(user.getTelphone());
+            vo.setAvatar(user.getAvatar());
+            vo.setRealname(user.getRealname());
+            vo.setDateTime(zeroTime);
+            vo.setFromPlat(1);
+            Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId, vo.getGoodsId()).last("limit 1"));
+            vo.setGoodsName(goods.getGoodsName());
+        }
         return null;
     }
 

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

@@ -1892,4 +1892,67 @@
         WHERE
             gc.goods_id = #{goodsId} AND cm.`status` = 1
     </select>
+
+
+    <select id="syncUserDateStudyLog" parameterType="com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo"
+            resultType="com.zhongzheng.modules.user.vo.CdUserStudyLogVo">
+        SELECT
+            u.*,
+            og.seven_year,
+            o.input_order_sn,
+            o.plan_id
+        FROM
+        (
+        SELECT
+        order_goods_id,
+        any_value ( user_id ) user_id,
+        any_value ( usr.goods_id ) goods_id,
+        MIN( usr.create_time ) online_time,
+        (
+        MAX( USR.update_time )- MIN( usr.create_time )) study_time,
+        any_value ( tenant_id ) tenant_id
+        FROM
+        user_study_record usr
+        WHERE
+        usr.create_time <![CDATA[ >= ]]> #{startTime}
+        AND usr.update_time <![CDATA[ <= ]]> #{endTime}
+        GROUP BY
+        order_goods_id
+        ) u
+        LEFT JOIN order_goods og ON u.order_goods_id = og.order_goods_id
+        LEFT JOIN `order` o ON og.order_sn = o.order_sn
+    </select>
+
+    <select id="syncUserDateStudyExamLog" parameterType="com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo"
+            resultType="com.zhongzheng.modules.user.vo.CdUserStudyLogVo">
+        SELECT
+        u.*,
+        og.seven_year,
+        o.input_order_sn,
+        o.plan_id
+        FROM
+        (
+        SELECT
+        order_goods_id,
+        any_value ( user_id ) user_id,
+        any_value ( ubr.goods_id ) goods_id,
+        MIN( ubr.create_time ) online_time,
+        (
+        MAX( ubr.update_time )- MIN( ubr.create_time )) study_time,
+        any_value ( tenant_id ) tenant_id,
+        MAX( total_question_num ) total_question_num,
+        MAX( right_question_num ) right_question_num,
+        MAX( do_question_num ) do_question_num,
+        MAX( performance ) performance
+        FROM
+        user_bank_record ubr
+        WHERE
+        ubr.create_time <![CDATA[ >= ]]> #{startTime}
+        AND ubr.update_time <![CDATA[ <= ]]> #{endTime}
+        GROUP BY
+        order_goods_id
+        ) u
+        LEFT JOIN order_goods og ON u.order_goods_id = og.order_goods_id
+        LEFT JOIN `order` o ON og.order_sn = o.order_sn
+    </select>
 </mapper>