首页 扫码 工时

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

@@ -745,7 +745,27 @@ public class FbsWorkingStatisticsController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<FbsWorkingStatistics>> result = new Result<IPage<FbsWorkingStatistics>>();
+		//人员编码
+		String personnelCode=fbsWorkingStatistics.getPersonnelCode();
+		if(StringUtils.isNotBlank(personnelCode)&&personnelCode.equals("null")){
+			fbsWorkingStatistics.setPersonnelCode(null);
+		}
+		//开始时间结束时间
+		String start=fbsWorkingStatistics.getStart();
+		String end=fbsWorkingStatistics.getEnd();
+		if(StringUtils.isNotBlank(start)){
+			fbsWorkingStatistics.setStart(null);
+		}
+		if(StringUtils.isNotBlank(end)){
+			fbsWorkingStatistics.setEnd(null);
+		}
 		QueryWrapper<FbsWorkingStatistics> queryWrapper = QueryGenerator.initQueryWrapper(fbsWorkingStatistics, req.getParameterMap());
+		queryWrapper.lambda().eq(FbsWorkingStatistics::getDelFlag,"0");
+		if(StringUtils.isNotBlank(start)&&StringUtils.isNotBlank(end)&&!start.equals("null")&&!end.equals("null")){
+			queryWrapper.ge("DATE_FORMAT(first_time,'%Y-%m-%d')",start);
+			queryWrapper.le("DATE_FORMAT(first_time,'%Y-%m-%d')",end);
+		}
+		queryWrapper.lambda().orderByDesc(FbsWorkingStatistics::getFirstTime);
 		Page<FbsWorkingStatistics> page = new Page<FbsWorkingStatistics>(pageNo, pageSize);
 		IPage<FbsWorkingStatistics> pageList = fbsWorkingStatisticsService.page(page, queryWrapper);
 		result.setSuccess(true);

src/main/java/org/jeecg/modules/appInterface/entity/FbsWorkingStatistics.java

@@ -131,5 +131,10 @@ public class FbsWorkingStatistics implements Serializable {
 	 */
 	private String batchCode;
 
-
+	//开始时间
+	@TableField(exist = false)
+	private String start;
+	//结束时间
+	@TableField(exist = false)
+	private String end;
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -169,6 +169,9 @@ public class FbsWorkshopDispatchList implements Serializable {
     //累计完成数量
     @TableField(exist = false)
     private Integer quantityCompletedTotal;
+	//剩余总工时
+	@TableField(exist = false)
+	private String remainingWorkTotal;
 
 	//合格数
 	@TableField(exist = false)

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -393,6 +393,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         fbsWorkshopDispatchList.setQuantityCompletedTotal(quantityCompletedTotal);
         fbsWorkshopDispatchList.setManHoursCompletedTotal(formatDouble5(manHoursCompletedTotal.doubleValue())+"");
         fbsWorkshopDispatchList.setFbsWorkshopDispatchListList(fbsWorkshopDispatchListListTotal);
+        fbsWorkshopDispatchList.setRemainingWorkTotal(formatDouble5(standardWorkingHoursTotal.subtract(manHoursCompletedTotal).doubleValue()));
         fbsWorkshopDispatchListList.add(fbsWorkshopDispatchList);
     }