Merge branch 'master' of http://8.130.72.63:18081/single-window/yqyc-system

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehfd/controller/QySecondlineHfdController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.param.*;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.vo.QySecondlineHfdBgInfoVo;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.vo.QySecondlineHfdDetailVo;
+import vip.xiaonuo.biz.modular.qysecondlinehzdtz.entity.QySecondlineHzdTz;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.entity.QySecondlineHfd;
@@ -190,4 +191,11 @@ public class QySecondlineHfdController {
     public CommonResult<List<String>> getBgCodeList() {
         return CommonResult.data(qySecondlineHfdService.getBgCodeList());
     }
+
+    @Operation(summary = "获取已经审核通过的核注单")
+//    @SaCheckPermission("/biz/qysecondlinehfd/getHfdBgInfoByBgCode")
+    @GetMapping("/biz/qysecondlinehfd/getHzListByCondition")
+    public CommonResult<List<QySecondlineHzdTz>> getHzListByCondition() {
+        return CommonResult.data(qySecondlineHfdService.getHzListByCondition());
+    }
 }

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

@@ -18,6 +18,7 @@ import vip.xiaonuo.biz.modular.qysecondlinehfd.entity.QySecondlineHfd;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.param.*;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.vo.QySecondlineHfdBgInfoVo;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.vo.QySecondlineHfdDetailVo;
+import vip.xiaonuo.biz.modular.qysecondlinehzdtz.entity.QySecondlineHzdTz;
 
 import java.util.List;
 
@@ -80,4 +81,6 @@ public interface QySecondlineHfdService extends IService<QySecondlineHfd> {
     QySecondlineHfdBgInfoVo getHfdBgInfoByBgCode(String hfdBgCode);
 
     List<String> getBgCodeList();
+
+    List<QySecondlineHzdTz> getHzListByCondition();
 }

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

@@ -46,7 +46,9 @@ import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.entity.QySecondlineHfdProd
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.param.QySecondlineHfdProductAddParam;
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.service.QySecondlineHfdProductService;
 import vip.xiaonuo.biz.modular.qysecondlinehzdlist.entity.QySecondlineHzdList;
+import vip.xiaonuo.biz.modular.qysecondlinehzdtz.entity.QySecondlineHzdTz;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.param.QySecondlineHzdTzBaseParam;
+import vip.xiaonuo.biz.modular.qysecondlinehzdtz.service.QySecondlineHzdTzService;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -78,6 +80,9 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
     QySecondlineHfdCycService qySecondlineHfdCycService;
     @Autowired
     QySecondlineHfdJzxService qySecondlineHfdJzxService;
+    @Autowired
+    QySecondlineHzdTzService qySecondlineHzdTzService;
+
     @Override
     public Page<QySecondlineHfd> page(QySecondlineHfdPageParam qySecondlineHfdPageParam) {
         QueryWrapper<QySecondlineHfd> queryWrapper = new QueryWrapper<QySecondlineHfd>().checkSqlInjection();
@@ -342,4 +347,15 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
         List<String> list = cycList.stream().map(QySecondlineHfdCyc::getHfdBgCode).toList();
         return list;
     }
+
+    /**
+     * 获取审核通过的核注单
+     * @return
+     */
+    @Override
+    public List<QySecondlineHzdTz> getHzListByCondition(){
+        QueryWrapper<QySecondlineHzdTz> queryWrapper = new QueryWrapper<QySecondlineHzdTz>().checkSqlInjection();
+        queryWrapper.lambda().eq(QySecondlineHzdTz::getStatus,"3");
+        return qySecondlineHzdTzService.list(queryWrapper);
+    }
 }