审理单增加查询条件

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java

@@ -56,5 +56,5 @@ public interface IErpMesRbPkpqryClient {
 	List<PpmReportDetailDTO> listErpNew(@RequestBody ErpQueryRequest erpQueryRequest);
 
 	@PostMapping(LIST_ERP_ALL)
-	List<ReviewFormFileExcel> listErpAll();
+	List<ReviewFormFileExcel> listErpAll(@RequestParam(value = "rsCode", required = false) String rsCode);
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java

@@ -30,7 +30,7 @@ public class IErpMesRbPkpqryClientFallback implements IErpMesRbPkpqryClient {
 	}
 
 	@Override
-	public List<ReviewFormFileExcel> listErpAll() {
+	public List<ReviewFormFileExcel> listErpAll(String rsCode) {
 		return List.of();
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java

@@ -572,10 +572,12 @@ public class ReviewSheetController extends BladeController {
     @GetMapping("/reviewFormExportExcel")
     @ApiOperationSupport(order = 70)
     @Operation(summary = "导出Excel", description = "传入ReviewSheet")
-    public void reviewFormExportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> reviewSheet,
+    public void reviewFormExportExcel(@Parameter(hidden = true) @RequestParam ReviewSheetErpSearch search,
                             BladeUser bladeUser, HttpServletResponse response) {
 
-        List<ReviewFormFileExcel> list = service.reviewFormExportExcel();
+        String rsCode = search.getRsCode();
+
+        List<ReviewFormFileExcel> list = service.reviewFormExportExcel(rsCode);
 
         ExcelUtil.export(response, "[审理单]数据" + DateUtil.time(),
                 "[审理单]数据表", list, ReviewFormFileExcel.class);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java

@@ -151,5 +151,5 @@ public interface IReviewSheetService extends EnBaseService<ReviewSheet> {
 
     IPage<PpmReportDetailDTO> listErp(IPage<PpmReportDetailDTO> page, ReviewSheetErpSearch search);
 
-    List<ReviewFormFileExcel> reviewFormExportExcel();
+    List<ReviewFormFileExcel> reviewFormExportExcel(String rsCode);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

@@ -957,9 +957,9 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     }
 
     @Override
-    public List<ReviewFormFileExcel> reviewFormExportExcel() {
+    public List<ReviewFormFileExcel> reviewFormExportExcel(String rsCode) {
 
-        List<ReviewFormFileExcel> listVO = erpMesRbPkpqryClient.listErpAll();
+        List<ReviewFormFileExcel> listVO = erpMesRbPkpqryClient.listErpAll(rsCode);
 
         return listVO;
     }

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java

@@ -58,8 +58,8 @@ public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient {
 	}
 
 	@Override
-	public List<ReviewFormFileExcel> listErpAll() {
-		List<ReviewFormFileExcel> result = erpMesRbPkpqryMapper.listErpAll();
+	public List<ReviewFormFileExcel> listErpAll(String rsCode) {
+		List<ReviewFormFileExcel> result = erpMesRbPkpqryMapper.listErpAll(rsCode);
 		return result;
 	}
 

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java

@@ -32,5 +32,5 @@ public interface ErpMesRbPkpqryMapper extends Mapper {
 	List<PpmReportDetailDTO> listErpNew(IPage<PpmReportDetailDTO> page,
 										@Param("q") ReviewSheetErpSearch search);
 
-    List<ReviewFormFileExcel> listErpAll();
+    List<ReviewFormFileExcel> listErpAll(@Param("rsCode") String rsCode);
 }

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml

@@ -57,6 +57,10 @@
 		select
 		code, id, precode, prtno, name, qstandno, lotno, cntt, cntn, deptcode, useproc, checker, checkername, chker, chkername, checkdate, finishdate, dispose, disposename, p5layer1, p5layer2, p5layer3, p5layer4, p1llayer3, p1llayer4, p1llayer12, p1remark, p1projectid, p2layer7, opinion, type, pern, status, rprtn, rsplcode, p6layer2, p6layer3, p6layer4, p6layer5, p2layer1, p2layer11, p2layer3, p2layer4, p2layer5, p2layer9, p2layer6, p2layer8, fine, reward, noticeno, percent1, percent2, backcause, editdate, splywxcode, useseq, typicalflag, lotflag, psign, judgeflag, judgestart, judgeend, period, userlevel, remark, lowerrflag, usedept, jdname, redodeptcode
 		from dba_mgr.v_mes_rb_qisbillqry a
+		where 1=1
+		<if test="rsCode != null and rsCode != ''">
+			and code = #{rsCode}
+		</if>
 	</select>