|
@@ -48,6 +48,7 @@ import javax.imageio.ImageIO;
|
|
|
import java.awt.*;
|
|
|
import java.awt.image.BufferedImage;
|
|
|
import java.io.*;
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Collection;
|
|
@@ -193,7 +194,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
vo.setYear(date.substring(0, 4));
|
|
|
vo.setType("专业");
|
|
|
vo.setMajor("网络班");
|
|
|
- vo.setClassHours(goodsVo.getClassHours()+"");
|
|
|
+ vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
|
|
|
vo.setDateY(nowDate.substring(0, 4));
|
|
|
vo.setDateM(nowDate.substring(5, 7));
|
|
|
vo.setDateD(nowDate.substring(8, 10));
|
|
@@ -216,7 +217,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
vo.setYear(date.substring(0, 4));
|
|
|
vo.setType("选修");
|
|
|
vo.setMajor("网络班");
|
|
|
- vo.setClassHours(goodsVo.getClassHours()+"");
|
|
|
+ vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
|
|
|
vo.setDateY(nowDate.substring(0, 4));
|
|
|
vo.setDateM(nowDate.substring(5, 7));
|
|
|
vo.setDateD(nowDate.substring(8, 10));
|
|
@@ -244,13 +245,13 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
sex = "女";
|
|
|
}
|
|
|
vo.setSex(sex);
|
|
|
- vo.setClassHours(goodsVo.getClassHours()+"");
|
|
|
+ vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
|
|
|
vo.setDateY(nowDate.substring(0, 4));
|
|
|
vo.setDateM(nowDate.substring(5, 7));
|
|
|
vo.setDateD(nowDate.substring(8, 10));
|
|
|
vo.setMajor("一级建造师继续教育培训");
|
|
|
vo.setRemark1("其中必修");
|
|
|
- vo.setRemark2("课 "+goodsVo.getClassHours()+" 学时,测试成绩合格。");
|
|
|
+ vo.setRemark2("课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时,测试成绩合格。");
|
|
|
vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
|
|
|
vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
|
|
|
List<String> chapterListTxt = changeChapterList(chapterList);
|
|
@@ -274,13 +275,13 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
sex = "女";
|
|
|
}
|
|
|
vo.setSex(sex);
|
|
|
- vo.setClassHours(goodsVo.getClassHours()+"");
|
|
|
+ vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
|
|
|
vo.setDateY(nowDate.substring(0, 4));
|
|
|
vo.setDateM(nowDate.substring(5, 7));
|
|
|
vo.setDateD(nowDate.substring(8, 10));
|
|
|
vo.setMajor("一级建造师继续教育培训");
|
|
|
vo.setRemark1("其中建");
|
|
|
- vo.setRemark2("筑工程课 "+goodsVo.getClassHours()+" 学时,测试成绩合格。");
|
|
|
+ vo.setRemark2("筑工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时,测试成绩合格。");
|
|
|
vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
|
|
|
vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
|
|
|
List<String> chapterListTxt = changeChapterList(chapterList);
|
|
@@ -304,13 +305,13 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
sex = "女";
|
|
|
}
|
|
|
vo.setSex(sex);
|
|
|
- vo.setClassHours(goodsVo.getClassHours()+"");
|
|
|
+ vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
|
|
|
vo.setDateY(nowDate.substring(0, 4));
|
|
|
vo.setDateM(nowDate.substring(5, 7));
|
|
|
vo.setDateD(nowDate.substring(8, 10));
|
|
|
vo.setMajor("一级建造师继续教育培训");
|
|
|
vo.setRemark1("其中机");
|
|
|
- vo.setRemark2("电工程课 "+goodsVo.getClassHours()+" 学时,测试成绩合格。");
|
|
|
+ vo.setRemark2("电工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时,测试成绩合格。");
|
|
|
vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
|
|
|
vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
|
|
|
List<String> chapterListTxt = changeChapterList(chapterList);
|
|
@@ -334,13 +335,13 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
sex = "女";
|
|
|
}
|
|
|
vo.setSex(sex);
|
|
|
- vo.setClassHours(goodsVo.getClassHours()+"");
|
|
|
+ vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
|
|
|
vo.setDateY(nowDate.substring(0, 4));
|
|
|
vo.setDateM(nowDate.substring(5, 7));
|
|
|
vo.setDateD(nowDate.substring(8, 10));
|
|
|
vo.setMajor("一级建造师继续教育培训");
|
|
|
vo.setRemark1("其中市");
|
|
|
- vo.setRemark2("政公用工程课 "+goodsVo.getClassHours()+" 学时,测试成绩合格。");
|
|
|
+ vo.setRemark2("政公用工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时,测试成绩合格。");
|
|
|
vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
|
|
|
vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
|
|
|
List<String> chapterListTxt = changeChapterList(chapterList);
|
|
@@ -364,13 +365,13 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
sex = "女";
|
|
|
}
|
|
|
vo.setSex(sex);
|
|
|
- vo.setClassHours(goodsVo.getClassHours()+"");
|
|
|
+ vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
|
|
|
vo.setDateY(nowDate.substring(0, 4));
|
|
|
vo.setDateM(nowDate.substring(5, 7));
|
|
|
vo.setDateD(nowDate.substring(8, 10));
|
|
|
vo.setMajor("一级建造师继续教育培训");
|
|
|
vo.setRemark1("其中公");
|
|
|
- vo.setRemark2("路工程课 "+goodsVo.getClassHours()+" 学时,测试成绩合格。");
|
|
|
+ vo.setRemark2("路工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时,测试成绩合格。");
|
|
|
vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
|
|
|
vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
|
|
|
List<String> chapterListTxt = changeChapterList(chapterList);
|
|
@@ -394,13 +395,13 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
sex = "女";
|
|
|
}
|
|
|
vo.setSex(sex);
|
|
|
- vo.setClassHours(goodsVo.getClassHours()+"");
|
|
|
+ vo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+"");
|
|
|
vo.setDateY(nowDate.substring(0, 4));
|
|
|
vo.setDateM(nowDate.substring(5, 7));
|
|
|
vo.setDateD(nowDate.substring(8, 10));
|
|
|
vo.setMajor("一级建造师继续教育培训");
|
|
|
vo.setRemark1("其中水");
|
|
|
- vo.setRemark2("利水电课 "+goodsVo.getClassHours()+" 学时,测试成绩合格。");
|
|
|
+ vo.setRemark2("利水电课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时,测试成绩合格。");
|
|
|
vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
|
|
|
vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
|
|
|
List<String> chapterListTxt = changeChapterList(chapterList);
|
|
@@ -422,7 +423,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
addBo.setCertificateTpId(certificateTpId);
|
|
|
addBo.setCertificateCode(vo.getCode());
|
|
|
addBo.setCertificatePath(certificatePath);
|
|
|
- addBo.setClassHours(goodsVo.getClassHours());
|
|
|
+ addBo.setClassHours(goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP ));
|
|
|
addBo.setEducationTypeId(goodsVo.getEducationTypeId());
|
|
|
addBo.setProjectId(goodsVo.getProjectId());
|
|
|
addBo.setBusinessId(goodsVo.getBusinessId());
|