fix

run-prod.sh

@@ -1,41 +1,4 @@
-#!/usr/bin/env bash
-# 定义应用组名
-group_name='zhongzheng'
-# 定义应用名称
-app_name='zhongzheng-saas-api'
-# 定义应用版本
-app_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 5055:5055 --name ${app_name} \
---restart=always \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--m 10240m \
---cpus=3 \
---log-opt max-size=50m \
---log-opt max-file=3 \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
 
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
 
 #!/usr/bin/env bash
 # 定义应用组名

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

@@ -205,6 +205,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
         bo.setPageSize(null);
         bo.setPageNum(null);
         GoodsVo goodsVo = iGoodsService.selectDetail(bo.getGoodsId());
+        goodsVo.setSelfClassHours(goodsVo.getClassHours());
         //获取培训开始时间
         UserStudyRecordQueryBo studyRecordQueryBo = new UserStudyRecordQueryBo();
         studyRecordQueryBo.setUserId(bo.getUserId());
@@ -371,8 +372,8 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             for(CourseChapterVo chapterVo : chapterList){
                 totalHour+=chapterVo.getSectionNum();
             }
-            goodsVo.setClassHours(new BigDecimal(totalHour));
-            vo.setClassHours(totalHour+"");
+            goodsVo.setClassHours(goodsVo.getSelfClassHours());
+            vo.setClassHours(goodsVo.getSelfClassHours()+"");
             vo.setDateY(nowDate.substring(0, 4));
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
@@ -406,8 +407,8 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             for(CourseChapterVo chapterVo : chapterList){
                 totalHour+=chapterVo.getSectionNum();
             }
-            goodsVo.setClassHours(new BigDecimal(totalHour));
-            vo.setClassHours(totalHour+"");
+            goodsVo.setClassHours(goodsVo.getSelfClassHours());
+            vo.setClassHours(goodsVo.getSelfClassHours()+"");
             vo.setDateY(nowDate.substring(0, 4));
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
@@ -441,8 +442,8 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             for(CourseChapterVo chapterVo : chapterList){
                 totalHour+=chapterVo.getSectionNum();
             }
-            goodsVo.setClassHours(new BigDecimal(totalHour));
-            vo.setClassHours(totalHour+"");
+            goodsVo.setClassHours(goodsVo.getSelfClassHours());
+            vo.setClassHours(goodsVo.getSelfClassHours()+"");
             vo.setDateY(nowDate.substring(0, 4));
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
@@ -476,8 +477,8 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             for(CourseChapterVo chapterVo : chapterList){
                 totalHour+=chapterVo.getSectionNum();
             }
-            goodsVo.setClassHours(new BigDecimal(totalHour));
-            vo.setClassHours(totalHour+"");
+            goodsVo.setClassHours(goodsVo.getSelfClassHours());
+            vo.setClassHours(goodsVo.getSelfClassHours()+"");
             vo.setDateY(nowDate.substring(0, 4));
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
@@ -511,8 +512,8 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             for(CourseChapterVo chapterVo : chapterList){
                 totalHour+=chapterVo.getSectionNum();
             }
-            goodsVo.setClassHours(new BigDecimal(totalHour));
-            vo.setClassHours(totalHour+"");
+            goodsVo.setClassHours(goodsVo.getSelfClassHours());
+            vo.setClassHours(goodsVo.getSelfClassHours()+"");
             vo.setDateY(nowDate.substring(0, 4));
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
@@ -546,8 +547,8 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             for(CourseChapterVo chapterVo : chapterList){
                 totalHour+=chapterVo.getSectionNum();
             }
-            goodsVo.setClassHours(new BigDecimal(totalHour));
-            vo.setClassHours(totalHour+"");
+            goodsVo.setClassHours(goodsVo.getSelfClassHours());
+            vo.setClassHours(goodsVo.getSelfClassHours()+"");
     //        vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
             vo.setDateY(nowDate.substring(0, 4));
             vo.setDateM(nowDate.substring(5, 7));

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -125,6 +125,10 @@ public class GoodsVo {
 	@Excel(name = "封面地址")
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
+
+	@Excel(name = "学时")
+	@ApiModelProperty("学时")
+	private BigDecimal selfClassHours;
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")