Merge remote-tracking branch 'origin/master'

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

@@ -53,7 +53,7 @@ public class NonStandardValueController {
 
 	@GetMapping("/user_id")
 	@ApiOperation("非标产值统计")
-	public BaseResponse nonValue(PageQuery pageQuery, String start, String end, Integer groups) {
+	public BaseResponse nonValue(PageQuery pageQuery, String start, String end, Integer groups,String name) {
 		Date startParse = null;
 		if (StrUtil.isNotBlank(start)) {
 			startParse = DateUtil.parse(start);
@@ -63,7 +63,7 @@ public class NonStandardValueController {
 			endParse = DateUtil.parse(end);
 		}
 		//将list拆分成分页
-		BaseResponse<List<NonStandardValue>> baseResponse = inonStandardValueService.nonValue(startParse, endParse, groups);
+		BaseResponse<List<NonStandardValue>> baseResponse = inonStandardValueService.nonValue(startParse, endParse, groups,name);
 		List<NonStandardValue> data = baseResponse.getData();
 		if (data.size() != 0) {
 			Page<NonStandardValue> rts = PageUtil.listConvertToPage(data, pageQuery);
@@ -74,7 +74,7 @@ public class NonStandardValueController {
 
 	@ApiOperation(value = "获取所有已通过的非标产值")
 	@GetMapping("/getList")
-	public BaseResponse getList(String start, String end, Integer groups) {
+	public BaseResponse getList(String start, String end, Integer groups,String name) {
 		Date startParse = null;
 		if (StrUtil.isNotBlank(start)) {
 			startParse = DateUtil.parse(start);
@@ -84,7 +84,7 @@ public class NonStandardValueController {
 			endParse = DateUtil.parse(end);
 		}
 		try {
-			return inonStandardValueService.getList(startParse, endParse, groups);
+			return inonStandardValueService.getList(startParse, endParse, groups,name);
 		} catch (Exception e) {
 			log.debug("获取所有已通过的非标产值{}", e);
 		}

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

@@ -34,7 +34,7 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
 	BaseResponse<List<NonStandardValue>> nonValue(Integer userId);*/
 
 	//计算每个用户提交的非标产值
-	BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups);
+	BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups,String name);
 
 //	/**
 //	 * 通过用户id查询非标产值信息
@@ -48,7 +48,7 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
 	 *
 	 * @return List
 	 */
-	BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups);
+	BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups,String name);
 
 	/**
 	 * 非标产值列表导出

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

@@ -38,6 +38,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 		Map<String, Object> params = new HashMap<>();
 		params.put("userId", userId);
 		params.put("name", name);
+		params.put("status",2);
 		Page<NonStandardValueVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		IPage<NonStandardValueVo> pages = nonStandardValueMapper.getPage(page, params);
 		return BaseResponse.okData(pages);
@@ -58,8 +59,8 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 
 	@Override
 	//计算每个用户提交的非标产值
-	public BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups) {
-		List<NonStandardValueVo> data = getList(start, end, groups).getData();
+	public BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups,String name) {
+		List<NonStandardValueVo> data = getList(start, end, groups,name).getData();
 		//userId去重
 		Set<Integer> ids = new HashSet<>();
 		//循环所有NonStandardValue的集合data,找到每个NonStandardValue.getuserId放到set
@@ -128,12 +129,13 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 //	}
 
 	@Override
-	public BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups) {
+	public BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups,String name) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("start", start);
 		params.put("end", end);
 		params.put("status", 2);
 		params.put("groups", groups);
+		params.put("name",name);
 		List<NonStandardValueVo> list = nonStandardValueMapper.getList(params);
 		return BaseResponse.okData(list);
 	}

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

@@ -407,7 +407,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
         }
 
         //非标准产值
-        List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId).getData();
+        List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId,name).getData();
         //标准产值
         List<NormProductionStatistics> productionStatistics = this.normProductionStatistics(start, end, name, groupId).getData();
 

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

@@ -349,7 +349,7 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
         }
 
         //非标准产值
-        List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId).getData();
+        List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId,name).getData();
         //标准产值
         List<NormProductionStatistics> productionStatistics = this.normProductionStatistics(start, end, name, groupId).getData();
         //以userId找关系