修改存档功能

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/BaosongTaskAllocController.java

@@ -283,11 +283,13 @@ public class BaosongTaskAllocController extends JeecgController<BaosongTaskAlloc
 			for (BaosongTaskAlloc alloc : allocTplList) {
 				tplIdSet.add(alloc.getItemid());
 			}
-			List<BaosongTplItem>  itemList =  baosongTplItemService.lambdaQuery()
-					.in(BaosongTplItem::getId,tplIdSet)
-					.list();
-			for (BaosongTplItem item : itemList) {
-				retCodeSet.add(item.getPcode()+"_"+item.getCode());
+			if(tplIdSet.size()>0) {
+				List<BaosongTplItem> itemList = baosongTplItemService.lambdaQuery()
+						.in(BaosongTplItem::getId, tplIdSet)
+						.list();
+				for (BaosongTplItem item : itemList) {
+					retCodeSet.add(item.getPcode() + "_" + item.getCode());
+				}
 			}
 			return Result.OK(retCodeSet);
 		} catch (Exception e) {

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/BaosongTaskController.java

@@ -65,13 +65,28 @@ public class BaosongTaskController extends JeecgController<BaosongTask, IBaosong
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<BaosongTask> queryWrapper = QueryGenerator.initQueryWrapper(baosongTask, req.getParameterMap());
+		queryWrapper.ne("sta",9);
 		Page<BaosongTask> page = new Page<BaosongTask>(pageNo, pageSize);
-
 		IPage<BaosongTask> pageList = baosongTaskService.page(page, queryWrapper);
 		setStaValue (baosongTask,pageList.getRecords());
 		return Result.OK(pageList);
 	}
 
+
+	@GetMapping(value = "/archiveList")
+	public Result<IPage<BaosongTask>> archiveList(BaosongTask baosongTask,
+				@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+				@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+				HttpServletRequest req) {
+
+		QueryWrapper<BaosongTask> queryWrapper = QueryGenerator.initQueryWrapper(baosongTask, req.getParameterMap());
+		queryWrapper.eq("sta",9);
+		Page<BaosongTask> page = new Page<BaosongTask>(pageNo, pageSize);
+		IPage<BaosongTask> pageList = baosongTaskService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+
 	@GetMapping(value = "/listForFillData")
 	public Result<IPage<BaosongTask>> listForFillData(BaosongTask baosongTask,
 					@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/BaosongTaskReviewController.java

@@ -92,6 +92,7 @@ public class BaosongTaskReviewController extends JeecgController<BaosongTaskRevi
 		return Result.OK(pageList);
 	}
 
+
 	/**
 	 *   添加
 	 *
@@ -203,6 +204,9 @@ public class BaosongTaskReviewController extends JeecgController<BaosongTaskRevi
 		Integer tplId = taskReview.getTplid();
 		Integer taskId = taskReview.getTaskid();
 		List<TaskRecordVo> list = baosongTaskReviewService.queryTaskRecordForXml(taskReview);
+		if(list==null||list.size()==0){
+			return Result.error("未查询到数据");
+		};
 		BaosongTpl baosongTpl = baosongTplService.getById(tplId);
 		BaosongTask baosongTask = baosongTaskService.getById(taskId);
 		try {
@@ -217,7 +221,7 @@ public class BaosongTaskReviewController extends JeecgController<BaosongTaskRevi
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return null;
+		return Result.error("未知错误");
 	}
 
 	private static void saveDocumentToFile(Document document, String filePath) {
@@ -252,7 +256,11 @@ public class BaosongTaskReviewController extends JeecgController<BaosongTaskRevi
 	}
 
 	private  String getReportFilePath(BaosongTaskReview taskReview) {
-		String strPath = "/baosong/report/"+taskReview.getTaskname()+"-"+taskReview.getTplname()+".xml";
+		String taskName = taskReview.getTaskname();
+		taskName  = taskName==null?taskReview.getTaskid().toString():taskName;
+		String tplName = taskReview.getTplname();
+		tplName = tplName==null?taskReview.getTplid().toString():tplName;
+		String strPath = "/baosong/report/"+taskName+"-"+tplName+".xml";
 		return strPath;
 	}