|
@@ -549,7 +549,9 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
vo.setRealname(userVo.getRealname());
|
|
|
vo.setIdCard(userVo.getIdCard());
|
|
|
String date = DateUtils.timestampToDate(goodsVo.getCreateTime());
|
|
|
- vo.setYear(date.substring(0, 4));
|
|
|
+ OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>()
|
|
|
+ .eq(OrderGoods::getOrderGoodsId, bo.getOrderGoodsId()));
|
|
|
+ vo.setYear(orderGoods.getSevenYear());
|
|
|
String sex = "男";
|
|
|
if(Validator.isNotEmpty(userVo.getSex())&&userVo.getSex()==2){
|
|
|
sex = "女";
|
|
@@ -923,7 +925,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
g.drawString(entity.getDateY()+"年"+entity.getDateM()+"月"+entity.getDateD()+"日", 846, 1616);
|
|
|
g.drawString("施工现场专业人员", 1508, 1616);
|
|
|
|
|
|
- g.drawString(entity.getDateY(), 311, 1770);
|
|
|
+ g.drawString(entity.getYear(), 311, 1770);
|
|
|
g.drawString(String.valueOf(Integer.parseInt(entity.getPublicClassHours())+Integer.parseInt(entity.getClassHours())), 1341, 1770);
|
|
|
|
|
|
g.drawString(entity.getPublicClassHours(), 311, 1920);
|