submit

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

@@ -306,6 +306,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
     }
 
     private void  drawCertificate(CertificateTpVo tpVo,GoodsVo goodsVo,ClassGradeUserQueryBo bo,UserVo userVo,UserStudyRecordVo studyRecordVo,ClassGradeUser classGradeUser,List<CourseChapterVo> chapterList,Long moduleId){
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         String nowDate = DateUtils.getDate();
         if("certificate01".equals(tpVo.getKeyValue())){
             CertificatePhotoVo vo = new CertificatePhotoVo();
@@ -378,8 +379,12 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
             vo.setMajor("一级建造师继续教育培训");
-            vo.setRemark1("其中必修");
-            vo.setRemark2("课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            if (tenantId.equals("779352047136603")){
+                vo.setRemark1("其中必修课"+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }else {
+                vo.setRemark1("其中必修");
+                vo.setRemark2("课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }
             vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
             vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
             List<String> chapterListTxt = changeChapterList(chapterList);
@@ -413,8 +418,12 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
             vo.setMajor("一级建造师继续教育培训");
-            vo.setRemark1("其中建");
-            vo.setRemark2("筑工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            if (tenantId.equals("779352047136603")){
+                vo.setRemark1("其中建筑工程课"+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }else {
+                vo.setRemark1("其中建");
+                vo.setRemark2("筑工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }
             vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
             vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
             List<String> chapterListTxt = changeChapterList(chapterList);
@@ -448,8 +457,12 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
             vo.setMajor("一级建造师继续教育培训");
-            vo.setRemark1("其中机");
-            vo.setRemark2("电工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            if (tenantId.equals("779352047136603")){
+                vo.setRemark1("其中机电工程课"+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }else {
+                vo.setRemark1("其中机");
+                vo.setRemark2("电工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }
             vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
             vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
             List<String> chapterListTxt = changeChapterList(chapterList);
@@ -483,8 +496,12 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
             vo.setMajor("一级建造师继续教育培训");
-            vo.setRemark1("其中市");
-            vo.setRemark2("政公用工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            if (tenantId.equals("779352047136603")){
+                vo.setRemark1("其中市政公用工程课"+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }else {
+                vo.setRemark1("其中市");
+                vo.setRemark2("政公用工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }
             vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
             vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
             List<String> chapterListTxt = changeChapterList(chapterList);
@@ -518,8 +535,12 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
             vo.setMajor("一级建造师继续教育培训");
-            vo.setRemark1("其中公");
-            vo.setRemark2("路工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            if (tenantId.equals("779352047136603")){
+                vo.setRemark1("其中公路工程课"+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }else {
+                vo.setRemark1("其中公");
+                vo.setRemark2("路工程课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }
             vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
             vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
             List<String> chapterListTxt = changeChapterList(chapterList);
@@ -554,8 +575,12 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             vo.setDateM(nowDate.substring(5, 7));
             vo.setDateD(nowDate.substring(8, 10));
             vo.setMajor("一级建造师继续教育培训");
-            vo.setRemark1("其中水");
-            vo.setRemark2("利水电课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            if (tenantId.equals("779352047136603")){
+                vo.setRemark1("其中水利水电课"+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }else {
+                vo.setRemark1("其中水");
+                vo.setRemark2("利水电课 "+goodsVo.getClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP )+" 学时，测试成绩合格。");
+            }
             vo.setTrainStartTime(studyRecordVo.getFirstStartTime()); //培训开始时间
             vo.setTrainEndTime(classGradeUser.getPeriodWaitTime());//学时变为待审核时间,也是学习完成时间
             List<String> chapterListTxt = changeChapterList(chapterList);
@@ -788,7 +813,10 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
         String tenantId = ToolsUtils.getTenantId();
         if(tenantId.equals("694515817698614")){
             return tenantId;
-        }else {
+        }else if(tenantId.equals("779352047136603")){
+            return tenantId;
+        }
+        else {
             return "867735392558919680";
         }
     }
@@ -797,7 +825,9 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
         String tenantId = ToolsUtils.getTenantId();
         if(tenantId.equals("694515817698614")){
             return false;
-        }else {
+        }else if(tenantId.equals("779352047136603")){
+            return false;
+        } else {
             return true;
         }
     }
@@ -874,7 +904,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
     }
 
     private  String drawPicOneBuild(CertificatePhotoVo entity){
-        Font font = new Font("宋体", Font.BOLD, 20);// 添加字体的属性设置 微软雅黑
+        Font font = new Font("宋体", Font.BOLD, 60);// 添加字体的属性设置 微软雅黑
         String imgName = null;
         try {
             // 加载本地图片
@@ -888,22 +918,34 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             // 设置文本样式
             g.setFont(font);
             g.setColor(Color.BLACK);
+            String tenantId = ToolsUtils.getTenantId();
+            if ("779352047136603".equals(tenantId)){
+                g.drawString(entity.getCode(), 570, 1850);
+                g.drawString(entity.getRealname(), 680, 1020);
+                g.drawString(entity.getSex(), 1457, 1020);
+                g.drawString(entity.getIdCard(), 2278, 1020);
+                g.drawString(entity.getDateY(), 491, 1265);
+                g.drawString(entity.getDateM(), 962, 1265);
+                g.drawString(entity.getMajor(), 2080, 1265);
+                g.drawString(entity.getRemark1(), 405, 1470);
+                g.drawString(entity.getDateY(), 2450, 2000);
+                g.drawString(entity.getDateM(), 2720, 2000);
+                g.drawString(entity.getDateD(), 2850, 2000);
+            }else {
+                g.drawString(entity.getCode(), 273, 635);
+                g.drawString(entity.getRealname(), 828, 265);
+                g.drawString(entity.getSex(), 1015, 265);
+                g.drawString(entity.getIdCard(), 833, 315);
+                g.drawString(entity.getDateY(), 780, 365);
+                g.drawString(entity.getDateM(), 905, 365);
+                g.drawString(entity.getMajor(), 728, 408);
+                g.drawString(entity.getRemark1(), 1035, 408);
+                g.drawString(entity.getRemark2(), 728, 460);
+                g.drawString(entity.getDateY(), 945, 677);
+                g.drawString(entity.getDateM(), 1019, 677);
+                g.drawString(entity.getDateD(), 1071, 677);
+            }
 
-            g.drawString(entity.getCode(), 273, 635);
-            g.drawString(entity.getRealname(), 828, 265);
-            g.drawString(entity.getSex(), 1015, 265);
-            g.drawString(entity.getIdCard(), 833, 315);
-            g.drawString(entity.getDateY(), 780, 365);
-            g.drawString(entity.getDateM(), 905, 365);
-            g.drawString(entity.getMajor(), 728, 408);
-            g.drawString(entity.getRemark1(), 1035, 408);
-            g.drawString(entity.getRemark2(), 728, 460);
-
-
-
-            g.drawString(entity.getDateY(), 945, 677);
-            g.drawString(entity.getDateM(), 1019, 677);
-            g.drawString(entity.getDateD(), 1071, 677);
 
             //二维码
             String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
@@ -911,7 +953,11 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 120, 120);
             BufferedImage qrImage = toBufferedImage(bitMatrix);
             // 在模板上添加用户二维码(地址,左边距,上边距,图片宽度,图片高度,未知)
-            g.drawImage(qrImage, 128, 660, 120, 120, null);
+            if ("779352047136603".equals(tenantId)){
+                g.drawImage(qrImage, 395, 1914, 300, 300    , null);
+            }else {
+                g.drawImage(qrImage, 128, 660, 120, 120, null);
+            }
             // 完成模板修改
             g.dispose();
             // 获取新文件的地址
@@ -1119,6 +1165,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
         Font font = new Font("微软雅黑", Font.PLAIN, 31);// 添加字体的属性设置 微软雅黑
         Font font2 = new Font("微软雅黑", Font.BOLD, 38);
         String imgName = null;
+        String tenantId = ToolsUtils.getTenantId();
         try {
             // 加载本地图片
             InputStream imgStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("static/"+getImgDir()+"/006.jpg");
@@ -1131,67 +1178,101 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             // 设置文本样式
             g.setFont(font2);
             g.setColor(Color.BLACK);
-            g.drawString(entity.getRealname(), 165, 486);
-
-            g.setFont(font);
-
-            g.drawString(entity.getCode(), 169, 236 );
-
-            g.drawString(entity.getRealname(), 126, 696);
-
-            g.drawString(entity.getIdCard(), 298, 696);
-
-            g.drawString("二级注册建造师", 677, 668);
-            if("必修".equals(entity.getMajor())){
-                g.drawString(entity.getMajor(), 768, 718);
-            }else{
-                g.drawString("选修("+entity.getMajor()+")", 677, 718);
+            if ("779352047136603".equals(tenantId)){
+                g.drawString(entity.getRealname(), 353, 430);
+            }else {
+                g.drawString(entity.getRealname(), 165, 486);
             }
 
-
-            if("必修".equals(entity.getMajor())){
-                g.drawString(entity.getClassHours(), 980, 696);
-                g.drawString("0", 1105, 696);
-            }else{
-                g.drawString("0", 980, 696);
-                g.drawString(entity.getClassHours(), 1105, 696);
-            }
-            Integer startY = 810;
-            Integer j = 0;
-            for(String name : entity.getChapterList()){
-                if(j<14){
-                    g.drawString(name, 300, startY);
-                    startY+=50;
+            g.setFont(font);
+            if ("779352047136603".equals(tenantId)){
+                g.drawString(entity.getCode(), 316, 175 );
+                g.drawString(entity.getRealname(), 256, 652);
+                g.drawString(entity.getIdCard(), 430, 657);
+                g.drawString("二级注册建造师", 762, 640);
+                if("必修".equals(entity.getMajor())){
+                    g.drawString(entity.getMajor(), 762, 695);
                 }else{
-                    g.drawString("....", 300, startY);
-                    break;
+                    g.drawString("选修("+entity.getMajor()+")", 762, 695);
+                }
+                if("必修".equals(entity.getMajor())){
+                    g.drawString(entity.getClassHours(), 1000, 681);
+                    g.drawString("0", 1120, 681);
+                }else{
+                    g.drawString("0", 1000, 681);
+                    g.drawString(entity.getClassHours(), 1120, 681);
+                }
+                Integer startY = 810;
+                Integer j = 0;
+                for(String name : entity.getChapterList()){
+                    if(j<14){
+                        g.drawString(name, 470, startY);
+                        startY+=50;
+                    }else{
+                        g.drawString("....", 470, startY);
+                        break;
+                    }
+                    j++;
+                }
+                g.drawString(DateUtils.timestampToDateFormat(entity.getTrainStartTime(),"yyyy.MM.dd"), 1200, 640);
+                g.drawString("至", 1260, 678);
+                g.drawString(DateUtils.timestampToDateFormat(entity.getTrainEndTime(),"yyyy.MM.dd"), 1200, 710);
+                g.drawString(entity.getDateY(), 1000, 1960);
+                g.drawString(entity.getDateM(), 1128, 1960);
+                g.drawString(entity.getDateD(), 1218, 1960);
+            }else {
+                g.drawString(entity.getCode(), 169, 236 );
+                g.drawString(entity.getRealname(), 126, 696);
+                g.drawString(entity.getIdCard(), 298, 696);
+                g.drawString("二级注册建造师", 677, 668);
+                if("必修".equals(entity.getMajor())){
+                    g.drawString(entity.getMajor(), 768, 718);
+                }else{
+                    g.drawString("选修("+entity.getMajor()+")", 677, 718);
+                }
+                if("必修".equals(entity.getMajor())){
+                    g.drawString(entity.getClassHours(), 980, 696);
+                    g.drawString("0", 1105, 696);
+                }else{
+                    g.drawString("0", 980, 696);
+                    g.drawString(entity.getClassHours(), 1105, 696);
+                }
+                Integer startY = 810;
+                Integer j = 0;
+                for(String name : entity.getChapterList()){
+                    if(j<14){
+                        g.drawString(name, 300, startY);
+                        startY+=50;
+                    }else{
+                        g.drawString("....", 300, startY);
+                        break;
+                    }
+                    j++;
+                }
+                g.drawString(DateUtils.timestampToDateFormat(entity.getTrainStartTime(),"yyyy.MM.dd"), 1214, 666);
+                g.drawString("至", 1279, 705);
+                g.drawString(DateUtils.timestampToDateFormat(entity.getTrainEndTime(),"yyyy.MM.dd"), 1214, 739);
+                g.drawString(entity.getDateY(), 842, 1967);
+                g.drawString(entity.getDateM(), 979, 1967);
+                g.drawString(entity.getDateD(), 1069, 1967);
+                InputStream logoStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("static/001.png");
+                BufferedImage logoBuffered = ImageIO.read(logoStream);
+                if(haveStamp()){
+                    g.drawImage(logoBuffered, 1012, 1666, 330, 330, null);
                 }
-                j++;
-            }
-
-            g.drawString(DateUtils.timestampToDateFormat(entity.getTrainStartTime(),"yyyy.MM.dd"), 1214, 666);
-            g.drawString("至", 1279, 705);
-            g.drawString(DateUtils.timestampToDateFormat(entity.getTrainEndTime(),"yyyy.MM.dd"), 1214, 739);
-
-
-            g.drawString(entity.getDateY(), 842, 1967);
-            g.drawString(entity.getDateM(), 979, 1967);
-            g.drawString(entity.getDateD(), 1069, 1967);
-
-            InputStream logoStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("static/001.png");
-            BufferedImage logoBuffered = ImageIO.read(logoStream);
-            if(haveStamp()){
-                g.drawImage(logoBuffered, 1012, 1666, 330, 330, null);
             }
 
-
             //二维码
             String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
             BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 150, 150);
             BufferedImage qrImage = toBufferedImage(bitMatrix);
             // 在模板上添加用户二维码(地址,左边距,上边距,图片宽度,图片高度,未知)
-            g.drawImage(qrImage, 1233, 175, 150, 150, null);
+            if ("779352047136603".equals(tenantId)){
+                g.drawImage(qrImage, 1149, 45, 150, 150, null);
+            }else {
+                g.drawImage(qrImage, 1233, 175, 150, 150, null);
+            }
             // 完成模板修改
             g.dispose();
             // 获取新文件的地址

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -995,7 +995,7 @@
             (SELECT FROM_UNIXTIME( ups.audit_time, '%Y-%m-%d %H:%i:%s' ) FROM user_period up
                         LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id LIMIT 1 ) AS noPassTime,
             '是' AS restart,
-	        (SELECT FROM_UNIXTIME( ups.record_start_time , '%Y-%m-%d %H:%i:%s' ) FROM user_period up LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id AND ups.`status` = 3
+	        (SELECT FROM_UNIXTIME( ups.record_start_time , '%Y-%m-%d %H:%i:%s' ) FROM user_period up LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id AND ups.`status` = 2
 	            AND ups.record_start_time IS NOT NULL ORDER BY ups.record_start_time  LIMIT 1) AS restartTime
         FROM
             class_grade_user cgu
@@ -1006,7 +1006,7 @@
         WHERE
            cgu.`status` = 1
           AND cgu.period_status = -1
-          AND (SELECT COUNT(*) FROM user_period up LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id AND ups.`status` = 3 AND ups.record_start_time IS NOT NULL ) > 0
+          AND (SELECT COUNT(*) FROM user_period up LEFT JOIN user_period_status ups ON up.id = ups.period_id WHERE up.order_goods_id = cgu.order_goods_id AND ups.`status` = 3 ) > 0
     </select>
 
     <select id="listUserWeekStudyTime" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"