submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -1011,4 +1011,9 @@ public class CommonController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("查询科目")
+    @PostMapping("/common/free/subject")
+    public AjaxResult<SubjectMarketingVo> getSubject(@RequestBody SubjectQueryBo bo) {
+        return AjaxResult.success( iGoodsService.getSubject(bo));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/SubjectQueryBo.java

@@ -0,0 +1,13 @@
+package com.zhongzheng.modules.goods.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SubjectQueryBo implements Serializable {
+
+    private String subjectName;
+
+    private Long subjectId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsService.java

@@ -189,4 +189,6 @@ public interface IGoodsService extends IService<Goods> {
     void getImageWord(MultipartFile file, String major);
 
 	boolean createKaoQianNew();
+
+	SubjectMarketingVo getSubject(SubjectQueryBo bo);
 }

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

@@ -6223,6 +6223,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return true;
     }
 
+    @Override
+    public SubjectMarketingVo getSubject(SubjectQueryBo bo) {
+        CourseSubject courseSubject = iCourseSubjectService
+                .getOne(new LambdaQueryWrapper<CourseSubject>().eq(CourseSubject::getSubjectName, bo.getSubjectName()).eq(CourseSubject::getStatus, 1).last("limit 1"));
+
+        return ObjectUtils.isNotNull(courseSubject)?BeanUtil.toBean(courseSubject,SubjectMarketingVo.class):null;
+    }
+
     private Long businessCheck(String name,Long projectId){
         CourseProjectType projectType = iCourseProjectTypeService.getById(projectId);
         CourseBusiness business = iCourseBusinessService

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsBusinessVo.java

@@ -24,6 +24,9 @@ public class GoodsBusinessVo implements Serializable {
     @ApiModelProperty("商品名称")
     private String goodsName;
 
+    @ApiModelProperty("年份")
+    private Long year;
+
     @ApiModelProperty("标准价格")
     private BigDecimal standPrice;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/SubjectMarketingVo.java

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.goods.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SubjectMarketingVo implements Serializable {
+
+    private Long id;
+    /** 编码KM */
+    private String encoder;
+    /** 备注 */
+    private String remark;
+    /** 0 未启用 1启用 -1删除 */
+    private Integer status;
+    /** 添加时间 */
+    private Long createTime;
+    /** 修改时间 */
+    private Long updateTime;
+    /** 科目名称 */
+    private String subjectName;
+    /** 排序 */
+    private Integer sort;
+
+    private Long tenantId;
+}