11111

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -130,7 +130,7 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("人员名称不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 if(StringUtils.isBlank(entity.getPkWorkshopDispatchList())){
+		 if(StringUtils.isBlank(entity.getOrderNumber())){
 			 res.setCode("1");
 			 res.setMsg("派工单id不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
@@ -459,21 +459,26 @@ public class FbsWorkingStatisticsController {
 	  */
 	 @RequestMapping(value = "getOrderBySheetId")
 	 @ResponseBody
-	 public ResponseEntity<ResHttpStatus> getOrderBySheetId(String sheetId) {
+	 public ResponseEntity<ResHttpStatus> getOrderBySheetId(String sheetId,String userId) {
 
 		 ResHttpStatus res = new ResHttpStatus();
 		 if (StringUtils.isBlank(sheetId)) {
 			 res.setCode("1");
-			 res.setMsg("工单id不能为空-userId");
+			 res.setMsg("订单号不能为空-sheetId");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if (StringUtils.isBlank(userId)) {
+			 res.setCode("1");
+			 res.setMsg("人员编码不能为空-userId");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-
 		 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
 		 queryWrapper.eq("order_number", sheetId).eq("del_flag", 0);
+		 queryWrapper.eq("personnel_Code", sheetId);
 		 List<FbsWorkingStatistics> list = fbsWorkingStatisticsService.list(queryWrapper);
 		 if(list.size() < 1){
 			 res.setCode("1");
-			 res.setMsg("工单id不正确"+sheetId);
+			 res.setMsg("订单号或人员编码不正确"+sheetId);
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
 		 FbsWorkingStatistics entity = list.get(0);