Merge remote-tracking branch 'origin/master'

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehfd/service/impl/QySecondlineHfdServiceImpl.java

@@ -67,7 +67,7 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
     public Page<QySecondlineHfd> page(QySecondlineHfdPageParam qySecondlineHfdPageParam) {
         QueryWrapper<QySecondlineHfd> queryWrapper = new QueryWrapper<QySecondlineHfd>().checkSqlInjection();
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getSblx())) {
-            queryWrapper.lambda().eq(QySecondlineHfd::getHfdrCode, qySecondlineHfdPageParam.getSblx());
+            queryWrapper.lambda().eq(QySecondlineHfd::getSblx, qySecondlineHfdPageParam.getSblx());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getHfdCode())) {
             queryWrapper.lambda().like(QySecondlineHfd::getHfdCode, qySecondlineHfdPageParam.getHfdCode());

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

@@ -22,6 +22,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 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.qysecondlinehzdlist.entity.QySecondlineHzdList;
 import vip.xiaonuo.biz.modular.qysecondlinehzdproduct.entity.QySecondlineHzdProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.param.*;
@@ -200,4 +203,18 @@ public class QySecondlineHzdTzController {
     public CommonResult<List<QySecondlineHzdProduct>> getProductByHgHzdCode(@Valid QySecondlineHzdTzIdParam qySecondlineHzdTzIdParam) {
         return CommonResult.data(qySecondlineHzdTzService.getProductByHgHzdCode(qySecondlineHzdTzIdParam));
     }
+
+    @Operation(summary = "获取企业台账")
+//    @SaCheckPermission("/biz/qysecondlinehzdtz/detail")
+    @GetMapping("/biz/qysecondlinehzdtz/qyRecordInfo")
+    public CommonResult<List<QyRecordInfo>> getProductByHgHzdCode() {
+        return CommonResult.data(qySecondlineHzdTzService.qyRecordInfo());
+    }
+
+    @Operation(summary = "根据企业id获取商品信息")
+//    @SaCheckPermission("/biz/qysecondlinehzdtz/detail")
+    @GetMapping("/biz/qysecondlinehzdtz/qyProductById")
+    public CommonResult<List<QyRecardBody>> qyProductById(@Valid QyRecardBodyIdParam qyRecardBodyIdParam) {
+        return CommonResult.data(qySecondlineHzdTzService.qyProductById(qyRecardBodyIdParam));
+    }
 }

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

@@ -14,6 +14,9 @@ package vip.xiaonuo.biz.modular.qysecondlinehzdtz.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.qysecondlinehzdlist.entity.QySecondlineHzdList;
 import vip.xiaonuo.biz.modular.qysecondlinehzdproduct.entity.QySecondlineHzdProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.entity.QySecondlineHzdTz;
@@ -85,4 +88,8 @@ public interface QySecondlineHzdTzService extends IService<QySecondlineHzdTz> {
     List<String> hzdCodeByTzCode(QySecondlineHzdTzIdParam qySecondlineHzdIdPageParam);
 
     List<QySecondlineHzdProduct> getProductByHgHzdCode(QySecondlineHzdTzIdParam qySecondlineHzdIdParam);
+
+    List<QyRecordInfo> qyRecordInfo();
+
+    List<QyRecardBody> qyProductById(QyRecardBodyIdParam qyRecardBodyIdParam);
 }

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

@@ -19,12 +19,18 @@ import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
+import com.alibaba.fastjson.support.geo.LineString;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.modular.qyrecardbody.entity.QyRecardBody;
+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.qysecondlinehfdproduct.entity.QySecondlineHfdProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.service.QySecondlineHfdProductService;
 import vip.xiaonuo.biz.modular.qysecondlinehzdattachment.entity.QySecondlineHzdAttachment;
@@ -60,6 +66,10 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
     QySecondlineHzdAttachmentService qySecondlineHzdAttachmentService;
     @Autowired
     private QySecondlineHzdListService qySecondlineHzdListService;
+    @Autowired
+    private QyRecordInfoService qyRecordInfoService;
+    @Autowired
+    private QyRecardBodyService qyRecardBodyService;
     @Override
     public Page<QySecondlineHzdTz> page(QySecondlineHzdTzPageParam qySecondlineHzdTzPageParam) {
         QueryWrapper<QySecondlineHzdTz> queryWrapper = new QueryWrapper<QySecondlineHzdTz>().checkSqlInjection();
@@ -81,6 +91,11 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getStatus())) {
             queryWrapper.lambda().eq(QySecondlineHzdTz::getStatus, qySecondlineHzdTzPageParam.getStatus());
         }
+
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getSblx())) {
+            queryWrapper.lambda().eq(QySecondlineHzdTz::getSblx, qySecondlineHzdTzPageParam.getSblx());
+        }
+
         if(ObjectUtil.isAllNotEmpty(qySecondlineHzdTzPageParam.getSortField(), qySecondlineHzdTzPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(qySecondlineHzdTzPageParam.getSortOrder());
             queryWrapper.orderBy(true, qySecondlineHzdTzPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
@@ -240,4 +255,24 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         List<QySecondlineHzdProduct> list = qySecondlineHzdProductService.list(productWrapper);
         return list;
     }
+
+
+    /**
+     * 企业备案信息表（审核通过的)
+     * @return
+     */
+    @Override
+    public List<QyRecordInfo> qyRecordInfo(){
+        List<QyRecordInfo> list = qyRecordInfoService.list();
+        return list;
+    }
+
+    @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);
+        return list;
+    }
+
 }