submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderController.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.controller.order;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderRepController.java

@@ -130,7 +130,7 @@ public class TopOldOrderRepController extends BaseController {
     @GetMapping("/bill/export")
     public AjaxResult<Void> billExport(TopOrderRepQueryBo queryBo) {
         List<TopOrderBillExportVo> list = iTopOldOrderService.billExportList(queryBo);
-        ExcelUtil<TopOrderBillExportVo> util = new ExcelUtil<>(TopOrderBillExportVo.class);
+        ExcelUtil<TopOrderBillExportVo> util = new ExcelUtil<TopOrderBillExportVo>(TopOrderBillExportVo.class);
         return util.exportExcel(list,"账单明细");
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseBusinessServiceImpl.java

@@ -23,6 +23,8 @@ import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
 import com.zhongzheng.modules.course.service.ICourseTopicService;
 import com.zhongzheng.modules.course.vo.CourseBusinessVo;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+import com.zhongzheng.modules.order.domain.OrderInputTemplate;
+import com.zhongzheng.modules.order.service.IOrderInputTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -45,6 +47,8 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
     private ICourseProjectTypeService iCourseProjectTypeService;
     @Autowired
     private ICourseTopicService iCourseTopicService;
+    @Autowired
+    private IOrderInputTemplateService orderInputTemplateService;
 
     @Override
     public CourseBusinessVo queryById(Long id){
@@ -83,6 +87,14 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
             if (ObjectUtils.isNotNull(courseTopic)){
                 item.setTopicId(courseTopic.getTopicId());
             }
+            if (ObjectUtils.isNotNull(item.getTemplateStatus())){
+                OrderInputTemplate orderInputTemplate = orderInputTemplateService.getById(item.getTemplateStatus());
+                if (ObjectUtils.isNotNull(orderInputTemplate) && "class".equals(orderInputTemplate.getType())){
+                    item.setTemplateStatus(1);
+                }else if (ObjectUtils.isNotNull(orderInputTemplate) && "apply".equals(orderInputTemplate.getType())){
+                    item.setTemplateStatus(2);
+                }
+            }
         });
         return vo;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderBillExportVo.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.order.bo;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
+
+import com.zhongzheng.common.annotation.Excel;
 import lombok.Data;
 
 import java.io.Serializable;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/domain/TopOldOrderReplenish.java

@@ -31,16 +31,22 @@ public class TopOldOrderReplenish implements Serializable {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String proceedsRecord;
     /** 积分*/
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer integral;
     /** 日期 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long proceedsDate;
     /** 收入核对日期 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long proceedsCheckDate;
     /** 未收（订单明细用） */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal orderResidue;
     /** 变化 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String proceedsChange;
     /** 成本支付 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal cost;
     /** 1有效 0无效 */
     private Integer status;