Browse Source

核注单查询企业台账和商品逻辑修改

wenjinbiao 9 months ago
parent
commit
6b7edc7c01

+ 2 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/controller/QySecondlineHzdTzController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.biz.modular.qyrecardbody.entity.QyRecardBody;
 import vip.xiaonuo.biz.modular.qyrecardbody.param.QyRecardBodyIdParam;
 import vip.xiaonuo.biz.modular.qyrecordinfo.entity.QyRecordInfo;
+import vip.xiaonuo.biz.modular.qyrecordproduct.entity.QyRecordProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehzdlist.entity.QySecondlineHzdList;
 import vip.xiaonuo.biz.modular.qysecondlinehzdproduct.entity.QySecondlineHzdProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.param.*;
@@ -214,7 +215,7 @@ public class QySecondlineHzdTzController {
     @Operation(summary = "根据企业id获取商品信息")
 //    @SaCheckPermission("/biz/qysecondlinehzdtz/detail")
     @GetMapping("/biz/qysecondlinehzdtz/qyProductById")
-    public CommonResult<List<QyRecardBody>> qyProductById(@Valid QyRecardBodyIdParam qyRecardBodyIdParam) {
+    public CommonResult<List<QyRecordProduct>> qyProductById(@Valid QyRecardBodyIdParam qyRecardBodyIdParam) {
         return CommonResult.data(qySecondlineHzdTzService.qyProductById(qyRecardBodyIdParam));
     }
 }

+ 2 - 1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/service/QySecondlineHzdTzService.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import vip.xiaonuo.biz.modular.qyrecardbody.entity.QyRecardBody;
 import vip.xiaonuo.biz.modular.qyrecardbody.param.QyRecardBodyIdParam;
 import vip.xiaonuo.biz.modular.qyrecordinfo.entity.QyRecordInfo;
+import vip.xiaonuo.biz.modular.qyrecordproduct.entity.QyRecordProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehzdlist.entity.QySecondlineHzdList;
 import vip.xiaonuo.biz.modular.qysecondlinehzdproduct.entity.QySecondlineHzdProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.entity.QySecondlineHzdTz;
@@ -91,5 +92,5 @@ public interface QySecondlineHzdTzService extends IService<QySecondlineHzdTz> {
 
     List<QyRecordInfo> qyRecordInfo();
 
-    List<QyRecardBody> qyProductById(QyRecardBodyIdParam qyRecardBodyIdParam);
+    List<QyRecordProduct> qyProductById(QyRecardBodyIdParam qyRecardBodyIdParam);
 }

+ 8 - 4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/service/impl/QySecondlineHzdTzServiceImpl.java

@@ -31,6 +31,8 @@ import vip.xiaonuo.biz.modular.qyrecardbody.param.QyRecardBodyIdParam;
 import vip.xiaonuo.biz.modular.qyrecardbody.service.QyRecardBodyService;
 import vip.xiaonuo.biz.modular.qyrecordinfo.entity.QyRecordInfo;
 import vip.xiaonuo.biz.modular.qyrecordinfo.service.QyRecordInfoService;
+import vip.xiaonuo.biz.modular.qyrecordproduct.entity.QyRecordProduct;
+import vip.xiaonuo.biz.modular.qyrecordproduct.service.QyRecordProductService;
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.entity.QySecondlineHfdProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.service.QySecondlineHfdProductService;
 import vip.xiaonuo.biz.modular.qysecondlinehzdattachment.entity.QySecondlineHzdAttachment;
@@ -71,6 +73,8 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
     private QyRecordInfoService qyRecordInfoService;
     @Autowired
     private QyRecardBodyService qyRecardBodyService;
+    @Autowired
+    private QyRecordProductService qyRecordProductService;
     @Override
     public Page<QySecondlineHzdTz> page(QySecondlineHzdTzPageParam qySecondlineHzdTzPageParam) {
         QueryWrapper<QySecondlineHzdTz> queryWrapper = new QueryWrapper<QySecondlineHzdTz>().checkSqlInjection();
@@ -279,10 +283,10 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
     }
 
     @Override
-    public List<QyRecardBody> qyProductById(QyRecardBodyIdParam qyRecardBodyIdParam){
-        QueryWrapper<QyRecardBody> queryWrapper = new QueryWrapper<QyRecardBody>().checkSqlInjection();
-        queryWrapper.lambda().eq(QyRecardBody::getQyRecordInfoId,qyRecardBodyIdParam.getId());
-        List<QyRecardBody> list = qyRecardBodyService.list(queryWrapper);
+    public List<QyRecordProduct> qyProductById(QyRecardBodyIdParam qyRecardBodyIdParam){
+        QueryWrapper<QyRecordProduct> queryWrapper = new QueryWrapper<QyRecordProduct>().checkSqlInjection();
+        queryWrapper.lambda().eq(QyRecordProduct::getQyRecordInfoId,qyRecardBodyIdParam.getId());
+        List<QyRecordProduct> list = qyRecordProductService.list(queryWrapper);
         return list;
     }