fix orderConfig

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderBusinessConfigController.java

@@ -74,7 +74,9 @@ public class OrderBusinessConfigController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:config:query')")
     @GetMapping("/{id}")
     public AjaxResult<OrderBusinessConfigVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iOrderBusinessConfigService.queryById(id));
+        OrderBusinessConfigQueryBo queryBo = new OrderBusinessConfigQueryBo();
+        queryBo.setId(id);
+        return AjaxResult.success(iOrderBusinessConfigService.getDetail(queryBo));
     }
 
     /**

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

@@ -22,7 +22,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("录单配置分页查询对象")
 public class OrderBusinessConfigQueryBo extends BaseEntity {
-
+	private Long id;
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")
 	private Integer pageSize;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderBusinessConfigMapper.java

@@ -17,4 +17,5 @@ import java.util.List;
  */
 public interface OrderBusinessConfigMapper extends BaseMapper<OrderBusinessConfig> {
     List<OrderBusinessConfigVo> getList(OrderBusinessConfigQueryBo bo);
+    OrderBusinessConfigVo getDetail(OrderBusinessConfigQueryBo bo);
 }

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

@@ -29,6 +29,8 @@ public interface IOrderBusinessConfigService extends IService<OrderBusinessConfi
 	List<OrderBusinessConfigVo> queryList(OrderBusinessConfigQueryBo bo);
 
 	List<OrderBusinessConfigVo> getList(OrderBusinessConfigQueryBo bo);
+	OrderBusinessConfigVo getDetail(OrderBusinessConfigQueryBo bo);
+
 
 	/**
 	 * 根据新增业务对象插入录单配置

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

@@ -53,6 +53,11 @@ public class OrderBusinessConfigServiceImpl extends ServiceImpl<OrderBusinessCon
         return this.baseMapper.getList(bo);
     }
 
+    @Override
+    public OrderBusinessConfigVo getDetail(OrderBusinessConfigQueryBo bo) {
+        return this.baseMapper.getDetail(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderBusinessConfigGoodsVo.java

@@ -45,5 +45,11 @@ public class OrderBusinessConfigGoodsVo {
 	@Excel(name = "0 未启用 1启用")
 	@ApiModelProperty("0 未启用 1启用")
 	private Integer status;
+	@ApiModelProperty("业务层次名称")
+	private String businessName;
+	@ApiModelProperty("教育类型名称")
+	private String educationName;
+	@ApiModelProperty("项目名称")
+	private String projectName;
 	private List<GoodsVo> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderBusinessConfigVo.java

@@ -40,4 +40,10 @@ public class OrderBusinessConfigVo {
 	@Excel(name = "业务层次别名")
 	@ApiModelProperty("业务层次别名")
 	private String aliasName;
+	@ApiModelProperty("业务层次名称")
+	private String businessName;
+	@ApiModelProperty("教育类型名称")
+	private String educationName;
+	@ApiModelProperty("项目名称")
+	private String projectName;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigGoodsMapper.xml

@@ -21,6 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="subjectName" column="subject_name"/>
         <result property="goodsIds" column="goods_ids"/>
         <result property="status" column="status"/>
+        <result property="businessName" column="business_name"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
         <collection property="goodsList" column="goods_ids" select="findGoodsList"/>
     </resultMap>
 
@@ -59,6 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cs.subject_name
         FROM
             order_business_config_goods bcg
+            LEFT JOIN order_business_config obc ON bcg.config_id = obc.id
+            LEFT JOIN course_business cb ON obc.business_id = cb.id
+            LEFT JOIN course_project_type cpt ON cb.project_id = cpt.id
+            LEFT JOIN course_education_type cet ON cet.id = cpt.education_id
                 LEFT JOIN course_subject cs on bcg.subject_id = cs.id
         WHERE
             bcg.config_id = #{configId}

zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigMapper.xml

@@ -18,6 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessId" column="business_id"/>
         <result property="configName" column="config_name"/>
         <result property="aliasName" column="alias_name"/>
+        <result property="businessName" column="business_name"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
     </resultMap>
 
     <select id="getList" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo" resultMap="OrderBusinessConfigVoResult">
@@ -33,4 +36,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and obc.business_id = #{businessId}
         </if>
     </select>
+
+    <select id="getDetail" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo" resultMap="OrderBusinessConfigVoResult">
+        SELECT
+            obc.*,
+            cb.alias_name,
+            cb.business_name,
+            cpt.project_name,
+            cet.education_name
+        FROM
+            order_business_config obc
+                LEFT JOIN course_business cb ON obc.business_id = cb.id
+                LEFT JOIN course_project_type cpt ON cb.project_id = cpt.id
+                LEFT JOIN course_education_type cet ON cet.id = cpt.education_id
+        WHERE
+             obc.id = #{id}
+    </select>
 </mapper>