非标产值申请

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

@@ -59,11 +59,11 @@ public class NonStandardApplyController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "获取所有非标产值申请")
+	@ApiOperation(value = "获取当前用户所有的非标产值申请")
 	@GetMapping("/getList")
-	public BaseResponse getList() {
+	public BaseResponse getList(Integer userId) {
 		try {
-			return iNonStandardApplyService.getList();
+			return iNonStandardApplyService.getList(userId);
 		} catch (Exception e) {
 			log.debug("获取所有的非标产值申请{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/NonStandardApplyMapper.java

@@ -24,7 +24,7 @@ public interface NonStandardApplyMapper extends BaseMapper<NonStandardApply> {
 
 	List<NonStandardApplyVo> getById(@Param("params") Map<String, Object> params);
 
-	List<NonStandardApplyVo> getList(QueryWrapper<NonStandardApply> qw);
+	List<NonStandardApplyVo> getList(@Param("params") Map<String, Object> params);
 
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApplyMapper.xml

@@ -28,6 +28,7 @@
         select na.*,su.name as name,su.username as account
         from nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
+        <include refid="where"/>
         order by na.id asc
     </select>
 

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

@@ -34,7 +34,7 @@ public interface INonStandardApplyService extends IService<NonStandardApply> {
 	 *
 	 * @return List
 	 */
-	BaseResponse<List<NonStandardApplyVo>> getList();
+	BaseResponse<List<NonStandardApplyVo>> getList(Integer userId);
 
 	/**
 	 * 通过id查询非标产值申请信息

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

@@ -52,10 +52,10 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 	}
 
 	@Override
-	public BaseResponse<List<NonStandardApplyVo>> getList() {
-		QueryWrapper<NonStandardApply> qw = new QueryWrapper<>();
-		qw.ge("status",0);
-		List<NonStandardApplyVo> list = nonStandardApplyMapper.getList(qw);
+	public BaseResponse<List<NonStandardApplyVo>> getList(Integer userId) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("userId",userId);
+		List<NonStandardApplyVo> list = nonStandardApplyMapper.getList(params);
 		return BaseResponse.okData(list);
 	}