非标产值：时间筛选

cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardValueController.java

@@ -42,9 +42,17 @@ public class NonStandardValueController {
 
 	@ApiOperation(value = "非标产值分页")
 	@GetMapping("/getPage")
-	public BaseResponse getPage(PageQuery pageQuery, Integer userId, String name) {
+	public BaseResponse getPage(PageQuery pageQuery, Integer userId, String name,String start, String end) {
 		try {
-			return inonStandardValueService.getPage(pageQuery, userId, name);
+			Date startParse = null;
+			if (StrUtil.isNotBlank(start)) {
+				startParse = DateUtil.parse(start);
+			}
+			Date endParse = null;
+			if (StrUtil.isNotBlank(end)) {
+				endParse = DateUtil.parse(end);
+			}
+			return inonStandardValueService.getPage(pageQuery, userId, name,startParse,endParse);
 		} catch (Exception e) {
 			log.debug("非标产值分页列表{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardValue.java

@@ -35,9 +35,12 @@ public class NonStandardValue implements Serializable {
 	@ApiModelProperty("起止日期")
 	private String statistical;
 
-	@ApiModelProperty("审批工时")
+	@ApiModelProperty("上报工时")
 	private Double approvalHours;
 
+	@ApiModelProperty("上报工日")
+	private Double reportedHours;
+
 	@ApiModelProperty("状态 0：未提交 1：待审批 2：已通过 3：未通过")
 	private Integer status;
 
@@ -56,6 +59,9 @@ public class NonStandardValue implements Serializable {
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;
 
+	@ApiModelProperty("结束时间")
+	private LocalDate endTime;
+
 	@ApiModelProperty("用户id")
 	private Integer userId;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NonStandardValueVo.java

@@ -25,6 +25,9 @@ public class NonStandardValueVo {
 	@ApiModelProperty("起止时间")
 	private String statistical;
 
+	@ApiModelProperty("上报工日")
+	private Double reportedHours;
+
 	@ApiModelProperty("审批工时")
 	private Double approvalHours;
 
@@ -46,6 +49,9 @@ public class NonStandardValueVo {
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;
 
+	@ApiModelProperty("结束时间")
+	private LocalDate endTime;
+
 	@ApiModelProperty("用户id")
 	private Integer userId;
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardValueService.java

@@ -27,7 +27,7 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
 	 * @param pageQuery 非标产值信息分页
 	 * @return IPage<NoneStandardValue>
 	 */
-	BaseResponse<IPage<NonStandardValueVo>> getPage(PageQuery pageQuery, Integer userId, String name);
+	BaseResponse<IPage<NonStandardValueVo>> getPage(PageQuery pageQuery, Integer userId, String name,Date start, Date end);
 
 
 /*	//计算每个用户提交的非标产值

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java

@@ -34,8 +34,10 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 	private NonStandardValueMapper nonStandardValueMapper;
 
 	@Override
-	public BaseResponse<IPage<NonStandardValueVo>> getPage(PageQuery pageQuery, Integer userId, String name) {
+	public BaseResponse<IPage<NonStandardValueVo>> getPage(PageQuery pageQuery, Integer userId, String name,Date start, Date end) {
 		Map<String, Object> params = new HashMap<>();
+		params.put("start", start);
+		params.put("end", end);
 		params.put("userId", userId);
 		params.put("name", name);
 		params.put("status",2);