Merge branch 'master' of http://118.31.7.2:3000/tzjy-code/digital_marketing into de'v

src/main/java/com/sztzjy/marketing/config/Constant.java

@@ -43,7 +43,7 @@ public class Constant {
     public static final String YONGHUSHUXINGBIAO= "客户细分数据表";
     public static final String YONGHUDENGLUHUOYUEBIAO= "销售预测数据表";
     public static final String YONGHUXIAOFEINENGLIBIAO= "购物车数据表";
-    public static final String YONGHUXINGWEIBIAO= "用户评论表";
+    public static final String YONGHUXINGWEIBIAO= "商品评论数据";
 
 
 

src/main/java/com/sztzjy/marketing/mapper/StuPracticalTrainingReportMapper.java

@@ -2,9 +2,10 @@ package com.sztzjy.marketing.mapper;
 
 import com.sztzjy.marketing.entity.StuPracticalTrainingReport;
 import com.sztzjy.marketing.entity.StuPracticalTrainingReportExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface StuPracticalTrainingReportMapper {
     long countByExample(StuPracticalTrainingReportExample example);
 
@@ -27,4 +28,6 @@ public interface StuPracticalTrainingReportMapper {
     int updateByPrimaryKeySelective(StuPracticalTrainingReport record);
 
     int updateByPrimaryKey(StuPracticalTrainingReport record);
+
+    List<String> selectReport(String userId, String schoolId);
 }

src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java

@@ -1,13 +1,7 @@
 package com.sztzjy.marketing.service.impl;
 
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.IdUtil;
-
-import cn.hutool.core.util.ZipUtil;
 import com.sztzjy.marketing.config.exception.handler.ServiceException;
 import com.sztzjy.marketing.entity.*;
 import com.sztzjy.marketing.entity.dto.*;
@@ -24,24 +18,17 @@ import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
-import org.ujmp.core.util.R;
-import util.convertPDF.PDFConvertUtil;
-
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URLEncoder;
-import java.nio.file.Files;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -342,23 +329,50 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService {
                 stuScoreDetails.setId(IdUtil.simpleUUID());
                 stuScoreDetails.setLearningProjects("实验报告");
                 stuScoreDetails.setSerialNumber(5);
-                stuScoreDetails.setScoreWeight(0.2);
+
+                //查询权重
+                TchModuleWeithExample weithExample = new TchModuleWeithExample();
+                weithExample.createCriteria().andSchoolIdEqualTo(stuBlockProductWithBLOBs.getSchoolId());
+                List<TchModuleWeith> tchModuleWeithList = tchModuleWeithMapper.selectByExample(weithExample);
+
+                TchModuleWeith tchModuleWeith = tchModuleWeithList.get(0);
+
+                stuScoreDetails.setScoreWeight(tchModuleWeith.getReportWeight().doubleValue());
+
+
                 stuScoreDetails.setSchedule(17.0);
                 stuScoreDetails.setUserId(stuBlockProductWithBLOBs.getUserId());
                 stuScoreDetailsMapper.insertSelective(stuScoreDetails);
             } else {
                 StuScoreDetails stuScoreDetails = stuScoreDetailList.get(0);
 
-                StuPracticalTrainingReportExample trainingReportExample = new StuPracticalTrainingReportExample();
-                stuPracticalTrainingReportExample.createCriteria().andUseridEqualTo(stuBlockProductWithBLOBs.getUserId());
-                List<StuPracticalTrainingReport> stuPracticalTrainingReportList = stuPracticalTrainingReportMapper.selectByExample(trainingReportExample);
-                if (stuPracticalTrainingReportList.size() == 6) {
-                    stuScoreDetails.setCompletionStatus("1");
-                }
-                int size = stuPracticalTrainingReportList.size();
+//                StuPracticalTrainingReportExample trainingReportExample = new StuPracticalTrainingReportExample();
+//                stuPracticalTrainingReportExample.createCriteria().andUseridEqualTo(stuBlockProductWithBLOBs.getUserId());
+//                List<StuPracticalTrainingReport> stuPracticalTrainingReportList = stuPracticalTrainingReportMapper.selectByExample(trainingReportExample);
+//                if (stuPracticalTrainingReportList.size() == 6) {
+//                    stuScoreDetails.setCompletionStatus("1");
+//                }
+                ArrayList<String> arrayList = new ArrayList<>();
+                arrayList.add("AI文生图");
+                arrayList.add("AI修图");
+                arrayList.add("AI视频");
+                arrayList.add("AI写作");
+                arrayList.add("AI数据分析");
+                arrayList.add("BI可视化分析");
+
+                //查询所有module
+                List<String> stringList = stuPracticalTrainingReportMapper.selectReport(stuBlockProductWithBLOBs.getUserId(), stuBlockProductWithBLOBs.getSchoolId());
+
+
+                // 取两个List中相同的数据
+                arrayList.retainAll(stringList);
+
+
+
+                int size = arrayList.size();
                 BigDecimal bigDecimalSize = BigDecimal.valueOf(size);
                 BigDecimal bigDecimalValue = BigDecimal.valueOf(6);
-                BigDecimal info = bigDecimalSize.divide(bigDecimalValue,2,BigDecimal.ROUND_UP).multiply(BigDecimal.valueOf(100));
+                BigDecimal info = bigDecimalSize.divide(bigDecimalValue, 2, BigDecimal.ROUND_UP).multiply(BigDecimal.valueOf(100));
 
 
                 // System.out.println(info);

src/main/java/com/sztzjy/marketing/service/impl/StuUserProfileDatabaseServiceImpl.java

@@ -57,7 +57,7 @@ public class StuUserProfileDatabaseServiceImpl implements StuUserProfileDatabase
         list.add("客户细分数据表");
         list.add("销售预测数据表");
         list.add("购物车数据表");
-        list.add("用户评论表");
+        list.add("商品评论数据");
 
         list.add("RFM明细数据");
         list.add("AARRR传播数据");

src/main/resources/mappers/StuPracticalTrainingReportMapper.xml

@@ -211,6 +211,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </select>
+
     <update id="updateByExampleSelective" parameterType="map">
     update stu_practical_training_report
     <set>
@@ -335,4 +336,14 @@
       ascription = #{ascription,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectReport" resultType="java.lang.String">
+    select distinct (module)
+    from
+      stu_practical_training_report
+    where
+      userid = #{userId}
+    and
+      school_id = #{schoolId}
+  </select>
 </mapper>