diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java
index 288d7dc7..6e5f4d75 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java
@@ -1,36 +1,27 @@
package com.xm.core.ctrl;
-import java.util.*;
-import java.util.stream.Collectors;
+import com.mdp.core.entity.Tips;
+import com.mdp.core.utils.RequestUtils;
+import com.mdp.mybatis.PageUtils;
+import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBudgetLabor;
+import com.xm.core.entity.XmProjectMBudgetCostUser;
+import com.xm.core.service.XmBudgetLaborService;
+import io.swagger.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-
-import static com.mdp.core.utils.ResponseHelper.*;
-import static com.mdp.core.utils.BaseUtils.*;
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
-import com.mdp.mybatis.PageUtils;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.core.utils.NumberUtil;
-import com.mdp.safe.client.entity.User;
-import com.mdp.safe.client.utils.LoginUtils;
-import com.mdp.swagger.ApiEntityParams;
import springfox.documentation.annotations.ApiIgnore;
-import com.xm.core.service.XmBudgetLaborService;
-import com.xm.core.entity.XmBudgetLabor;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.mdp.core.utils.BaseUtils.toMap;
/**
* url编制采用rest风格,如对xm_budget_labor 项目人力成本预算的操作有增删改查,对应的url分别为:
@@ -76,8 +67,22 @@ public class XmBudgetLaborController {
m.put("tips", tips);
return m;
}
-
-
+
+ @ApiResponses({
+ @ApiResponse(code = 200,response= XmBudgetLabor.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+ })
+ @RequestMapping(value="/listSum",method=RequestMethod.GET)
+ public Map listSum( @ApiIgnore @RequestParam Map xmBudgetLabor){
+ Map m = new HashMap<>();
+ RequestUtils.transformArray(xmBudgetLabor, "ids");
+ PageUtils.startPage(xmBudgetLabor);
+ List> data = xmBudgetLaborService.listSum(xmBudgetLabor); //列出XmProjectMBudgetCostUser列表
+ PageUtils.responePage(m, data);
+ m.put("data",data);
+ Tips tips=new Tips("查询成功");
+ m.put("tips", tips);
+ return m;
+ }
/**
@ApiOperation( value = "新增一条项目人力成本预算信息",notes=" ")
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java
index 7771a8ee..603dbebc 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java
@@ -5,6 +5,7 @@ import com.mdp.core.utils.RequestUtils;
import com.mdp.mybatis.PageUtils;
import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmBudgetNlabor;
+import com.xm.core.entity.XmProjectMBudgetCostNouser;
import com.xm.core.service.XmBudgetNlaborService;
import io.swagger.annotations.*;
import org.slf4j.Logger;
@@ -66,8 +67,22 @@ public class XmBudgetNlaborController {
m.put("tips", tips);
return m;
}
-
-
+
+ @ApiResponses({
+ @ApiResponse(code = 200,response= XmBudgetNlabor.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+ })
+ @RequestMapping(value="/listSum",method=RequestMethod.GET)
+ public Map listSum( @ApiIgnore @RequestParam Map xmBudgetNlabor){
+ Map m = new HashMap<>();
+ RequestUtils.transformArray(xmBudgetNlabor, "ids");
+ PageUtils.startPage(xmBudgetNlabor);
+ List> data = xmBudgetNlaborService.listSum(xmBudgetNlabor); //列出xmProjectMBudgetCostNouser列表
+ PageUtils.responePage(m, data);
+ m.put("data",data);
+ Tips tips=new Tips("查询成功");
+ m.put("tips", tips);
+ return m;
+ }
/**
@ApiOperation( value = "新增一条项目人力成本预算信息",notes=" ")
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java
index 2709c116..fca232af 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java
@@ -5,6 +5,7 @@ import com.mdp.core.utils.RequestUtils;
import com.mdp.mybatis.PageUtils;
import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmCostNlabor;
+import com.xm.core.entity.XmProjectMCostNouser;
import com.xm.core.service.XmCostNlaborService;
import io.swagger.annotations.*;
import org.slf4j.Logger;
@@ -66,8 +67,23 @@ public class XmCostNlaborController {
m.put("tips", tips);
return m;
}
-
-
+
+
+ @ApiResponses({
+ @ApiResponse(code = 200,response= XmCostNlabor.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+ })
+ @RequestMapping(value="/listSum",method=RequestMethod.GET)
+ public Map listSum( @ApiIgnore @RequestParam Map xmCostNlabor){
+ Map m = new HashMap<>();
+ RequestUtils.transformArray(xmCostNlabor, "ids");
+ PageUtils.startPage(xmCostNlabor);
+ List> data = xmCostNlaborService.listSum(xmCostNlabor); //列出xmProjectMCostNouser列表
+ PageUtils.responePage(m, data);
+ m.put("data",data);
+ Tips tips=new Tips("查询成功");
+ m.put("tips", tips);
+ return m;
+ }
/**
@ApiOperation( value = "新增一条项目实际人工成本费用信息",notes=" ")