Merge branch 'dev'

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -847,24 +847,11 @@ public class CommonController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
     @PostMapping("/common/free/sevenPushAuthCallBack")
     public AjaxResult sevenPushAuthCallBack(@RequestBody SevenPushAuthAddBo bo) {
-        String htmlv = "<img src=\"https://file-dev.xyyxt.net/web/Uploads/qdytopic/Imageqdy343-4.png\" />";
-        Pattern pattern = Pattern.compile("<img.*?src=\"(.*?)\"");
-
-        Matcher matcher = pattern.matcher(htmlv);
-        while (matcher.find()) {
-            System.out.println("Image URL found: " + matcher.group(1));
-        }
-        return AjaxResult.success("成功");
-
-       /* while (matcher.find()) {
-            System.out.println("Image URL found: " + matcher.group(1));
-        }
-
         ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", "867735392558919680");
         if (!ToolsUtils.checkSignCwSnFromOldSys(bo.getGradeUserId().toString(), bo.getStamp().toString(), bo.getSign())) {
             return AjaxResult.error("签名错误");
         }
-        return AjaxResult.success("成功", iClassGradeUserService.sevenPushAuthCallBack(bo) ? 1 : 0);*/
+        return AjaxResult.success("成功", iClassGradeUserService.sevenPushAuthCallBack(bo) ? 1 : 0);
     }
 
 

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

@@ -7,6 +7,7 @@ import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSON;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -3138,7 +3139,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         HashMap<String, String> map = new HashMap<>();
         map.put("TenantId", tenantId);
         String respone = HttpUtils.sendPostJsonHeader(EXAM_QUESTION, "",map);
-        List<ExternalQuestionVo> questionVos = JSONArray.parseArray(respone, ExternalQuestionVo.class);
+        JSONObject jsonObject1 = JSONObject.parseObject(respone);
+        List<ExternalQuestionVo> questionVos = JSONArray.parseArray(jsonObject1.get("data").toString(), ExternalQuestionVo.class);
         //考前培训
         CourseEducationType educationType = iCourseEducationTypeService
                 .getOne(new LambdaQueryWrapper<CourseEducationType>()
@@ -3295,8 +3297,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         if (ObjectUtils.isNotNull(item2.getIsTopic()) && item2.getIsTopic()){
                             //获取题目内容
                             String topParam = String.format("MeasureModelId=%s",item2.getMeasureModelId());
-                            String topRespone = HttpUtils.sendGet(QUESTION_DETAIL, topParam);
-                            List<ExternalQuestionDetailVo> questionDetailVos = JSONArray.parseArray(topRespone, ExternalQuestionDetailVo.class);
+                            String respone2 = HttpUtils.sendPostJsonHeader(EXAM_QUESTION_DETAIL, topParam,map);
+                            JSONObject jsonObject = JSONObject.parseObject(respone2);
+                            List<ExternalQuestionDetailVo> questionDetailVos = JSONArray.parseArray(jsonObject.get("data").toString(), ExternalQuestionDetailVo.class);
 
                             if (CollectionUtils.isNotEmpty(questionDetailVos)){
                                 //处理图片
@@ -3357,6 +3360,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                         if (childVo.getOptionTitle().contains(upStr1)){
                                                             questionDetailVo.setImgUrl(getImgUrl(childVo.getOptionTitle()));
                                                             questionDetailVo.setContent("如图所示");
+                                                        }else {
+                                                            questionDetailVo.setContent(childVo.getOptionTitle());
                                                         }
                                                         questionDetailVo.setOptionsId(i +1);
                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
@@ -3408,6 +3413,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                         if (childVo.getOptionTitle().contains(upStr1)){
                                                             questionDetailVo.setImgUrl(getImgUrl(childVo.getOptionTitle()));
                                                             questionDetailVo.setContent("如图所示");
+                                                        }else {
+                                                            questionDetailVo.setContent(childVo.getOptionTitle());
                                                         }
                                                         questionDetailVo.setOptionsId(i + 1);
                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
@@ -3510,6 +3517,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                                         if (childVo.getOptionTitle().contains(upStr1)){
                                                                             detailVo1.setImgUrl(getImgUrl(childVo.getOptionTitle()));
                                                                             detailVo1.setContent("如图所示");
+                                                                        }else {
+                                                                            detailVo1.setContent(childVo.getOptionTitle());
                                                                         }
                                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
                                                                             index = i + 1;
@@ -3536,6 +3545,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                                                                         if (childVo.getOptionTitle().contains(upStr1)){
                                                                             detailVo1.setImgUrl(getImgUrl(childVo.getOptionTitle()));
                                                                             detailVo1.setContent("如图所示");
+                                                                        }else {
+                                                                            detailVo1.setContent(childVo.getOptionTitle());
                                                                         }
                                                                         if (ObjectUtils.isNotNull(childVo.getIsAnswer()) && childVo.getIsAnswer()){
                                                                             Integer x = i + 1 ;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -218,5 +218,6 @@ public class UserQueryBo extends BaseEntity {
 	private Integer goodsStatus;
 	@ApiModelProperty("教育类型id")
 	private Long educationTypeId;
+	private Long projectId;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -292,6 +292,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="tenantId != null and tenantId != ''">
             AND v.tenant_id = #{tenantId}
         </if>
+        <if test="payStatus != null and payStatus.size()!=0">
+            AND cl.pay_status in
+            <foreach collection="payStatus" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="tenantIds != null and tenantIds.size()!=0">
+            AND v.tenant_id in
+            <foreach collection="tenantIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="createNo != null and createNo != ''">
             AND (v.create_no = #{createNo} or v.create_username like concat('%', #{createNo}, '%'))
         </if>

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

@@ -761,9 +761,7 @@
         (SELECT create_time FROM user_exam_record r where r.goods_id=g.goods_id AND r.do_mode = 1 AND r.user_id = #{userId} ORDER BY
         create_time DESC LIMIT 1) as end_time,
         (SELECT COUNT(DISTINCT exam_id) FROM user_exam_record r where r.goods_id=g.goods_id AND r.do_mode = 1 AND r.user_id = #{userId})
-        as stu_all_num,
-        s.service_start_time,
-        s.service_end_time
+        as stu_all_num
         FROM
         goods g
         LEFT JOIN order_goods s ON g.goods_id = s.goods_id AND s.pay_status in (2,3,4)