Merge remote-tracking branch 'origin/test' into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentInstrumentServiceImpl.java

@@ -49,6 +49,8 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
     private SysMessageService sysMessageService;
     @Autowired
     private GoodsService goodsService;
+    @Autowired
+    private GoodsCategoryService goodsCategoryService;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -242,8 +244,9 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
     @Override
     public StudentInstrument addStudentInstrument(StudentInstrument studentInstrument) {
         Goods goods = goodsService.get(studentInstrument.getGoodsId());
+        GoodsCategory goodsCategory = goodsCategoryService.get(goods.getGoodsCategoryId());
         studentInstrument.setGoodsCategoryId(goods.getGoodsCategoryId());
-        studentInstrument.setGoodsCategoryName(goods.getGoodsCategoryName());
+        studentInstrument.setGoodsCategoryName(goodsCategory.getName());
         studentInstrument.setGoodsName(goods.getName());
         studentInstrument.setGoodsBrand(goods.getBrand());
         studentInstrument.setSpecification(goods.getSpecification());

mec-biz/src/main/resources/config/mybatis/StudentInstrumentMapper.xml

@@ -36,7 +36,7 @@
     <!--@mbg.generated-->
     insert into student_instrument (student_id_,organ_id_,goods_id_,goods_category_id_,goods_category_name_,goods_name_,goods_brand_,specification_,goods_img_, status_, start_time_, end_time_, create_time_, update_time
       )
-    values (#{studentId},#{organId},#{goodsId},#{goodsCategoryId},#{goodsCategoryName},#{goodsName},#{goodsBrand},#{specification},#{goodsImg}, #{status}, #{startTime}, #{endTime}, #{createTime}, #{updateTime}
+    values (#{studentId},#{organId},#{goodsId},#{goodsCategoryId},#{goodsCategoryName},#{goodsName},#{goodsBrand},#{specification},#{goodsImg}, #{status}, #{startTime}, #{endTime}, NOW(), NOW()
       )
   </insert>
   <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentInstrument">