submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -393,7 +393,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         Set<TopInstSettle> settleList = new HashSet<>();
         for (String name : fullName) {
             List<TopInstSettle> settles = topInstSettleService.getSettleByBusiness(name,
-                    ObjectUtils.isNotNull(orderVo.getPayTime()) ? orderVo.getPayTime() : orderVo.getCreateTime(), orderVo.getOperationType());
+                    ObjectUtils.isNotNull(orderVo.getCheckTime()) ? orderVo.getCheckTime() : orderVo.getCreateTime(), orderVo.getOperationType());
             settleList.addAll(settles);
         }
         if (CollectionUtils.isNotEmpty(settleList)) {
@@ -464,7 +464,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
         // 获取企业默认成本模板
         TopCostTp costTp = topCostTpService.getOne(new LambdaQueryWrapper<TopCostTp>()
-                .eq(TopCostTp::getTenantId, bo.getTenantId()).eq(TopCostTp::getDefaultStatus, 1).last("limit 1"));
+                .eq(TopCostTp::getTenantId, bo.getTenantId())
+                .eq(TopCostTp::getDefaultStatus, 1)
+                .eq(TopCostTp::getStatus,1)
+                .last("limit 1"));
         if (ObjectUtils.isNotNull(costTp) && bo.getOrderFrom() != 4) {
             TopCostTpVo topCostTpVo = BeanUtil.toBean(costTp, TopCostTpVo.class);
             //成本项

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeQueryBo.java

@@ -183,4 +183,10 @@ public class UserSubscribeQueryBo extends BaseEntity {
 	@ApiModelProperty("题库商家名称")
 	private String questionMerchantName;
 
+	@ApiModelProperty("教育类型ID")
+	private Long educationTypeId;
+
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -30,8 +30,14 @@ import com.zhongzheng.modules.alioss.service.OssService;
 import com.zhongzheng.modules.alioss.vo.FileBean;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.bo.UserProfileFit;
+import com.zhongzheng.modules.course.domain.CourseBusiness;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
+import com.zhongzheng.modules.course.domain.CourseProjectType;
 import com.zhongzheng.modules.course.domain.Major;
 import com.zhongzheng.modules.course.mapper.CourseMapper;
+import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
+import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
 import com.zhongzheng.modules.course.service.IMajorService;
 import com.zhongzheng.modules.exam.bo.*;
 import com.zhongzheng.modules.exam.domain.ExamApply;
@@ -160,6 +166,12 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     private IUserStudyRecordPhotoService iUserStudyRecordPhotoService;
     @Autowired
     private IGoodsQuestionRelService iGoodsQuestionRelService;
+    @Autowired
+    private ICourseEducationTypeService iCourseEducationTypeService;
+    @Autowired
+    private ICourseProjectTypeService iCourseProjectTypeService;
+    @Autowired
+    private ICourseBusinessService iCourseBusinessService;
 
     @Value("${aliyun.sms.cancellationReminder}")
     private String cancellationReminder;
@@ -864,6 +876,17 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
         }
         List<UserSubscribeVo> userSubscribeVos = baseMapper.listSubscribe(bo);
+        if (CollectionUtils.isNotEmpty(userSubscribeVos)){
+            userSubscribeVos.forEach(item -> {
+                Goods goods = iGoodsService.getById(item.getGoodsId());
+                CourseEducationType educationType = iCourseEducationTypeService.getById(goods.getEducationTypeId());
+                item.setEducationTypeName(educationType.getEducationName());
+                CourseProjectType projectType = iCourseProjectTypeService.getById(goods.getProjectId());
+                item.setProjectName(projectType.getProjectName());
+                CourseBusiness business = iCourseBusinessService.getById(goods.getBusinessId());
+                item.setBusinessName(business.getBusinessName());
+            });
+        }
         return userSubscribeVos;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeVo.java

@@ -304,4 +304,13 @@ public class UserSubscribeVo {
 
 	@ApiModelProperty("证件照")
 	private String oneInchPhotos;
+
+	@ApiModelProperty("教育类型")
+	private String educationTypeName;
+
+	@ApiModelProperty("业务层次")
+	private String businessName;
+
+	@ApiModelProperty("项目类型")
+	private String projectName;
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -202,6 +202,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="gradeType != null and gradeType != '' ">
             and g.grade_type = #{gradeType}
         </if>
+        <if test="educationTypeId != null and educationTypeId != '' ">
+            and g.education_type_id = #{educationTypeId}
+        </if>
+        <if test="businessId != null and businessId != '' ">
+            and g.business_id = #{businessId}
+        </if>
         <if test="createUsername != null and createUsername != '' ">
             and o.create_username like concat('%', #{create_username}, '%')
         </if>