fix 学时信息资料

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -114,7 +114,7 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        add.setMakeOutTime(DateUtils.getNowTime());
+        add.setApplyTime(DateUtils.getNowTime());
 
         boolean rs = this.save(add);
         if(rs){
@@ -158,7 +158,7 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
             //已上传发票或有快递单号且新旧数据开票状态一样则为已开票（若开票状态不一样则为人为标记开票状态不进下面逻辑）
             if((Validator.isNotEmpty(bo.getInvoiceImg())||Validator.isNotEmpty(bo.getTrackingNum())) && (old.getInvoiceStatus().equals(bo.getInvoiceStatus()))){
                 update.setInvoiceStatus(2);
-                update.setApplyTime(DateUtils.getNowTime());
+                update.setMakeOutTime(DateUtils.getNowTime());
             }
         }
         if(old.getPeriodStatus()==1&&old.getPeriodStatus()!=bo.getPeriodStatus()){

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

@@ -333,7 +333,7 @@
         m.type = 1
         GROUP BY c.goods_id ) ge on cgg.goods_id = ge.goods_id
         LEFT JOIN `user` u ON u.user_id = cgu.user_id
-        LEFT JOIN user_profile up on u.user_id =up.user_id and up.goods_id = cgg.goods_id and up.type_status=1 and up.current_status = 1
+        LEFT JOIN user_profile up on u.user_id =up.user_id and up.goods_id = ge.goods_id and up.type_status=1 and up.current_status = 1
         LEFT JOIN goods g on cgg.goods_id = g.goods_id
         where 1=1
         and cgu.`status` =1