2.0

xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java

@@ -124,8 +124,8 @@ public class XmBranchStateController {
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmBranchState(@RequestBody XmBranchState xmBranchState) {
 		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+		
+				
 			if(StringUtils.isEmpty(xmBranchState.getId())) {
 				xmBranchState.setId(xmBranchStateService.createKey("id"));
 			}else{
@@ -158,8 +158,8 @@ public class XmBranchStateController {
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmBranchState(@RequestBody XmBranchState xmBranchState){
 		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+		
+				
 			xmBranchStateService.deleteByPk(xmBranchState);
 		}catch (BizException e) { 
 			tips=e.getTips();
@@ -181,8 +181,8 @@ public class XmBranchStateController {
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmBranchState(@RequestBody XmBranchState xmBranchState) {
 		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+		
+				
 			xmBranchStateService.updateByPk(xmBranchState);
 			m.put("data",xmBranchState);
 		}catch (BizException e) { 
@@ -207,8 +207,8 @@ public class XmBranchStateController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmBranchState(@RequestBody List<XmBranchState> xmBranchStates) {
 		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmBranchStates.size()+"条数据"); 
-		try{ 
+		
+				 
 			xmBranchStateService.batchDelete(xmBranchStates);
 		}catch (BizException e) { 
 			tips=e.getTips();

xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java

@@ -91,9 +91,7 @@ public class XmBranchStateHisController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmBranchStateHis(@RequestBody XmBranchStateHis xmBranchStateHis) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmBranchStateHis.getBizDate())) {
 			    createPk=true;
@@ -120,9 +118,7 @@ public class XmBranchStateHisController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmBranchStateHis(@RequestBody XmBranchStateHis xmBranchStateHis){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmBranchStateHis.getBizDate())) {
                  return failed("pk-not-exists","请上送主键参数bizDate");
             }
@@ -134,7 +130,7 @@ public class XmBranchStateHisController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmBranchStateHisService.deleteByPk(xmBranchStateHis);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -146,9 +142,7 @@ public class XmBranchStateHisController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmBranchStateHis(@RequestBody XmBranchStateHis xmBranchStateHis) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmBranchStateHis.getBizDate())) {
                  return failed("pk-not-exists","请上送主键参数bizDate");
             }
@@ -174,10 +168,10 @@ public class XmBranchStateHisController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmBranchStateHis(@RequestBody List<XmBranchStateHis> xmBranchStateHiss) {
 		
-		Tips tips=new Tips("成功删除"+xmBranchStateHiss.size()+"条数据"); 
+		
 		
 			xmBranchStateHisService.batchDelete(xmBranchStateHiss);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -7,6 +8,7 @@ import com.mdp.core.query.QueryTools;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.entity.XmBranchState;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmBranchTaskTypeState;
 import com.xm.core.service.XmBranchTaskTypeStateService;
 import io.swagger.annotations.*;
@@ -59,15 +61,12 @@ public class XmBranchTaskTypeStateController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmBranchTaskTypeState(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchTaskTypeState> qw = QueryTools.initQueryWrapper(XmBranchTaskTypeState.class , params);
 		List<Map<String,Object>> datas = xmBranchTaskTypeStateService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmBranchTaskTypeState列表
 		
-		
-		
-		
 	}
 	
  
@@ -77,16 +76,14 @@ public class XmBranchTaskTypeStateController {
 	}) 
 	@RequestMapping(value="/loadProjectTaskTypeStateToXmBranchTaskTypeState",method=RequestMethod.POST)
 	public Result loadProjectTaskTypeStateToXmBranchTaskTypeState(@RequestBody XmBranchState xmBranchState){
-		
-		Tips tips=new Tips("成功更新一个机构数据");
-		try{
+
 			if(StringUtils.isEmpty(xmBranchState.getBranchId())) {
 				tips.setFailureMsg("机构编号branchId必填");
 			}else {
 	
 				xmBranchTaskTypeStateService.loadProjectTaskTypeStateToXmBranchTaskTypeState(xmBranchState.getBranchId());
 			}
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	/**
@@ -96,9 +93,7 @@ public class XmBranchTaskTypeStateController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmBranchTaskTypeState(@RequestBody XmBranchTaskTypeState xmBranchTaskTypeState) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmBranchTaskTypeState.getId())) {
 				xmBranchTaskTypeState.setId(xmBranchTaskTypeStateService.createKey("id"));
 			}else{
@@ -121,11 +116,9 @@ public class XmBranchTaskTypeStateController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmBranchTaskTypeState(@RequestBody XmBranchTaskTypeState xmBranchTaskTypeState){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmBranchTaskTypeStateService.deleteByPk(xmBranchTaskTypeState);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -137,9 +130,7 @@ public class XmBranchTaskTypeStateController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmBranchTaskTypeState(@RequestBody XmBranchTaskTypeState xmBranchTaskTypeState) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmBranchTaskTypeStateService.updateByPk(xmBranchTaskTypeState);
 		
 	}
@@ -155,10 +146,10 @@ public class XmBranchTaskTypeStateController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmBranchTaskTypeState(@RequestBody List<XmBranchTaskTypeState> xmBranchTaskTypeStates) {
 		
-		Tips tips=new Tips("成功删除"+xmBranchTaskTypeStates.size()+"条数据"); 
+		
 		
 			xmBranchTaskTypeStateService.batchDelete(xmBranchTaskTypeStates);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -9,6 +10,7 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmBudgetLabor;
 import com.xm.core.service.XmBudgetLaborService;
 import io.swagger.annotations.*;
@@ -61,9 +63,9 @@ public class XmBudgetLaborController {
 	public Result listXmBudgetLabor(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBudgetLabor> qw = QueryTools.initQueryWrapper(XmBudgetLabor.class , params);
 		List<Map<String,Object>> datas = xmBudgetLaborService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmBudgetLabor列表
 
@@ -75,12 +77,10 @@ public class XmBudgetLaborController {
 	@RequestMapping(value="/listSum",method=RequestMethod.GET)
 	public Result listSum(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
-		List<Map<String,Object>>	data = xmBudgetLaborService.listSum(xmBudgetLabor);	//列出XmProjectMBudgetCostUser列表
-		
-		
+		List<Map<String,Object>>	data = xmBudgetLaborService.listSum(params);	//列出XmProjectMBudgetCostUser列表 
+		return Result.ok().setData(data);
 		
 		
 	}
@@ -91,9 +91,7 @@ public class XmBudgetLaborController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmBudgetLabor(@RequestBody XmBudgetLabor xmBudgetLabor) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmBudgetLabor.getId())) {
 			    createPk=true;
@@ -106,13 +104,7 @@ public class XmBudgetLaborController {
             }
 			xmBudgetLaborService.insert(xmBudgetLabor);
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 
@@ -122,9 +114,7 @@ public class XmBudgetLaborController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmBudgetLabor(@RequestBody XmBudgetLabor xmBudgetLabor){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmBudgetLabor.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -133,7 +123,7 @@ public class XmBudgetLaborController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmBudgetLaborService.deleteByPk(xmBudgetLabor);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -143,9 +133,7 @@ public class XmBudgetLaborController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmBudgetLabor(@RequestBody XmBudgetLabor xmBudgetLabor) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmBudgetLabor.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -164,9 +152,7 @@ public class XmBudgetLaborController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmBudgetLaborMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmBudgetLaborMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -218,13 +204,7 @@ public class XmBudgetLaborController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -235,9 +215,7 @@ public class XmBudgetLaborController {
 	})
 	@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
 	public Result batchAddXmBudgetLabor(@RequestBody List<XmBudgetLabor> xmBudgetLabors) {
-		
-		Tips tips=new Tips("成功删除");
-		try{
+
 			if(xmBudgetLabors.size()<=0){
 				return failed("data-0","请上送待新增数据列表");
 			}
@@ -266,13 +244,7 @@ public class XmBudgetLaborController {
 			}else {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -283,7 +255,7 @@ public class XmBudgetLaborController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmBudgetLabor(@RequestBody List<XmBudgetLabor> xmBudgetLabors) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmBudgetLabors.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -10,6 +11,7 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmBudgetNlabor;
 import com.xm.core.service.XmBudgetNlaborService;
 import io.swagger.annotations.*;
@@ -61,9 +63,9 @@ public class XmBudgetNlaborController {
 	public Result listXmBudgetNlabor(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBudgetNlabor> qw = QueryTools.initQueryWrapper(XmBudgetNlabor.class , params);
 		List<Map<String,Object>> datas = xmBudgetNlaborService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmBudgetNlabor列表
 
@@ -75,14 +77,10 @@ public class XmBudgetNlaborController {
 	@RequestMapping(value="/listSum",method=RequestMethod.GET)
 	public Result listSum(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
-		List<Map<String,Object>>	data = xmBudgetNlaborService.listSum(xmBudgetNlabor);	//列出xmProjectMBudgetCostNouser列表
-		
-		
-		
-		
+		List<Map<String,Object>>	data = xmBudgetNlaborService.listSum(params);	//列出xmProjectMBudgetCostNouser列表 
+		return Result.ok().setData(data);
 	}
 	
 
@@ -92,9 +90,7 @@ public class XmBudgetNlaborController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmBudgetNlabor(@RequestBody XmBudgetNlabor xmBudgetNlabor) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmBudgetNlabor.getId())) {
 			    createPk=true;
@@ -107,13 +103,7 @@ public class XmBudgetNlaborController {
             }
 			xmBudgetNlaborService.insert(xmBudgetNlabor);
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 
@@ -123,9 +113,7 @@ public class XmBudgetNlaborController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmBudgetNlabor(@RequestBody XmBudgetNlabor xmBudgetNlabor){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmBudgetNlabor.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -134,7 +122,7 @@ public class XmBudgetNlaborController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmBudgetNlaborService.deleteByPk(xmBudgetNlabor);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -144,9 +132,7 @@ public class XmBudgetNlaborController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmBudgetNlabor(@RequestBody XmBudgetNlabor xmBudgetNlabor) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmBudgetNlabor.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -165,9 +151,7 @@ public class XmBudgetNlaborController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmBudgetNlaborMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmBudgetNlaborMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -219,13 +203,7 @@ public class XmBudgetNlaborController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -235,9 +213,7 @@ public class XmBudgetNlaborController {
 	})
 	@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
 	public Result batchAddXmBudgetNlabor(@RequestBody List<XmBudgetNlabor> xmBudgetNlabors) {
-		
-		Tips tips=new Tips("成功删除");
-		try{
+
 			if(xmBudgetNlabors.size()<=0){
 				return failed("data-0","请上送待新增数据列表");
 			}
@@ -266,13 +242,7 @@ public class XmBudgetNlaborController {
 			}else {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -283,7 +253,7 @@ public class XmBudgetNlaborController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmBudgetNlabor(@RequestBody List<XmBudgetNlabor> xmBudgetNlabors) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmBudgetNlabors.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -9,6 +10,7 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmCostNlabor;
 import com.xm.core.service.XmCostNlaborService;
 import io.swagger.annotations.*;
@@ -61,11 +63,11 @@ public class XmCostNlaborController {
 	public Result listXmCostNlabor(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmCostNlabor> qw = QueryTools.initQueryWrapper(XmCostNlabor.class , params);
 		List<Map<String,Object>> datas = xmCostNlaborService.selectListMapByWhere(page,qw,params);
-			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmCostNlabor列表
+		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmCostNlabor列表
 
 	}
 
@@ -76,14 +78,10 @@ public class XmCostNlaborController {
 	@RequestMapping(value="/listSum",method=RequestMethod.GET)
 	public Result listSum(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
-		List<Map<String,Object>>	data = xmCostNlaborService.listSum(xmCostNlabor);	//列出xmProjectMCostNouser列表
-		
-		
-		
-		
+		List<Map<String,Object>>	data = xmCostNlaborService.listSum(params);	//列出xmProjectMCostNouser列表 
+		return Result.ok("query-ok","查询成功").setData(data).setTotal(page.getTotal());	//列出XmCostNlabor列表 
 	}
 	
 
@@ -93,9 +91,7 @@ public class XmCostNlaborController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmCostNlabor(@RequestBody XmCostNlabor xmCostNlabor) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmCostNlabor.getId())) {
 			    createPk=true;
@@ -108,13 +104,7 @@ public class XmCostNlaborController {
             }
 			xmCostNlaborService.insert(xmCostNlabor);
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 
@@ -124,9 +114,7 @@ public class XmCostNlaborController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmCostNlabor(@RequestBody XmCostNlabor xmCostNlabor){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmCostNlabor.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -145,9 +133,7 @@ public class XmCostNlaborController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmCostNlabor(@RequestBody XmCostNlabor xmCostNlabor) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmCostNlabor.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -166,9 +152,7 @@ public class XmCostNlaborController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmCostNlaborMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmCostNlaborMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -220,13 +204,7 @@ public class XmCostNlaborController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -237,7 +215,7 @@ public class XmCostNlaborController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmCostNlabor(@RequestBody List<XmCostNlabor> xmCostNlabors) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmCostNlabors.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.audit.log.client.annotation.AuditLog;
 import com.mdp.audit.log.client.annotation.OperType;
@@ -12,6 +13,7 @@ import com.mdp.core.utils.ResponseHelper;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmEnvList;
 import com.xm.core.service.XmEnvListService;
 import com.xm.core.service.XmGroupService;
@@ -68,18 +70,14 @@ public class XmEnvListController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmEnvList(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
-		xmEnvList.put("userid",user.getUserid());
+		params.put("userid",user.getUserid());
 		params.put("branchId",user.getBranchId());
+		QueryWrapper<XmEnvList> qw = QueryTools.initQueryWrapper(XmEnvList.class , params);
 		List<Map<String,Object>> datas = xmEnvListService.selectListMapByWhere(page,qw,params);
-			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmEnvList列表
-		
-		
-		
-		
+		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmEnvList列表 
 	}
 	
  
@@ -91,9 +89,7 @@ public class XmEnvListController {
 	////@HasQx(value = "xm_core_xmEnvList_add",name = "新建环境清单",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmEnvList(@RequestBody XmEnvList xmEnvList) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(!StringUtils.hasText(xmEnvList.getProjectId())){
 				return ResponseHelper.failed("projectId-0","项目编号不能为空");
 			}
@@ -125,9 +121,7 @@ public class XmEnvListController {
 	////@HasQx(value = "xm_core_xmEnvList_del",name = "删除环境清单",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmEnvList(@RequestBody XmEnvList xmEnvList){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			XmEnvList xmEnvListDb=this.xmEnvListService.selectOneById(xmEnvList.getId());
 			if(xmEnvListDb==null){
 				return ResponseHelper.failed("data-0","数据已不存在");
@@ -152,7 +146,7 @@ public class XmEnvListController {
 				}
 			}
 			xmEnvListService.deleteByPk(xmEnvList);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -163,9 +157,7 @@ public class XmEnvListController {
 	////@HasQx(value = "xm_core_xmEnvList_edit",name = "修改环境清单",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmEnvList(@RequestBody XmEnvList xmEnvList) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			XmEnvList xmEnvListDb=this.xmEnvListService.selectOneById(xmEnvList.getId());
 			if(xmEnvListDb==null){
 				return ResponseHelper.failed("data-0","数据已不存在");
@@ -203,10 +195,10 @@ public class XmEnvListController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmEnvList(@RequestBody List<XmEnvList> xmEnvLists) {
 		
-		Tips tips=new Tips("成功删除"+xmEnvLists.size()+"条数据"); 
+		
 		
 			xmEnvListService.batchDelete(xmEnvLists);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	**/
@@ -233,7 +225,7 @@ public class XmEnvListController {
 	@RequestMapping(value="/processApprova",method=RequestMethod.POST)
 	public Result processApprova( @RequestBody Map<String,Object> flowVars){
 		
-		Tips tips=new Tips("成功新增一条数据");
+		
 		  
 		
 			

xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -10,6 +11,7 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.sensitive.SensitiveWordService;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmFunc;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.service.XmFuncService;
@@ -73,9 +75,9 @@ public class XmFuncController {
 	public Result listXmFunc(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = sensitiveWordService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmFunc列表
 
@@ -89,9 +91,7 @@ public class XmFuncController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmFunc(@RequestBody XmFunc xmFunc) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmFunc.getId())) {
 			    createPk=true;
@@ -127,9 +127,7 @@ public class XmFuncController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmFunc(@RequestBody XmFunc xmFunc){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmFunc.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -142,7 +140,7 @@ public class XmFuncController {
 				return failed("childcnt-not-0","至少还有"+childcnt+"个子节点,请先删除子节点，再删除父节点");
 			}
 			xmFuncService.deleteByPk(xmFunc);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -152,9 +150,7 @@ public class XmFuncController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmFunc(@RequestBody XmFunc xmFunc) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmFunc.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -173,9 +169,7 @@ public class XmFuncController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmFuncMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmFuncMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -235,13 +229,7 @@ public class XmFuncController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -252,7 +240,7 @@ public class XmFuncController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmFunc(@RequestBody List<XmFunc> xmFuncs) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmFuncs.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -11,6 +12,7 @@ import com.mdp.msg.client.PushNotifyMsgService;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmGroup;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.entity.XmProject;
@@ -87,7 +89,7 @@ public class XmGroupController {
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result updateGroup(@RequestBody XmGroup group) {
 
-		Tips tips=new Tips("小组更新成功");
+		
 		
 		if(group==null){
 			tips.setFailureMsg("小组信息不能为空");
@@ -192,8 +194,7 @@ public class XmGroupController {
 	@RequestMapping(value="/getGroups",method=RequestMethod.GET)
 	public Result getGroup(@ApiIgnore @RequestParam Map<String,Object> params) {
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		List<XmGroupVo>	xmGroupList=new ArrayList<>();
 		String iterationId= (String) params.get("iterationId");
@@ -208,9 +209,6 @@ public class XmGroupController {
 		}
 
 		
-		
-		
-		
 	}
 
 
@@ -232,8 +230,7 @@ public class XmGroupController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectGroup(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		String projectId= (String) xmGroup.get("projectId");
@@ -243,12 +240,10 @@ public class XmGroupController {
 		params.put("branchId",user.getBranchId());
 			xmGroup.put("orCrowBranchId",user.getBranchId());
 		}
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectGroup列表
 		
-		
-		
-		
 	}
 
 	@ApiOperation( value = "新增一条xm_group信息",notes="addXmProjectGroup,主键如果为空，后台自动生成")
@@ -258,9 +253,7 @@ public class XmGroupController {
 	//@HasQx(value = "xm_core_xmGroup_add",name = "新增项目团队信息",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectGroup(@RequestBody XmGroup xmGroup) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			User u = LoginUtils.getCurrentUserInfo();
 
 				if(StringUtils.isEmpty(xmGroup.getPgClass())){
@@ -333,19 +326,13 @@ public class XmGroupController {
 
 
   			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
 
 	public Tips checkProductGroupQxForAdd(XmProduct xmProduct,User u,XmGroup xmGroup){
-		Tips tips=new Tips();
+		
 		
 		tips=productQxService.checkProductQx(xmProduct,0,u);
 		if(!tips.isOk()){
@@ -365,7 +352,7 @@ public class XmGroupController {
 
 
 	public Tips checkProjectGroupQxForAdd(XmProject project,User u,XmGroup xmGroup){
-		Tips tips=new Tips();
+		
 		
 		tips=projectQxService.checkProjectQx(project,0,u);
 		if(!tips.isOk()){
@@ -389,9 +376,7 @@ public class XmGroupController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectGroup(@RequestBody XmGroup xmGroup){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			User u = LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmGroup.getId())){
 				return ResponseHelper.failed("id-0","请上送小组编号");
@@ -458,9 +443,7 @@ public class XmGroupController {
 	}) 
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProjectGroup(@RequestBody List<XmGroup> xmGroups) {
-		
-		Tips tips=new Tips("成功删除"+xmGroups.size()+"条数据"); 
-		try{
+
 			List<XmGroup> groupsDb=this.xmGroupService.selectListByIds(xmGroups.stream().map(i->i.getId()).collect(Collectors.toList()));
 			if(groupsDb==null || groupsDb.size()==0){
 				return ResponseHelper.failed("data-0","要删除的小组已不存在");

xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java

@@ -57,15 +57,12 @@ public class XmGroupStateController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectGroupState(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectGroupState列表
 		
-		
-		
-		
 	}
 	
  
@@ -77,10 +74,10 @@ public class XmGroupStateController {
 	@RequestMapping(value="/loadTasksToXmProjectGroupState",method=RequestMethod.POST)
 	public Result loadTasksToXmProjectGroupState(@RequestBody Map<String,Object> params) {
 		
-		Tips tips=new Tips("成功修改数据"); 
+		
 		
 			int i= xmGroupStateService.loadTasksToXmProjectGroupState((String) params.get("projectId"));
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}  
 	/**
@@ -90,9 +87,7 @@ public class XmGroupStateController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectGroupState(@RequestBody XmProjectGroupState xmGroupState) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmGroupState.getId())) {
 				xmGroupState.setId(xmGroupStateService.createKey("id"));
 			}else{
@@ -115,11 +110,9 @@ public class XmGroupStateController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectGroupState(@RequestBody XmProjectGroupState xmGroupState){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmGroupStateService.deleteByPk(xmGroupState);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -131,9 +124,7 @@ public class XmGroupStateController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProjectGroupState(@RequestBody XmProjectGroupState xmGroupState) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmGroupStateService.updateByPk(xmGroupState);
 		
 	}
@@ -149,10 +140,10 @@ public class XmGroupStateController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProjectGroupState(@RequestBody List<XmProjectGroupState> xmGroupStates) {
 		
-		Tips tips=new Tips("成功删除"+xmGroupStates.size()+"条数据"); 
+		
 		
 			xmGroupStateService.batchDelete(xmGroupStates);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java

@@ -88,17 +88,14 @@ public class XmGroupUserController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectGroupUser(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("branchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectGroupUser列表
 		
-		
-		
-		
 	}
 	
  
@@ -109,9 +106,7 @@ public class XmGroupUserController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectGroupUser(@RequestBody XmGroupUser gu) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 
 			if(!StringUtils.hasText(gu.getGroupId())||!StringUtils.hasText(gu.getUserid())){
 				return ResponseHelper.failed("pk-0","请上送小组编号，用户编号groupId,userid");
@@ -186,13 +181,7 @@ public class XmGroupUserController {
 			}
 
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 
@@ -202,9 +191,7 @@ public class XmGroupUserController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectGroupUser(@RequestBody XmGroupUser gu){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			if(!StringUtils.hasText(gu.getGroupId())||!StringUtils.hasText(gu.getUserid())){
 				return ResponseHelper.failed("pk-0","请上送小组编号，用户编号groupId,userid");
 			}
@@ -288,9 +275,7 @@ public class XmGroupUserController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProjectGroupUser(@RequestBody XmGroupUser gu0) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			if(!StringUtils.hasText(gu0.getGroupId())||!StringUtils.hasText(gu0.getUserid())){
 				return ResponseHelper.failed("pk-0","请上送小组编号，用户编号groupId,userid");
 			}
@@ -365,8 +350,8 @@ public class XmGroupUserController {
 		if(gus==null || gus.size()==0){
 			return ResponseHelper.failed("data-0","请上送要删除的小组成员");
 		}
-		Tips tips=new Tips("成功新增"+gus.size()+"条数据");
-		try{
+		
+				
 			if(gus.stream().filter(i->!StringUtils.hasText(i.getUserid())||!StringUtils.hasText(i.getGroupId())).findAny().isPresent()){
 				return ResponseHelper.failed("userid-or-groupId-0","请上送用户编号及小组编号");
 			}else{
@@ -490,13 +475,7 @@ public class XmGroupUserController {
 			});
 
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -511,8 +490,8 @@ public class XmGroupUserController {
 		if(gus==null || gus.size()==0){
 			return ResponseHelper.failed("data-0","请上送要删除的小组成员");
 		}
-		Tips tips=new Tips("成功删除"+gus.size()+"条数据");
-		try{
+		
+				
 			List<XmGroupUser> gusDb=this.xmGroupUserService.selectListByIds(gus);
 			if(gusDb.size()==0){
 				return ResponseHelper.failed("data-0","要删除的数据已不存在。");

xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java

@@ -1,6 +1,7 @@
 package com.xm.core.ctrl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -13,6 +14,7 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.sensitive.SensitiveWordService;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmIteration;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.service.*;
@@ -96,26 +98,25 @@ public class XmIterationController {
 	public Result listXmIteration(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
-		String id= (String) xmIteration.get("id");
-		Object ids=  xmIteration.get("ids");
-		String productId= (String) xmIteration.get("productId");
-		String adminUserid= (String) xmIteration.get("adminUserid");
-		String menuId= (String) xmIteration.get("menuId");
-		String queryScope=(String) xmIteration.get("queryScope");
-		String branchId=(String) xmIteration.get("branchId");
-		String linkProjectId=(String) xmIteration.get("linkProjectId");
+		String id= (String) params.get("id");
+		Object ids=  params.get("ids");
+		String productId= (String) params.get("productId");
+		String adminUserid= (String) params.get("adminUserid");
+		String menuId= (String) params.get("menuId");
+		String queryScope=(String) params.get("queryScope");
+		String branchId=(String) params.get("branchId");
+		String linkProjectId=(String) params.get("linkProjectId");
 		User user = LoginUtils.getCurrentUserInfo();
-		xmIteration.put("userid",user.getUserid());
+		params.put("userid",user.getUserid());
 		if(  !( StringUtils.hasText(branchId)|| StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null
 				|| StringUtils.hasText(adminUserid) ) ){
 			if(LoginUtils.isBranchAdmin()){
 		params.put("branchId",user.getBranchId());
 			}else{
 				if(!StringUtils.hasText(productId) && !StringUtils.hasText(linkProjectId)){
-					xmIteration.put("compete",user.getUserid());
+					params.put("compete",user.getUserid());
 				}else{
 		params.put("branchId",user.getBranchId());
 				}
@@ -124,6 +125,7 @@ public class XmIterationController {
 		if("branchId".equals(queryScope)){
 		params.put("branchId",user.getBranchId());
 		}
+		QueryWrapper<XmIteration> qw = QueryTools.initQueryWrapper(XmIteration.class , params);
 		List<Map<String,Object>> datas = xmIterationService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmIteration列表
 
@@ -136,27 +138,26 @@ public class XmIterationController {
 	@RequestMapping(value="/listWithState",method=RequestMethod.GET)
 	public Result listWithState(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 
-		String id= (String) xmIteration.get("id");
-		Object ids=  xmIteration.get("ids");
-		String productId= (String) xmIteration.get("productId");
-		String adminUserid= (String) xmIteration.get("adminUserid");
-		String menuId= (String) xmIteration.get("menuId");
-		String queryScope=(String) xmIteration.get("queryScope");
-		String branchId=(String) xmIteration.get("branchId");
-		String linkProjectId=(String) xmIteration.get("linkProjectId");
+		String id= (String) params.get("id");
+		Object ids=  params.get("ids");
+		String productId= (String) params.get("productId");
+		String adminUserid= (String) params.get("adminUserid");
+		String menuId= (String) params.get("menuId");
+		String queryScope=(String) params.get("queryScope");
+		String branchId=(String) params.get("branchId");
+		String linkProjectId=(String) params.get("linkProjectId");
 		User user = LoginUtils.getCurrentUserInfo();
-		xmIteration.put("userid",user.getUserid());
+		params.put("userid",user.getUserid());
 		if(  !(StringUtils.hasText(branchId)|| StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null
 				|| StringUtils.hasText(adminUserid) ) ){
 			if(LoginUtils.isBranchAdmin()){
 		params.put("branchId",user.getBranchId());
 			}else{
 				if(!StringUtils.hasText(productId) && !StringUtils.hasText(linkProjectId)){
-					xmIteration.put("compete",user.getUserid());
+					params.put("compete",user.getUserid());
 				}else{
 		params.put("branchId",user.getBranchId());
 				}
@@ -165,9 +166,9 @@ public class XmIterationController {
 		if("branchId".equals(queryScope)){
 		params.put("branchId",user.getBranchId());
 		}
-		List<Map<String,Object>>	xmIterationList = xmIterationService.selectListMapByWhereWithState(xmIteration);	//列出XmIteration列表
-		
+		List<Map<String,Object>>	datas = xmIterationService.selectListMapByWhereWithState(params);	//列出XmIteration列表
 		
+		return Result.ok().setData(datas);
 		
 		
 	}
@@ -180,9 +181,7 @@ public class XmIterationController {
 	//@HasQx(value = "xm_core_xmIteration_add",name = "新增迭代计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmIteration(@RequestBody XmIterationVo xmIteration) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			XmIteration q=new XmIteration();
 			User user= LoginUtils.getCurrentUserInfo();
 
@@ -242,9 +241,7 @@ public class XmIterationController {
 	//@HasQx(value = "xm_core_xmIteration_del",name = "删除迭代计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmIteration(@RequestBody XmIteration xmIteration){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			if(!StringUtils.hasText(xmIteration.getId())){
 				return failed("id-0","请上送迭代编号");
 			}
@@ -266,7 +263,7 @@ public class XmIterationController {
 			xmIterationService.deleteByPk(xmIteration);
 			xmRecordService.addXmIterationRecord(xmIteration.getId(),"迭代-删除","删除迭代"+iterationDb.getIterationName(),"", JSON.toJSONString(iterationDb));
 
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 
@@ -279,9 +276,7 @@ public class XmIterationController {
 	//@HasQx(value = "xm_core_xmIteration_edit",name = "修改迭代计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmIteration(@RequestBody XmIteration xmIteration) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			if(!StringUtils.hasText(xmIteration.getId())){
 				return failed("id-0","请上送迭代编号");
 			}
@@ -312,9 +307,7 @@ public class XmIterationController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmIterationMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			List<String> ids= (List<String>) xmIterationMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -403,22 +396,14 @@ public class XmIterationController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
 	//@HasQx(value = "xm_core_xmIteration_loadTasksToXmIterationState",name = "计算迭代的bug、工作量、人员投入、进度等",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/loadTasksToXmIterationState",method=RequestMethod.POST)
 	public Result loadTasksToXmIterationState(@RequestBody XmIteration xmIteration) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			if(!StringUtils.hasText(xmIteration.getId())){
 				return failed("id-0","请上送迭代编号");
 			}
@@ -433,7 +418,7 @@ public class XmIterationController {
 				xmRecordService.addXmIterationRecord(xmIteration.getId(),"迭代-汇总","汇总计算迭代数据"+iterationDb.getIterationName());
 
 			}
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	
@@ -445,7 +430,7 @@ public class XmIterationController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmIteration(@RequestBody List<XmIteration> xmIterations) {
 		
-		Tips tips=new Tips("成功删除"+xmIterations.size()+"条数据"); 
+		
 		
 			xmIterationService.batchDelete(xmIterations);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());

xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java

@@ -90,13 +90,9 @@ public class XmIterationMenuController {
 		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Result delXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			return batchDelXmIterationMenu(xmIterationMenus);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+	public Result delXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus){ 
 		
+		return batchDelXmIterationMenu(xmIterationMenus); 
 	}
 	
 
@@ -106,9 +102,7 @@ public class XmIterationMenuController {
 	}) 
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus) {
-		
-		Tips tips=new Tips("成功将用户故事移出迭代");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			List<String> menuIds=xmIterationMenus.getMenuIds();
 			if(menuIds==null || menuIds.size()==0){
@@ -152,14 +146,12 @@ public class XmIterationMenuController {
 			}else {
 				tips.setOkMsg(msgs.stream().collect(Collectors.joining(" ")));
 			}
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
 	public Result batchAddXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus) {
-		
-		Tips tips=new Tips("成功将用户故事发布到迭代中");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmIterationMenus.getIterationId())){
 				return ResponseHelper.failed("iterationId-0","迭代编号不能为空");
@@ -227,7 +219,7 @@ public class XmIterationMenuController {
 				tips.setOkMsg(msgs.stream().collect(Collectors.joining(" ")));
 			}
 
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 }

xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java

@@ -1,10 +1,12 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.query.QueryTools;
 import com.mdp.core.utils.RequestUtils;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmIterationState;
 import com.xm.core.service.XmIterationStateService;
 import io.swagger.annotations.*;
@@ -82,15 +84,12 @@ public class XmIterationStateController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmIterationState(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmIterationState> qw = QueryTools.initQueryWrapper(XmIterationState.class , params);
 		List<Map<String,Object>> datas = xmIterationStateService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmIterationState列表
 		
-		
-		
-		
 	}
 
 	@ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmIterationState")
@@ -100,10 +99,10 @@ public class XmIterationStateController {
 	@RequestMapping(value="/loadTasksToXmIterationState",method=RequestMethod.POST)
 	public Result loadTasksToXmIterationState(@RequestBody Map<String,Object> params) {
 		
-		Tips tips=new Tips("成功修改数据"); 
+		
 		
 			int i= xmIterationStateService.loadTasksToXmIterationState((String) params.get("iterationId"));
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}  
  
@@ -115,9 +114,7 @@ public class XmIterationStateController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmIterationState(@RequestBody XmIterationState xmIterationState) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmIterationState.getId())) {
 				xmIterationState.setId(xmIterationStateService.createKey("id"));
 			}else{
@@ -140,11 +137,9 @@ public class XmIterationStateController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmIterationState(@RequestBody XmIterationState xmIterationState){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmIterationStateService.deleteByPk(xmIterationState);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -156,9 +151,7 @@ public class XmIterationStateController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmIterationState(@RequestBody XmIterationState xmIterationState) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmIterationStateService.updateByPk(xmIterationState);
 		
 	}
@@ -174,10 +167,10 @@ public class XmIterationStateController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmIterationState(@RequestBody List<XmIterationState> xmIterationStates) {
 		
-		Tips tips=new Tips("成功删除"+xmIterationStates.size()+"条数据"); 
+		
 		
 			xmIterationStateService.batchDelete(xmIterationStates);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateHisController.java

@@ -1,9 +1,11 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.query.QueryTools;
 import com.mdp.core.utils.RequestUtils;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmIterationStateHis;
 import com.xm.core.service.XmIterationStateHisService;
 import io.swagger.annotations.Api;
@@ -53,9 +55,9 @@ public class XmIterationStateHisController {
 	public Result listXmIterationStateHis(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "pkList");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "pkList");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmIterationStateHis> qw = QueryTools.initQueryWrapper(XmIterationStateHis.class , params);
 		List<Map<String,Object>> datas = xmIterationStateHisService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmIterationStateHis列表
 
@@ -70,9 +72,7 @@ public class XmIterationStateHisController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmIterationStateHis(@RequestBody XmIterationStateHis xmIterationStateHis) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmIterationStateHis.getIterationId())) {
 			    createPk=true;
@@ -99,9 +99,7 @@ public class XmIterationStateHisController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmIterationStateHis(@RequestBody XmIterationStateHis xmIterationStateHis){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmIterationStateHis.getIterationId())) {
                  return failed("pk-not-exists","请上送主键参数iterationId");
             }
@@ -113,7 +111,7 @@ public class XmIterationStateHisController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmIterationStateHisService.deleteByPk(xmIterationStateHis);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -125,9 +123,7 @@ public class XmIterationStateHisController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmIterationStateHis(@RequestBody XmIterationStateHis xmIterationStateHis) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmIterationStateHis.getIterationId())) {
                  return failed("pk-not-exists","请上送主键参数iterationId");
             }
@@ -153,10 +149,10 @@ public class XmIterationStateHisController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmIterationStateHis(@RequestBody List<XmIterationStateHis> xmIterationStateHiss) {
 		
-		Tips tips=new Tips("成功删除"+xmIterationStateHiss.size()+"条数据"); 
+		
 		
 			xmIterationStateHisService.batchDelete(xmIterationStateHiss);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -12,6 +13,7 @@ import com.mdp.qx.HasRole;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.entity.XmMenuComment;
 import com.xm.core.service.XmMenuCalcService;
@@ -25,7 +27,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -74,14 +75,14 @@ public class XmMenuCommentController {
 	public Result listXmMenuComment(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		String pid= (String) params.get("pid");
 		if(!StringUtils.hasText(pid)){
 			params.put("pidIsNull","1");
 		}
 
+		QueryWrapper<XmMenuComment> qw = QueryTools.initQueryWrapper(XmMenuComment.class , params);
 		List<Map<String,Object>> datas = xmMenuCommentService.selectListMapByWhere(page,qw,params);
 
 
@@ -102,9 +103,7 @@ public class XmMenuCommentController {
 	@HasRole
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmMenuComment(@RequestBody XmMenuComment xmMenuComment) {
-		
-		Tips tips=new Tips("成功评论");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			XmMenu xmMenuDb=this.xmMenuService.selectOneById(xmMenuComment.getMenuId());
 			if(xmMenuDb==null){
@@ -142,9 +141,7 @@ public class XmMenuCommentController {
 	})
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmMenuComment(@RequestBody XmMenuComment xmMenuComment){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			XmMenuComment commentDb=this.xmMenuCommentService.selectOneById(xmMenuComment.getId());
 			if(commentDb==null){
 				return ResponseHelper.failed("data-0","评论已不存在");
@@ -178,9 +175,7 @@ public class XmMenuCommentController {
 	})
 	@RequestMapping(value="/praise",method=RequestMethod.POST)
 	public Result praiseComment(@RequestBody XmMenuComment xmMenuComment) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmMenuCommentService.update("praiseComment", xmMenuComment);
 
 			
@@ -200,9 +195,7 @@ public class XmMenuCommentController {
 	})
 	@RequestMapping(value="/unshow",method=RequestMethod.POST)
 	public Result unShowComment(@RequestBody String[] ids) {
-		
-		Tips tips=new Tips("成功屏蔽评论");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			List<XmMenuComment> comments=this.xmMenuCommentService.selectListByIds(Arrays.asList(ids));
 			if(comments==null || comments.size()==0){
@@ -235,9 +228,7 @@ public class XmMenuCommentController {
 	})
 	@RequestMapping(value="/show",method=RequestMethod.POST)
 	public Result showComment(@RequestBody String[] ids) {
-		
-		Tips tips=new Tips("成功打开评论");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			List<XmMenuComment> comments=this.xmMenuCommentService.selectListByIds(Arrays.asList(ids));
 			if(comments==null || comments.size()==0){
@@ -271,9 +262,7 @@ public class XmMenuCommentController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmMenuComment(@RequestBody XmMenuComment xmMenuComment) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmMenuComment.getId())) {
 			    createPk=true;
@@ -296,9 +285,7 @@ public class XmMenuCommentController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmMenuComment(@RequestBody XmMenuComment xmMenuComment){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmMenuComment.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -307,7 +294,7 @@ public class XmMenuCommentController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmMenuCommentService.deleteByPk(xmMenuComment);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -319,9 +306,7 @@ public class XmMenuCommentController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmMenuComment(@RequestBody XmMenuComment xmMenuComment) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmMenuComment.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -342,9 +327,7 @@ public class XmMenuCommentController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmMenuCommentMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmMenuCommentMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -396,13 +379,7 @@ public class XmMenuCommentController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	*/
@@ -415,7 +392,7 @@ public class XmMenuCommentController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmMenuComment(@RequestBody List<XmMenuComment> xmMenuComments) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmMenuComments.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@@ -1,13 +1,13 @@
 package com.xm.core.ctrl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.query.QueryTools;
 import com.mdp.core.utils.BaseUtils;
-import com.mdp.core.utils.NumberUtil;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.core.utils.ResponseHelper;
 import com.mdp.msg.client.PushNotifyMsgService;
@@ -15,6 +15,7 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.sensitive.SensitiveWordService;
 import com.xm.core.PubTool;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.entity.XmTask;
@@ -109,10 +110,10 @@ public class XmMenuController {
 		 
 		RequestUtils.transformArray(params, "menuIds");
 		RequestUtils.transformArray(params, "tagIdList");
-		RequestUtils.transformArray(params, "dclasss");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "dclasss");		
 		IPage page=QueryTools.initPage(params);
 		this.paramsInit(params);
+		QueryWrapper<XmMenu> qw = QueryTools.initQueryWrapper(XmMenu.class , params);
 		List<Map<String,Object>> datas = xmMenuService.selectListMapByWhere(page,qw,params);
 		
 		if("1".equals(params.get("withParents"))  && !"1".equals(params.get("isTop"))&& datas.size()>0){
@@ -165,8 +166,7 @@ public class XmMenuController {
 		 
 		RequestUtils.transformArray(params, "menuIds");
 		RequestUtils.transformArray(params, "tagIdList");
-		RequestUtils.transformArray(params, "dclasss");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "dclasss");		
 		IPage page=QueryTools.initPage(params);
 		
 		this.paramsInit(params);
@@ -199,35 +199,30 @@ public class XmMenuController {
 	}
 	@RequestMapping(value="/listWithPlan",method=RequestMethod.GET)
 	public Result listWithPlan(@ApiIgnore @RequestParam Map<String,Object> params){
-		return this.listWithState(xmMenu);
+		return this.listWithState(params);
 	}
 
 	@RequestMapping(value="/getXmMenuAttDist",method=RequestMethod.GET)
 	public Result getXmMenuAttDist(@ApiIgnore @RequestParam Map<String,Object> params){
- 		this.paramsInit(xmMenu);
-		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuAttDist(xmMenu);
+ 		this.paramsInit(params);
+		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuAttDist(params);
 		return ResponseHelper.ok("ok","成功",datas);
 	}
 
 	@RequestMapping(value="/getXmMenuAgeDist",method=RequestMethod.GET)
 	public Result getXmMenuAgeDist(@ApiIgnore @RequestParam Map<String,Object> params){
-		this.paramsInit(xmMenu);
-		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuAgeDist(xmMenu);
+		this.paramsInit(params);
+		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuAgeDist(params);
 		return ResponseHelper.ok("ok","成功",datas);
 	}
 
 	@RequestMapping(value="/getXmMenuSort",method=RequestMethod.GET)
 	public Result getXmMenuSort(@ApiIgnore @RequestParam Map<String,Object> params){
-
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
-		IPage page=QueryTools.initPage(params);
-		this.paramsInit(xmMenu);
-		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuSort(xmMenu);
-		Map<String,Object> m=new HashMap<>();
-		PageUtils.responePage(m,datas);
-		
-		
 		
+		IPage page=QueryTools.initPage(params);
+		this.paramsInit(params);
+		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuSort(params);
+		return Result.ok().setData(datas);
 	}
 
 	/***/
@@ -238,9 +233,7 @@ public class XmMenuController {
 	//@HasQx(value = "xm_core_xmMenu_add",name = "新增用户需求",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmMenu(@RequestBody XmMenu xmMenu) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmMenu.getMenuId())) {
 				xmMenu.setMenuId(xmMenuService.createKey("menuId"));
 			}else{
@@ -326,9 +319,7 @@ public class XmMenuController {
 	//@HasQx(value = "xm_core_xmMenu_del",name = "删除用户需求",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmMenu(@RequestBody XmMenu xmMenu){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			XmTask xmTask = new XmTask();
 			if(StringUtils.isEmpty(xmMenu.getMenuId())){
@@ -378,9 +369,7 @@ public class XmMenuController {
 	//@HasQx(value = "xm_core_xmMenu_edit",name = "修改用户需求",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmMenu(@RequestBody XmMenu xmMenu) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmMenu.getMenuId())){
 				ResponseHelper.failed("menuId-0","menuId不能为空");
@@ -419,9 +408,7 @@ public class XmMenuController {
 	//@HasQx(value = "xm_core_xmMenu_editSomeFields",name = "修改用户需求中的某些字段",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields(@RequestBody Map<String,Object> xmMenuMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			List<String> menuIds= (List<String>) xmMenuMap.get("menuIds");
 
@@ -532,13 +519,7 @@ public class XmMenuController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -551,9 +532,7 @@ public class XmMenuController {
 	//@HasQx(value = "xm_core_xmMenu_batchDel",name = "批量删除用户需求",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmMenu(@RequestBody List<XmMenu> xmMenus) {
-		
-		Tips tips=new Tips("成功删除"+xmMenus.size()+"条数据"); 
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			List<String> hasChildMenus=new ArrayList<>();
 			List<XmMenu> canDelList=new ArrayList<>();
@@ -634,7 +613,7 @@ public class XmMenuController {
 	@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
 	public Result batchAddXmMenu(@RequestBody List<XmMenu> xmMenus) {
 		
-		Tips tips=new Tips("成功新增"+xmMenus.size()+"条数据"); 
+		
 		
 			 
 			if(xmMenus.size()>0) {
@@ -664,9 +643,7 @@ public class XmMenuController {
 	//@HasQx(value = "xm_core_xmMenu_batchChangeParentMenu",name = "批量修改需求的上级",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchChangeParentMenu",method=RequestMethod.POST)
 	public Result batchChangeParentMenu(@RequestBody BatchChangeParentMenuVo parentMenuVo) {
-		
-		Tips tips=new Tips("成功修改");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 
 			if(parentMenuVo.getMenuIds()==null || parentMenuVo.getMenuIds().size()==0){
@@ -779,13 +756,7 @@ public class XmMenuController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
 			}
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 }

xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -7,6 +8,7 @@ import com.mdp.core.query.QueryTools;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmMenuPlan;
 import com.xm.core.service.XmMenuPlanService;
 import com.xm.core.service.push.XmMenuPushMsgService;
@@ -103,15 +105,12 @@ public class XmMenuPlanController {
 	public Result listXmMenuPlan(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
 		RequestUtils.transformArray(params, "ids");
-		RequestUtils.transformArray(params, "tagIdList");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "tagIdList");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmMenuPlan> qw = QueryTools.initQueryWrapper(XmMenuPlan.class , params);
 		List<Map<String,Object>> datas = xmMenuPlanService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmMenuPlan列表
 		
-		
-		
-		
 	}
 	
  
@@ -124,16 +123,14 @@ public class XmMenuPlanController {
 	//@HasQx(value = "xm_core_xmMenuPlan_add",name = "新增需求计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmMenuPlan(@RequestBody XmMenuPlan xmMenuPlan) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(xmMenuPlanService.countByWhere(xmMenuPlan)>0){
 				tips.setFailureMsg("编号重复，请修改编号再提交");
 				m.put("tips", tips);
 				return m;
 			}
 			xmMenuPlanService.insert(xmMenuPlan);
-		
+			return Result.ok();
 	}
 	
 	
@@ -145,14 +142,11 @@ public class XmMenuPlanController {
 	//@HasQx(value = "xm_core_xmMenuPlan_del",name = "删除需求计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmMenuPlan(@RequestBody XmMenuPlan xmMenuPlan){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+		 
 			xmMenuPlanService.deleteByPk(xmMenuPlan);
 			User user = LoginUtils.getCurrentUserInfo();
 			pushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmMenuPlan.getMenuId(), user.getUserid(), user.getUsername(), xmMenuPlan.getMenuName()+"相关计划删除");
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
-		
+		return Result.ok();		
 	}
 	 
 	
@@ -164,13 +158,11 @@ public class XmMenuPlanController {
 	//@HasQx(value = "xm_core_xmMenuPlan_edit",name = "修改需求计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmMenuPlan(@RequestBody XmMenuPlan xmMenuPlan) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+		 	
 			xmMenuPlanService.updateByPk(xmMenuPlan); 
 			User user = LoginUtils.getCurrentUserInfo();
 			pushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmMenuPlan.getMenuId(), user.getUserid(), user.getUsername(),  user.getUsername()+"对需求【"+xmMenuPlan.getMenuName()+"】相关计划进行调整，需求负责人为【"+xmMenuPlan.getChargeUsername()+"】");
-		
+		return Result.ok();
 	}
 	
 	
@@ -184,12 +176,9 @@ public class XmMenuPlanController {
 	//@HasQx(value = "xm_core_xmMenuPlan_batchDel",name = "批量删除需求计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmMenuPlan(@RequestBody List<XmMenuPlan> xmMenuPlans) {
-		
-		Tips tips=new Tips("成功删除"+xmMenuPlans.size()+"条数据"); 
-		
+		 
 			xmMenuPlanService.batchDelete(xmMenuPlans);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
-		
+		return Result.ok();		
 	} 
 	@ApiOperation( value = "根据主键列表批量删除功能计划表,无需前端维护，所有数据由汇总统计得出信息",notes="batchEditXmMenuPlan,仅需要上传主键字段")
 	@ApiResponses({
@@ -198,17 +187,14 @@ public class XmMenuPlanController {
 	//@HasQx(value = "xm_core_xmMenuPlan_batchEdit",name = "批量修改需求计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchEdit",method=RequestMethod.POST)
 	public Result batchEditXmMenuPlan(@RequestBody List<XmMenuPlan> xmMenuPlans) {
-		
-		Tips tips=new Tips("成功修改"+xmMenuPlans.size()+"条数据"); 
-		
+		 
 			xmMenuPlanService.batchUpdate(xmMenuPlans);
 			User user = LoginUtils.getCurrentUserInfo();
 
 			for (XmMenuPlan xmMenuPlan : xmMenuPlans) {
 				pushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmMenuPlan.getMenuId(), user.getUserid(), user.getUsername(),  user.getUsername()+"对需求【"+xmMenuPlan.getMenuName()+"】相关计划进行调整，需求负责人为【"+xmMenuPlan.getChargeUsername()+"】");
 			}
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
-		
+		return Result.ok();		
 	} 
 	@ApiOperation( value = "根据主键列表批量删除功能计划表,无需前端维护，所有数据由汇总统计得出信息",notes="batchEditXmMenuPlan,仅需要上传主键字段")
 	@ApiResponses({
@@ -217,12 +203,8 @@ public class XmMenuPlanController {
 	//@HasQx(value = "xm_core_xmMenuPlan_batchAddPlanByProjectIdAndMenuList",name = "由分配到项目的需求创建需求计划",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchAddPlanByProjectIdAndMenuList",method=RequestMethod.POST)
 	public Result batchAddPlanByProjectIdAndMenuList(@RequestBody XmMenuPlanVo vo) {
-		
-		Tips tips=new Tips("成功修改"+vo.getXmMenus().size()+"条数据"); 
-		
-			tips = xmMenuPlanService.batchAddPlanByProjectIdAndMenuList(vo.getProjectId(), vo.getProjectName(), vo.getXmMenus());
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
-		
+	 	xmMenuPlanService.batchAddPlanByProjectIdAndMenuList(vo.getProjectId(), vo.getProjectName(), vo.getXmMenus());
+		return Result.ok();		
 	} 	 
 
 	@ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmMenuPlan")
@@ -232,11 +214,8 @@ public class XmMenuPlanController {
 	//@HasQx(value = "xm_core_xmMenuPlan_loadTasksToXmMenuPlan",name = "计算需求对应的bug、task、测试案例等数据",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/loadTasksToXmMenuPlan",method=RequestMethod.POST)
 	public Result loadTasksToXmMenuPlan(@RequestBody Map<String,Object> params) {
-		
-		Tips tips=new Tips("成功修改数据"); 
-		
+ 
 			int i= xmMenuPlanService.loadTasksToXmMenuPlan((String) params.get("projectId"));
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
-		
+		return Result.ok();		
 	}  
 }

xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java

@@ -1,10 +1,12 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.query.QueryTools;
 import com.mdp.core.utils.RequestUtils;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmMenuState;
 import com.xm.core.service.XmMenuStateService;
 import com.xm.core.vo.XmMenuStateVo;
@@ -100,15 +102,12 @@ public class XmMenuStateController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmMenuState(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmMenuState> qw = QueryTools.initQueryWrapper(XmMenuState.class , params);
 		List<Map<String,Object>> datas = xmMenuStateService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmMenuState列表
 		
-		
-		
-		
 	}
 	
  
@@ -120,9 +119,7 @@ public class XmMenuStateController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmMenuState(@RequestBody XmMenuState xmMenuState) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(xmMenuStateService.countByWhere(xmMenuState)>0){
 				tips.setFailureMsg("编号重复，请修改编号再提交");
 				m.put("tips", tips);
@@ -140,11 +137,9 @@ public class XmMenuStateController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmMenuState(@RequestBody XmMenuState xmMenuState){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmMenuStateService.deleteByPk(xmMenuState);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 
@@ -156,9 +151,7 @@ public class XmMenuStateController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmMenuState(@RequestBody XmMenuState xmMenuState) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmMenuStateService.updateByPk(xmMenuState);
 		
 	}
@@ -174,10 +167,10 @@ public class XmMenuStateController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmMenuState(@RequestBody List<XmMenuState> xmMenuStates) {
 		
-		Tips tips=new Tips("成功删除"+xmMenuStates.size()+"条数据"); 
+		
 		
 			xmMenuStateService.batchDelete(xmMenuStates);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	@ApiOperation( value = "根据主键列表批量删除功能计划表,无需前端维护，所有数据由汇总统计得出信息",notes="batchEditXmMenuState,仅需要上传主键字段")
@@ -187,10 +180,10 @@ public class XmMenuStateController {
 	@RequestMapping(value="/batchEdit",method=RequestMethod.POST)
 	public Result batchEditXmMenuState(@RequestBody List<XmMenuState> xmMenuStates) {
 		
-		Tips tips=new Tips("成功修改"+xmMenuStates.size()+"条数据"); 
+		
 		
 			xmMenuStateService.batchUpdate(xmMenuStates);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	@ApiOperation( value = "根据主键列表批量删除功能计划表,无需前端维护，所有数据由汇总统计得出信息",notes="batchEditXmMenuState,仅需要上传主键字段")
@@ -200,10 +193,10 @@ public class XmMenuStateController {
 	@RequestMapping(value="/batchAddStateByProductIdAndMenuList",method=RequestMethod.POST)
 	public Result batchAddStateByProductIdAndMenuList(@RequestBody XmMenuStateVo vo) {
 		
-		Tips tips=new Tips("成功修改"+vo.getXmMenus().size()+"条数据"); 
+		
 		
 			tips = xmMenuStateService.batchAddStateByProductIdAndMenuList(vo.getProductId(), vo.getProductName(), vo.getXmMenus());
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 	
 	
@@ -214,10 +207,10 @@ public class XmMenuStateController {
 	@RequestMapping(value="/loadTasksToXmMenuState",method=RequestMethod.POST)
 	public Result loadTasksToXmMenuState(@RequestBody Map<String,Object> params) {
 		
-		Tips tips=new Tips("成功修改数据"); 
+		
 		
 			int i= xmMenuStateService.loadTasksToXmMenuState((String) params.get("productId"));
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}  
 }

xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java

@@ -1,5 +1,6 @@
 package com.xm.core.ctrl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Result;
 import com.mdp.core.entity.Tips;
@@ -10,6 +11,7 @@ import com.mdp.qx.HasRole;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
+import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmMyFocus;
 import com.xm.core.service.XmMyFocusService;
 import io.swagger.annotations.*;
@@ -64,9 +66,9 @@ public class XmMyFocusController {
 	public Result listXmMyFocus(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "pkList");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "pkList");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmMyFocus> qw = QueryTools.initQueryWrapper(XmMyFocus.class , params);
 		List<Map<String,Object>> datas = xmMyFocusService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmMyFocus列表
 
@@ -86,11 +88,9 @@ public class XmMyFocusController {
 	})
 	@HasRole
 	@RequestMapping(value="/myFocusForIndex",method=RequestMethod.GET)
-	public Result myFocusForIndex( ){
-		
-		
+	public Result myFocusForIndex( ){ 
 		List<Map<String,Object>>	xmMyFocusList = xmMyFocusService.myFocusForIndex(LoginUtils.getCurrentUserInfo().getUserid());
- 		
+ 		return Result.ok().setData(xmMyFocusList);
 		
 	}
 
@@ -101,9 +101,7 @@ public class XmMyFocusController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmMyFocus(@RequestBody XmMyFocus xmMyFocus) {
-		
-		Tips tips=new Tips("关注成功");
-		try{
+
 			User user = LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmMyFocus.getBizId())) {
 				return failed("bizId","业务编号不能为空");
@@ -122,13 +120,7 @@ public class XmMyFocusController {
 			}
 			xmMyFocusService.focus(xmMyFocus);
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 
@@ -138,9 +130,7 @@ public class XmMyFocusController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmMyFocus(@RequestBody XmMyFocus xmMyFocus){
-		
-		Tips tips=new Tips("成功取消关注");
-		try{
+
 			User user = LoginUtils.getCurrentUserInfo();
             if(!StringUtils.hasText(xmMyFocus.getBizId())) {
                  return failed("pk-not-exists","请上送主键参数bizId");
@@ -154,7 +144,7 @@ public class XmMyFocusController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmMyFocusService.unfocus(xmMyFocusDb);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	
@@ -165,9 +155,7 @@ public class XmMyFocusController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmMyFocus(@RequestBody XmMyFocus xmMyFocus) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmMyFocus.getUserid())) {
                  return failed("pk-not-exists","请上送主键参数userid");
             }
@@ -194,9 +182,7 @@ public class XmMyFocusController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmMyFocusMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			List<Map<String,Object>> pkList= (List<Map<String,Object>>) xmMyFocusMap.get("pkList");
 			if(pkList==null || pkList.size()==0){
 				return failed("pkList-0","pkList不能为空");
@@ -250,13 +236,7 @@ public class XmMyFocusController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	*/
@@ -268,7 +248,7 @@ public class XmMyFocusController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmMyFocus(@RequestBody List<XmMyFocus> xmMyFocuss) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmMyFocuss.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java

@@ -96,8 +96,7 @@ public class XmProductController {
 	public Result listXmProduct(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		String id= (String) params.get("id");
 		Object ids=  params.get("ids");
@@ -138,6 +137,7 @@ public class XmProductController {
 				params.put("platformBranchId",platformBranchId);
 			}
 		}
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProductService.selectListMapByWhere(page,qw,params);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProduct列表
 
@@ -150,8 +150,7 @@ public class XmProductController {
 	public Result listWithState(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		String id= (String) params.get("id");
 		Object ids=  params.get("ids");
@@ -193,9 +192,7 @@ public class XmProductController {
 	//@HasQx(value = "xm_core_xmProduct_copyTo",name = "通过复制创建产品/战略规划等",moduleId = "xm-project",moduleName = "管理端-产品管理系统")
 	@RequestMapping(value="/copyTo",method=RequestMethod.POST)
 	public Result copyTo(@RequestBody XmProductCopyVo xmProduct) {
-		
-		Tips tips=new Tips("拷贝成功");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			if( !StringUtils.hasText(xmProduct.getId())){
 				return failed("id-0","请上送原产品编号参数id");
@@ -217,13 +214,7 @@ public class XmProductController {
 			this.xmProductStateService.loadTasksToXmProductState(xmProductNew.getId());
 			xmRecordService.addXmProductRecord(xmProductNew.getId(),"通过拷贝创建产品","拷贝产品【"+xmProduct.getId()+"】【"+xmProduct.getProductName()+"】,创建新的产品【"+xmProductNew.getId()+"】【"+xmProductNew.getProductName()+"】","参数:"+ JSON.toJSONString(xmProduct),"");
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	
@@ -235,9 +226,7 @@ public class XmProductController {
 	//@HasQx(value = "xm_core_xmProduct_add",name = "创建产品/战略规划等",moduleId = "xm-project",moduleName = "管理端-产品管理系统")
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProduct(@RequestBody XmProductAddVo xmProduct) {
-		
-		Tips tips=new Tips("创建产品成功");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(StringUtils.isEmpty(xmProduct.getCode())) {
 				return failed("code-0","","产品代号不能为空");
@@ -312,9 +301,7 @@ public class XmProductController {
 	//@HasQx(value = "xm_core_xmProduct_unDel",name = "从回收站恢复产品等",moduleId = "xm-project",moduleName = "管理端-产品管理系统")
 	@RequestMapping(value="/unDel",method=RequestMethod.POST)
 	public Result unDelXmProduct(@RequestBody XmProduct xmProduct){
-		
-		Tips tips=new Tips("成功从回收站恢复产品");
-		try{
+
 			if(!StringUtils.hasText(xmProduct.getId())){
 				return failed("id-0","","产品编号不能为空");
 			}
@@ -351,13 +338,7 @@ public class XmProductController {
 			xmProductService.clearCache(xmProduct.getId());
 			xmRecordService.addXmProductRecord(xmProduct.getId(),"从回收站恢复产品",user.getUsername()+"从回收站恢复产品产品【"+xmProductDb.getId()+"】【"+xmProductDb.getProductName()+"】","",JSON.toJSONString(xmProductDb));
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	
@@ -369,9 +350,7 @@ public class XmProductController {
 	//@HasQx(value = "xm_core_xmProduct_del",name = "删除产品/战略规划等",moduleId = "xm-project",moduleName = "管理端-产品管理系统")
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProduct(@RequestBody XmProduct xmProduct){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			if(!StringUtils.hasText(xmProduct.getId())){
 				return failed("id-0","","产品编号不能为空");
 			}
@@ -418,9 +397,7 @@ public class XmProductController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmProductMap) {
-		
-		Tips tips=new Tips("成功更新");
-		try{
+
 			List<String> ids= (List<String>) xmProductMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -492,13 +469,7 @@ public class XmProductController {
 			if(StringUtils.hasText(xmProduct.getAdmUserid()) && !xmProduct.getAdmUserid().equals(xmProductDb.getAdmUserid())){
 				notifyMsgService.pushMsg(user,xmProduct.getAdmUserid(),xmProduct.getAdmUsername(),"3",xmProductDb.getId(),xmProductDb.getId(),"您成为产品【"+xmProductDb.getProductName()+"】的产品总监，请及时跟进。");
 			}
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	
@@ -510,19 +481,11 @@ public class XmProductController {
 	//@HasQx(value = "xm_core_xmProduct_createProductCode",name = "创建产品代号",moduleId = "xm-project",moduleName = "管理端-产品管理系统")
 	@RequestMapping(value="/createProductCode",method=RequestMethod.POST)
 	public Result createProductCode() {
-		
-		Tips tips=new Tips("成功创建产品代号");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			String data=this.xmProductService.createProductCode(user.getBranchId());
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -535,9 +498,7 @@ public class XmProductController {
 	//@HasQx(value = "xm_core_xmProduct_edit",name = "修改产品/战略规划等基本信息",moduleId = "xm-project",moduleName = "管理端-产品管理系统")
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProduct(@RequestBody XmProduct xmProduct) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 
 			if(!StringUtils.hasText(xmProduct.getId())){
 				return failed("id-0","","产品编号不能为空");
@@ -583,9 +544,7 @@ public class XmProductController {
 	//@HasQx(value = "xm_core_xmProduct_batchDel",name = "批量删除产品/战略规划等基本信息",moduleId = "xm-project",moduleName = "管理端-产品管理系统")
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProduct(@RequestBody List<XmProduct> xmProducts) {
-		
-		Tips tips=new Tips("成功删除"+xmProducts.size()+"条数据"); 
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
  			List<XmProduct> canDelList=new ArrayList<>();
 			List<Tips> errTips=new ArrayList<>();

xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java

@@ -66,15 +66,12 @@ public class XmProductProjectLinkController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProductProjectLink(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "projectIds");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "projectIds");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProductProjectLinkService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProductProjectLink列表
 		
-		
-		
-		
 	}
 	
  
@@ -85,9 +82,7 @@ public class XmProductProjectLinkController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProductProjectLink(@RequestBody XmProductProjectLink xmProductProjectLink) {
-		
-		Tips tips=new Tips("成功加入");
-		try{
+
 			User user = LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmProductProjectLink.getProductId())){
 				return ResponseHelper.failed("productId-0","产品编号不能为空");
@@ -123,9 +118,7 @@ public class XmProductProjectLinkController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProductProjectLink(@RequestBody XmProductProjectLink xmProductProjectLink){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			User user = LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmProductProjectLink.getProductId())){
 				return ResponseHelper.failed("productId-0","产品编号不能为空");
@@ -143,7 +136,7 @@ public class XmProductProjectLinkController {
 				return ResponseHelper.failed("tasks-not-0","存在至少"+tasks.size()+"个任务与产品关联，不能移出.关联任务【"+tasks.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
 			}
 			xmProductProjectLinkService.deleteByPk(xmProductProjectLink);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	
@@ -154,9 +147,7 @@ public class XmProductProjectLinkController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProductProjectLink(@RequestBody XmProductProjectLink xmProductProjectLink) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmProductProjectLinkService.updateByPk(xmProductProjectLink);
 		
 	}
@@ -168,9 +159,7 @@ public class XmProductProjectLinkController {
 	})
  	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields(@RequestBody Map<String,Object> map) {
-		
-		Tips tips=new Tips("成功更新");
-		try{
+
 			List<Map<String,Object>> ids= (List<Map<String, Object>>) map.get("pkList");
 
 			if(ids==null || ids.size()==0){
@@ -192,13 +181,7 @@ public class XmProductProjectLinkController {
 				return ResponseHelper.failed("fieldKey-0","没有需要更新的字段");
 			}
 			this.xmProductProjectLinkService.editSomeFields(map);
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	
@@ -210,10 +193,10 @@ public class XmProductProjectLinkController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProductProjectLink(@RequestBody List<XmProductProjectLink> xmProductProjectLinks) {
 		
-		Tips tips=new Tips("成功删除"+xmProductProjectLinks.size()+"条数据"); 
+		
 		
 			xmProductProjectLinkService.batchDelete(xmProductProjectLinks);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java

@@ -96,17 +96,14 @@ public class XmProductStateController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProductState(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user= LoginUtils.getCurrentUserInfo();
 		params.put("branchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProductStateService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProductState列表
 		
-		
-		
-		
 	}
 	@ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmProductState")
 	@ApiResponses({
@@ -115,10 +112,10 @@ public class XmProductStateController {
 	@RequestMapping(value="/loadTasksToXmProductState",method=RequestMethod.POST)
 	public Result loadTasksToXmProductState(@RequestBody Map<String,Object> params) {
 		
-		Tips tips=new Tips("成功修改数据"); 
+		
 		
 			int i= xmProductStateService.loadTasksToXmProductState((String) params.get("productId"));
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}  
 	
@@ -129,9 +126,7 @@ public class XmProductStateController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProductState(@RequestBody XmProductState xmProductState) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProductState.getId())) {
 				xmProductState.setId(xmProductStateService.createKey("id"));
 			}else{
@@ -154,11 +149,9 @@ public class XmProductStateController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProductState(@RequestBody XmProductState xmProductState){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmProductStateService.deleteByPk(xmProductState);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -170,9 +163,7 @@ public class XmProductStateController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProductState(@RequestBody XmProductState xmProductState) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmProductStateService.updateByPk(xmProductState);
 		
 	}
@@ -188,10 +179,10 @@ public class XmProductStateController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProductState(@RequestBody List<XmProductState> xmProductStates) {
 		
-		Tips tips=new Tips("成功删除"+xmProductStates.size()+"条数据"); 
+		
 		
 			xmProductStateService.batchDelete(xmProductStates);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java

@@ -55,11 +55,11 @@ public class XmProductStateHisController {
 	public Result listXmProductStateHis(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "pkList");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "pkList");		
 		IPage page=QueryTools.initPage(params);
 		User user= LoginUtils.getCurrentUserInfo();
 		params.put("branchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = QueryTools.xmProductStateHisService(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProductStateHis列表
 
@@ -74,9 +74,7 @@ public class XmProductStateHisController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProductStateHis(@RequestBody XmProductStateHis xmProductStateHis) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmProductStateHis.getProductId())) {
 			    createPk=true;
@@ -103,9 +101,7 @@ public class XmProductStateHisController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProductStateHis(@RequestBody XmProductStateHis xmProductStateHis){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmProductStateHis.getProductId())) {
                  return failed("pk-not-exists","请上送主键参数productId");
             }
@@ -117,7 +113,7 @@ public class XmProductStateHisController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmProductStateHisService.deleteByPk(xmProductStateHis);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -129,9 +125,7 @@ public class XmProductStateHisController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProductStateHis(@RequestBody XmProductStateHis xmProductStateHis) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmProductStateHis.getProductId())) {
                  return failed("pk-not-exists","请上送主键参数productId");
             }
@@ -157,10 +151,10 @@ public class XmProductStateHisController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProductStateHis(@RequestBody List<XmProductStateHis> xmProductStateHiss) {
 		
-		Tips tips=new Tips("成功删除"+xmProductStateHiss.size()+"条数据"); 
+		
 		
 			xmProductStateHisService.batchDelete(xmProductStateHiss);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java

@@ -56,8 +56,7 @@ public class XmProjectContractController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectContract(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		RequestUtils.transformArray(params, "htIds");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "htIds");		
 		IPage page=QueryTools.initPage(params);
 		
 		
@@ -72,9 +71,7 @@ public class XmProjectContractController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectContract(@RequestBody XmProjectContract xmProjectContract) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectContract.getHtId())) {
 				xmProjectContract.setHtId(xmProjectContractService.createKey("htId"));
 			}else{
@@ -97,11 +94,9 @@ public class XmProjectContractController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectContract(@RequestBody XmProjectContract xmProjectContract){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmProjectContractService.deleteByPk(xmProjectContract);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -113,9 +108,7 @@ public class XmProjectContractController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProjectContract(@RequestBody XmProjectContract xmProjectContract) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmProjectContractService.updateByPk(xmProjectContract);
 		
 	}
@@ -131,10 +124,10 @@ public class XmProjectContractController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProjectContract(@RequestBody List<XmProjectContract> xmProjectContracts) {
 		
-		Tips tips=new Tips("成功删除"+xmProjectContracts.size()+"条数据"); 
+		
 		
 			xmProjectContractService.batchDelete(xmProjectContracts);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

@@ -94,8 +94,7 @@ public class XmProjectController {
 	public Result listXmProject(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		RequestUtils.transformArray(params, "ids"); 
-		RequestUtils.transformArray(params, "pgTypeIds");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "pgTypeIds");		
 		IPage page=QueryTools.initPage(params);
 		String id= (String) params.get("id");
 		Object ids=  params.get("ids");
@@ -120,6 +119,7 @@ public class XmProjectController {
 		}
 		params.put("linkBranchId",user.getBranchId());
 		params.put("platformBranchId",platformBranchId);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProjectService.getProject(params);	//列出XmProject列表
 		return Result.ok().setData(datas);
 		
@@ -135,9 +135,7 @@ public class XmProjectController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmProjectMap) {
-		
-		Tips tips=new Tips("成功更新");
-		try{
+
 			List<String> ids= (List<String>) xmProjectMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -212,13 +210,7 @@ public class XmProjectController {
 				notifyMsgService.pushMsg(user,xmProject.getAdmUserid(),xmProject.getAdmUsername(),"1",xmProjectDb.getId(),xmProjectDb.getId(),"您成为项目【"+xmProjectDb.getName()+"】的项目总监，请及时跟进。");
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -229,9 +221,7 @@ public class XmProjectController {
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	//@HasQx(value = "xm_core_xmProject_add",name = "创建项目",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	public Result addXmProject(@RequestBody XmProjectVo xmProjectVo) {
-		
-		Tips tips=new Tips("成功创建项目");
-		try{
+
 			if(!StringUtils.hasText(xmProjectVo.getName())){
 				return failed("name-0","项目名称不能为空");
 			}
@@ -269,13 +259,7 @@ public class XmProjectController {
 			xmProjectStateService.loadTasksToXmProjectState(xmProjectVo.getId());
 				
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "从回收站恢复项目",notes="unDelXmProject,仅需要上传主键字段")
@@ -285,9 +269,7 @@ public class XmProjectController {
 	@RequestMapping(value="/unDel",method=RequestMethod.POST)
 	//@HasQx(value = "xm_core_xmProject_unDel",name = "从回收站恢复项目",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	public Result unDelXmProject(@RequestBody XmProject xmProject){
-		
-		Tips tips=new Tips("成功从回收站恢复项目");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId());
 			if(xmProjectDb==null){
@@ -312,13 +294,7 @@ public class XmProjectController {
 				tips.setFailureMsg("您不是该项目管理人员，无权从回收站恢复项目");
 			}
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "删除一条xm_project信息",notes="delXmProject,仅需要上传主键字段")
@@ -328,9 +304,7 @@ public class XmProjectController {
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	//@HasQx(value = "xm_core_xmProject_del",name = "删除项目",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	public Result delXmProject(@RequestBody XmProject xmProject){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			if(xmProject==null || StringUtils.isEmpty(xmProject.getId())){
 				return failed("id-0","项目编号不能为空");
@@ -356,7 +330,7 @@ public class XmProjectController {
 				tips.setFailureMsg("您不是该项目管理人员，无权删除");
 			}
 
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	
@@ -367,9 +341,7 @@ public class XmProjectController {
 	//@HasQx(value = "xm_core_xmProject_editAssess",name = "修改项目估算",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editAssess",method=RequestMethod.POST)
 	public Result editXmProjectAssess(@RequestBody XmProject xmProject) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 
 			User user= LoginUtils.getCurrentUserInfo();
 			if( !StringUtils.hasText(xmProject.getId())){
@@ -387,13 +359,7 @@ public class XmProjectController {
 			xmProjectService.clearProject(xmProject.getId());
 			xmRecordService.addXmProjectRecord(xmProject.getId(),"项目-项目估算","修改项目【"+xmProjectDb.getName()+"】的预算数据", JSON.toJSONString(xmProject), JSON.toJSONString(xmProjectDb));
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "创建项目代号",notes="createProjectCode")
@@ -403,19 +369,11 @@ public class XmProjectController {
 	//@HasQx(value = "xm_core_xmProject_createProjectCode",name = "创建项目代号",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/createProjectCode",method=RequestMethod.POST)
 	public Result createProjectCode() {
-		
-		Tips tips=new Tips("创建项目代号成功");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			String code=this.xmProjectService.createProjectCode(user.getBranchId());
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "根据主键修改一条xm_project信息",notes="editXmProject")
@@ -425,9 +383,7 @@ public class XmProjectController {
 	//@HasQx(value = "xm_core_xmProject_editStatus",name = "修改项目状态",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editStatus",method=RequestMethod.POST)
 	public Result editXmProjectStatus(@RequestBody XmProject xmProject) {
-		
-		Tips tips=new Tips("状态更新成功");
-		try{
+
 
 			User user= LoginUtils.getCurrentUserInfo();
 			if( !StringUtils.hasText(xmProject.getId())){
@@ -447,13 +403,7 @@ public class XmProjectController {
 
 
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	
@@ -464,9 +414,7 @@ public class XmProjectController {
 	//@HasQx(value = "xm_core_xmProject_editBudget",name = "修改项目预算",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editBudget",method=RequestMethod.POST)
 	public Result editBudget(@RequestBody XmProject xmProject) {
-		
-		Tips tips=new Tips("预算更新成功");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			if( !StringUtils.hasText(xmProject.getId())){
 				return failed("id-0","项目编号不能为空");
@@ -484,13 +432,7 @@ public class XmProjectController {
 			xmRecordService.addXmProjectRecord(xmProject.getId(),"项目-项目预算","修改项目【"+xmProjectDb.getName()+"】的预算数据", JSON.toJSONString(xmProject), JSON.toJSONString(xmProjectDb));
 
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -505,9 +447,7 @@ public class XmProjectController {
 	//@HasQx(value = "xm_core_xmProject_edit",name = "修改项目基础信息",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProject(@RequestBody XmProject xmProject) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			if( !StringUtils.hasText(xmProject.getId())){
 				return failed("id-0","项目编号不能为空");
@@ -548,9 +488,7 @@ public class XmProjectController {
 	//@HasQx(value = "xm_core_xmProject_copy_to",name = "存为新项目",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/copyTo",method=RequestMethod.POST)
 	public Result copyTo(@RequestBody XmProjectCopyVo xmProject) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			if( !StringUtils.hasText(xmProject.getId())){
 				return failed("id-0","请上送原项目编号参数id");
@@ -578,13 +516,7 @@ public class XmProjectController {
 			xmProjectStateService.loadTasksToXmProjectState(xmProjectTo.getId());
 			xmRecordService.addXmProjectRecord(xmProjectTo.getId(),"项目-通过拷贝创建新项目","拷贝项目【"+xmProjectTo.getName()+"】,创建新的项目【】", JSON.toJSONString(xmProjectTo), JSON.toJSONString(xmProjectDb));
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -597,10 +529,10 @@ public class XmProjectController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProject(@RequestBody List<XmProject> xmProjects) {
 		
-		Tips tips=new Tips("成功删除"+xmProjects.size()+"条数据"); 
+		
 		
 			xmProjectService.batchDelete(xmProjects);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/
@@ -628,7 +560,7 @@ public class XmProjectController {
 	@RequestMapping(value="/processApprova",method=RequestMethod.POST)
 	public Result processApprova( @RequestBody Map<String,Object> flowVars){
 		
-		Tips tips=new Tips("成功新增一条数据");
+		
 		  
 		
 			

xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java

@@ -71,15 +71,12 @@ public class XmProjectKpiController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectKpi(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProjectKpiService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectKpi列表
 		
-		
-		
-		
 	}
 	
  
@@ -91,9 +88,7 @@ public class XmProjectKpiController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectKpi(@RequestBody XmProjectKpi xmProjectKpi) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectKpi.getId())) {
 				xmProjectKpi.setId(xmProjectKpiService.createKey("id"));
 			}else{
@@ -116,9 +111,7 @@ public class XmProjectKpiController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectKpi(@RequestBody XmProjectKpi xmProjectKpi){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmProjectKpiService.deleteByPk(xmProjectKpi);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
 		
@@ -132,9 +125,7 @@ public class XmProjectKpiController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProjectKpi(@RequestBody XmProjectKpi xmProjectKpi) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmProjectKpiService.updateByPk(xmProjectKpi);
 		
 	}
@@ -150,7 +141,7 @@ public class XmProjectKpiController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProjectKpi(@RequestBody List<XmProjectKpi> xmProjectKpis) {
 		
-		Tips tips=new Tips("成功删除"+xmProjectKpis.size()+"条数据"); 
+		
 		
 			xmProjectKpiService.batchDelete(xmProjectKpis);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());

xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java

@@ -74,15 +74,12 @@ public class XmProjectKpiHisController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectKpiHis(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "kpiIds");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "kpiIds");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProjectKpiHisService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectKpiHis列表
 		
-		
-		
-		
 	}
 	
  
@@ -94,9 +91,7 @@ public class XmProjectKpiHisController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectKpiHis(@RequestBody XmProjectKpiHis xmProjectKpiHis) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectKpiHis.getKpiId())) {
 				xmProjectKpiHis.setKpiId(xmProjectKpiHisService.createKey("kpiId"));
 			}else{
@@ -119,9 +114,7 @@ public class XmProjectKpiHisController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectKpiHis(@RequestBody XmProjectKpiHis xmProjectKpiHis){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmProjectKpiHisService.deleteByPk(xmProjectKpiHis);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
 		
@@ -135,9 +128,7 @@ public class XmProjectKpiHisController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProjectKpiHis(@RequestBody XmProjectKpiHis xmProjectKpiHis) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmProjectKpiHisService.updateByPk(xmProjectKpiHis);
 		
 	}
@@ -153,7 +144,7 @@ public class XmProjectKpiHisController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProjectKpiHis(@RequestBody List<XmProjectKpiHis> xmProjectKpiHiss) {
 		
-		Tips tips=new Tips("成功删除"+xmProjectKpiHiss.size()+"条数据"); 
+		
 		
 			xmProjectKpiHisService.batchDelete(xmProjectKpiHiss);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());

xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java

@@ -117,17 +117,14 @@ public class XmProjectStateController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectState(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user= LoginUtils.getCurrentUserInfo();
 		params.put("branchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProjectStateService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectState列表
 		
-		
-		
-		
 	}
 
 	@ApiOperation( value = "查询功能状态表,无需前端维护，所有数据由汇总统计得出信息列表",notes="listXmProductState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
@@ -138,17 +135,13 @@ public class XmProjectStateController {
 	@RequestMapping(value="/list/portal",method=RequestMethod.GET)
 	public Result listXmProductStateForPortal(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		List<Map<String,Object>>	xmProjectStateList =null;	//列出XmProductState列表
 		if(xmProjectStateList==null){
 			xmProjectStateList=xmProjectStateService.selectPortalProjectStates(xmProductState);
  		}
 		
-		
-		
-		
 	}
 	 
 	 
@@ -158,16 +151,14 @@ public class XmProjectStateController {
 	}) 
 	@RequestMapping(value="/loadTasksToXmProjectState",method=RequestMethod.POST)
 	public Result loadTasksToXmProjectState(@RequestBody XmProjectState xmProjectState){
-		
-		Tips tips=new Tips("成功更新一条项目数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectState.getProjectId())) {
 				tips.setFailureMsg("项目编号projectId必填");
 			}else {
 	
 				xmProjectStateService.loadTasksToXmProjectState(xmProjectState.getProjectId());
 			}
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "从结算单抽取实际成本等统计数据更新到状态报告中",notes="")
@@ -176,16 +167,14 @@ public class XmProjectStateController {
 	}) 
 	@RequestMapping(value="/loadTasksSettleToXmProjectState",method=RequestMethod.POST)
 	public Result loadTasksSettleToXmProjectState(@RequestBody XmProjectState xmProjectState){
-		
-		Tips tips=new Tips("成功更新一条项目数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectState.getProjectId())) {
 				tips.setFailureMsg("项目编号projectId必填");
 			}else {
 	
 				xmProjectStateService.loadTasksSettleToXmProjectState(xmProjectState.getProjectId());
 			}
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	/**
@@ -195,9 +184,7 @@ public class XmProjectStateController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectState(@RequestBody XmProjectState xmProjectState) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectState.getId())) {
 				xmProjectState.setId(xmProjectStateService.createKey("id"));
 			}else{
@@ -220,11 +207,9 @@ public class XmProjectStateController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectState(@RequestBody XmProjectState xmProjectState){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmProjectStateService.deleteByPk(xmProjectState);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -236,9 +221,7 @@ public class XmProjectStateController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProjectState(@RequestBody XmProjectState xmProjectState) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmProjectStateService.updateByPk(xmProjectState);
 		
 	}
@@ -254,10 +237,10 @@ public class XmProjectStateController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProjectState(@RequestBody List<XmProjectState> xmProjectStates) {
 		
-		Tips tips=new Tips("成功删除"+xmProjectStates.size()+"条数据"); 
+		
 		
 			xmProjectStateService.batchDelete(xmProjectStates);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java

@@ -113,17 +113,14 @@ public class XmProjectStateHisController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectStateHis(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user= LoginUtils.getCurrentUserInfo();
 		params.put("branchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProjectStateHisService.selectListMapByWhere(page,qw,params);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectStateHis列表
 		
-		
-		
-		
 	}
 	
  
@@ -135,9 +132,7 @@ public class XmProjectStateHisController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectStateHis(@RequestBody XmProjectStateHis xmProjectStateHis) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectStateHis.getId())) {
 				xmProjectStateHis.setId(xmProjectStateHisService.createKey("id"));
 			}else{
@@ -160,11 +155,9 @@ public class XmProjectStateHisController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectStateHis(@RequestBody XmProjectStateHis xmProjectStateHis){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmProjectStateHisService.deleteByPk(xmProjectStateHis);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -176,9 +169,7 @@ public class XmProjectStateHisController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProjectStateHis(@RequestBody XmProjectStateHis xmProjectStateHis) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmProjectStateHisService.updateByPk(xmProjectStateHis);
 		
 	}
@@ -194,10 +185,10 @@ public class XmProjectStateHisController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProjectStateHis(@RequestBody List<XmProjectStateHis> xmProjectStateHiss) {
 		
-		Tips tips=new Tips("成功删除"+xmProjectStateHiss.size()+"条数据"); 
+		
 		
 			xmProjectStateHisService.batchDelete(xmProjectStateHiss);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java

@@ -77,15 +77,12 @@ public class XmProjectTaskTypeStateController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmProjectTaskTypeState(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmProjectTaskTypeStateService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectTaskTypeState列表
 		
-		
-		
-		
 	}
 	
 	@ApiOperation( value = "从任务表汇总数据到项目任务类型汇总表",notes="")
@@ -94,16 +91,14 @@ public class XmProjectTaskTypeStateController {
 	}) 
 	@RequestMapping(value="/loadTasksToXmProjectTaskTypeState",method=RequestMethod.POST)
 	public Result loadTasksToXmProjectTaskTypeState(@RequestBody XmProjectTaskTypeState xmProjectTaskTypeState){
-		
-		Tips tips=new Tips("成功更新一个项目数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectTaskTypeState.getProjectId())) {
 				tips.setFailureMsg("项目编号projectId必填");
 			}else {
 	
 				xmProjectTaskTypeStateService.loadTasksToXmProjectTaskTypeState(xmProjectTaskTypeState.getBranchId());
 			}
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	
@@ -114,9 +109,7 @@ public class XmProjectTaskTypeStateController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmProjectTaskTypeState(@RequestBody XmProjectTaskTypeState xmProjectTaskTypeState) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmProjectTaskTypeState.getId())) {
 				xmProjectTaskTypeState.setId(xmProjectTaskTypeStateService.createKey("id"));
 			}else{
@@ -139,11 +132,9 @@ public class XmProjectTaskTypeStateController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmProjectTaskTypeState(@RequestBody XmProjectTaskTypeState xmProjectTaskTypeState){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmProjectTaskTypeStateService.deleteByPk(xmProjectTaskTypeState);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -155,9 +146,7 @@ public class XmProjectTaskTypeStateController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmProjectTaskTypeState(@RequestBody XmProjectTaskTypeState xmProjectTaskTypeState) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmProjectTaskTypeStateService.updateByPk(xmProjectTaskTypeState);
 		
 	}
@@ -173,10 +162,10 @@ public class XmProjectTaskTypeStateController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmProjectTaskTypeState(@RequestBody List<XmProjectTaskTypeState> xmProjectTaskTypeStates) {
 		
-		Tips tips=new Tips("成功删除"+xmProjectTaskTypeStates.size()+"条数据"); 
+		
 		
 			xmProjectTaskTypeStateService.batchDelete(xmProjectTaskTypeStates);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java

@@ -102,8 +102,7 @@ public class XmQuestionController {
 		 
 		RequestUtils.transformArray(params, "ids");
 		RequestUtils.transformArray(params, "menuIds");
-		RequestUtils.transformArray(params, "tagIdList");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "tagIdList");		
 		IPage page=QueryTools.initPage(params);
 		User user = LoginUtils.getCurrentUserInfo();
 		if(LoginUtils.isBranchAdmin()){
@@ -132,9 +131,6 @@ public class XmQuestionController {
 		List<Map<String,Object>>	datas = xmQuestionService.getQuestion(params);	//列出XmQuestion列表
 		return Result.ok().setData(datas);
 		
-		
-		
-		
 	}
 
 
@@ -162,8 +158,7 @@ public class XmQuestionController {
 	}
 	@RequestMapping(value="/getXmQuestionSort",method=RequestMethod.GET)
 	public Result getXmQuestionSort(@ApiIgnore @RequestParam Map<String,Object> params){
-		User user=LoginUtils.getCurrentUserInfo();
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		User user=LoginUtils.getCurrentUserInfo();		
 		IPage page=QueryTools.initPage(params);
 		xmQuestion.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionSort(xmQuestion);
@@ -181,9 +176,7 @@ public class XmQuestionController {
 	//@HasQx(value = "xm_core_xmQuestion_add",name = "新增bug",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmQuestion(@RequestBody XmQuestionVo xmQuestionVo) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(!StringUtils.hasText(xmQuestionVo.getProjectId())){
 				tips.setFailureMsg("项目编号projectId必传");
 				m.put("tips", tips);
@@ -239,11 +232,9 @@ public class XmQuestionController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmQuestion(@RequestBody XmQuestion xmQuestion){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmQuestionService.deleteByPk(xmQuestion);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -255,9 +246,7 @@ public class XmQuestionController {
 	//@HasQx(value = "xm_core_xmQuestion_edit",name = "修改bug",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmQuestion(@RequestBody XmQuestionVo xmQuestionVo) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 
 
 			if(!StringUtils.hasText(xmQuestionVo.getId())){
@@ -283,9 +272,7 @@ public class XmQuestionController {
 	//@HasQx(value = "xm_core_xmQuestion_editStatus",name = "修改bug状态",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editStatus",method=RequestMethod.POST)
 	public Result editStatus(@RequestBody XmQuestion xmQuestion) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 
 			if(!StringUtils.hasText(xmQuestion.getId())){
 				return failed("id-0","编号不能为空");
@@ -302,13 +289,7 @@ public class XmQuestionController {
 				xmPushMsgService.pushPrichatMsgToIm(user.getBranchId(), user.getUserid(), user.getUsername(), xmQuestion.getHandlerUserid(),xmQuestion.getHandlerUsername(), user.getUsername()+"修改bug【"+xmQuestion.getName()+"】状态");
 			}
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -321,9 +302,7 @@ public class XmQuestionController {
 	//@HasQx(value = "xm_core_xmQuestion_editSomeFields",name = "修改bug的某些字段",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields(@RequestBody Map<String,Object> xmQuestionMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			List<String> ids= (List<String>) xmQuestionMap.get("ids");
 
@@ -448,13 +427,7 @@ public class XmQuestionController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -464,9 +437,7 @@ public class XmQuestionController {
 	}) 
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmQuestion(@RequestBody List<XmQuestion> xmQuestions) {
-		
-		Tips tips=new Tips("成功删除"+xmQuestions.size()+"条数据"); 
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(xmQuestions==null || xmQuestions.size()==0){
 				return ResponseHelper.failed("p-0","参数不能为空");
@@ -709,7 +680,7 @@ public class XmQuestionController {
 	@RequestMapping(value="/processApprova",method=RequestMethod.POST)
 	public Result processApprova( @RequestBody Map<String,Object> flowVars){
 		
-		Tips tips=new Tips("成功新增一条数据");
+		
 		  
 		
 			

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java

@@ -74,15 +74,12 @@ public class XmQuestionHandleController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmQuestionHandle(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmQuestionHandleService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmQuestionHandle列表
 		
-		
-		
-		
 	}
 	
  
@@ -93,9 +90,7 @@ public class XmQuestionHandleController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmQuestionHandle(@RequestBody XmQuestionHandle xmQuestionHandle) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmQuestionHandle.getId())) {
 				xmQuestionHandle.setId(xmQuestionHandleService.createKey("id"));
 			}else{
@@ -108,13 +103,7 @@ public class XmQuestionHandleController {
 			}
 			xmQuestionHandleService.insert(xmQuestionHandle);
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 	
@@ -125,11 +114,9 @@ public class XmQuestionHandleController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmQuestionHandle(@RequestBody XmQuestionHandle xmQuestionHandle){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmQuestionHandleService.deleteByPk(xmQuestionHandle);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -141,9 +128,7 @@ public class XmQuestionHandleController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmQuestionHandle(@RequestBody XmQuestionHandle xmQuestionHandle) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmQuestionHandleService.updateByPk(xmQuestionHandle);
 		
 	}
@@ -159,10 +144,10 @@ public class XmQuestionHandleController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmQuestionHandle(@RequestBody List<XmQuestionHandle> xmQuestionHandles) {
 		
-		Tips tips=new Tips("成功删除"+xmQuestionHandles.size()+"条数据"); 
+		
 		
 			xmQuestionHandleService.batchDelete(xmQuestionHandles);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java

@@ -62,15 +62,12 @@ public class XmQuestionTagController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmQuestionTag(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmQuestionTagService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmQuestionTag列表
 		
-		
-		
-		
 	}
 	
  
@@ -82,9 +79,7 @@ public class XmQuestionTagController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmQuestionTag(@RequestBody XmQuestionTag xmQuestionTag) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmQuestionTag.getId())) {
 				xmQuestionTag.setId(xmQuestionTagService.createKey("id"));
 			}else{
@@ -107,11 +102,9 @@ public class XmQuestionTagController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmQuestionTag(@RequestBody XmQuestionTag xmQuestionTag){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmQuestionTagService.deleteByPk(xmQuestionTag);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -123,9 +116,7 @@ public class XmQuestionTagController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmQuestionTag(@RequestBody XmQuestionTag xmQuestionTag) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmQuestionTagService.updateByPk(xmQuestionTag);
 		
 	}
@@ -141,10 +132,10 @@ public class XmQuestionTagController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmQuestionTag(@RequestBody List<XmQuestionTag> xmQuestionTags) {
 		
-		Tips tips=new Tips("成功删除"+xmQuestionTags.size()+"条数据"); 
+		
 		
 			xmQuestionTagService.batchDelete(xmQuestionTags);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java

@@ -71,15 +71,12 @@ public class XmRecordController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmRecord(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmRecordService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmRecord列表
 		
-		
-		
-		
 	}
 	
  
@@ -91,9 +88,7 @@ public class XmRecordController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmRecord(@RequestBody XmRecord xmRecord) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmRecord.getId())) {
 				xmRecord.setId(xmRecordService.createKey("id"));
 			}else{
@@ -116,9 +111,7 @@ public class XmRecordController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmRecord(@RequestBody XmRecord xmRecord){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmRecordService.deleteByPk(xmRecord);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
 		
@@ -132,9 +125,7 @@ public class XmRecordController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmRecord(@RequestBody XmRecord xmRecord) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmRecordService.updateByPk(xmRecord);
 		
 	}
@@ -150,7 +141,7 @@ public class XmRecordController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmRecord(@RequestBody List<XmRecord> xmRecords) {
 		
-		Tips tips=new Tips("成功删除"+xmRecords.size()+"条数据"); 
+		
 		
 			xmRecordService.batchDelete(xmRecords);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());

xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java

@@ -66,9 +66,9 @@ public class XmRecordVisitController {
 	public Result listXmRecordVisit(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmRecordVisitService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmRecordVisit列表
 
@@ -82,9 +82,7 @@ public class XmRecordVisitController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(!StringUtils.hasText(xmRecordVisit.getBizId())){
 				return ResponseHelper.failed("bizId-0","bizId不能为空");
 			}
@@ -112,13 +110,7 @@ public class XmRecordVisitController {
 
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 
@@ -140,9 +132,7 @@ public class XmRecordVisitController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmRecordVisit.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -151,7 +141,7 @@ public class XmRecordVisitController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmRecordVisitService.deleteByPk(xmRecordVisit);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -163,9 +153,7 @@ public class XmRecordVisitController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmRecordVisit.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -186,9 +174,7 @@ public class XmRecordVisitController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmRecordVisitMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmRecordVisitMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -240,13 +226,7 @@ public class XmRecordVisitController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	*/
@@ -259,7 +239,7 @@ public class XmRecordVisitController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmRecordVisit(@RequestBody List<XmRecordVisit> xmRecordVisits) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmRecordVisits.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java

@@ -61,11 +61,11 @@ public class XmRptConfigController {
 	public Result listXmRptConfig(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("cbranchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmRptConfigService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmRptConfig列表
 
@@ -79,9 +79,7 @@ public class XmRptConfigController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmRptConfig(@RequestBody XmRptConfig xmRptConfig) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			xmRptConfig.setId(xmRptConfigService.createKey("id"));
 			User user= LoginUtils.getCurrentUserInfo();
 			xmRptConfig.setCuserid(user.getUserid());
@@ -98,9 +96,7 @@ public class XmRptConfigController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmRptConfig(@RequestBody XmRptConfig xmRptConfig){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmRptConfig.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -109,7 +105,7 @@ public class XmRptConfigController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmRptConfigService.deleteByPk(xmRptConfig);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -119,9 +115,7 @@ public class XmRptConfigController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmRptConfig(@RequestBody XmRptConfig xmRptConfig) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmRptConfig.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -140,9 +134,7 @@ public class XmRptConfigController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmRptConfigMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmRptConfigMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -194,13 +186,7 @@ public class XmRptConfigController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -211,7 +197,7 @@ public class XmRptConfigController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmRptConfig(@RequestBody List<XmRptConfig> xmRptConfigs) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmRptConfigs.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java

@@ -64,11 +64,11 @@ public class XmRptDataController {
 	public Result listXmRptData(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("cbranchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmRptDataService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmRptData列表
 
@@ -82,9 +82,7 @@ public class XmRptDataController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmRptData(@RequestBody XmRptData xmRptData) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			xmRptData.setId(xmRptDataService.createKey("id"));
 			User user= LoginUtils.getCurrentUserInfo();
 			xmRptData.setCuserid(user.getUserid());
@@ -94,13 +92,7 @@ public class XmRptDataController {
 			xmRptData.setBizDate(DateUtils.getDate("yyyy-MM-dd"));
 			xmRptDataService.insert(xmRptData);
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 
@@ -110,9 +102,7 @@ public class XmRptDataController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmRptData(@RequestBody XmRptData xmRptData){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmRptData.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -125,7 +115,7 @@ public class XmRptDataController {
 				return failed("not-yours","只能删除自己创建的报表");
 			}
 			xmRptDataService.deleteByPk(xmRptData);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	
@@ -136,9 +126,7 @@ public class XmRptDataController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmRptData(@RequestBody XmRptData xmRptData) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmRptData.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -159,9 +147,7 @@ public class XmRptDataController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmRptDataMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmRptDataMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -213,13 +199,7 @@ public class XmRptDataController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	*/
@@ -232,7 +212,7 @@ public class XmRptDataController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmRptData(@RequestBody List<XmRptData> xmRptDatas) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmRptDatas.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java

@@ -89,9 +89,9 @@ public class XmTaskBidOrderController {
 	public Result listXmTaskBidOrder(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTaskBidOrderService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTaskBidOrder列表
 
@@ -115,9 +115,7 @@ public class XmTaskBidOrderController {
 	})
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTaskBidOrder(@RequestBody AddXmTaskBidOrderVo bidOrderVo) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(!StringUtils.hasText(bidOrderVo.getTaskId())){
 				return ResponseHelper.failed("taskId-0","任务编号不能为空");
 			}
@@ -203,13 +201,7 @@ public class XmTaskBidOrderController {
 				msgService.pushMsg(user,user.getUserid(),user.getUsername(),"2",order.getProjectId(),order.getTaskId(),"您为任务支付"+remark+order.getFinalFee()+"元订单提交成功，请及时付款");
 			}
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -239,7 +231,7 @@ public class XmTaskBidOrderController {
 	public Result orderPaySuccess(@RequestBody XmTaskBidOrder order) {
 		
 		try {
-			Tips tips=new Tips("操作成功");
+			
 			if(!StringUtils.hasText(order.getId())) {
 				return failed("data-0","订单Id不能为空");
 			}
@@ -268,7 +260,7 @@ public class XmTaskBidOrderController {
 	public Result payCancel(@RequestBody XmTaskBidOrder order) {
 		
 		try {
-			Tips tips=new Tips("操作成功");
+			
 			if(!StringUtils.hasText(order.getId())) {
 				return failed("data-0","订单Id不能为空");
 			}

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -124,8 +124,7 @@ public class XmTaskController {
 		RequestUtils.transformArray(params, "ids");
 		RequestUtils.transformArray(params, "skillIds");
 		RequestUtils.transformArray(params, "tagIdList");
-		RequestUtils.transformArray(params, "lvls");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "lvls");		
 		IPage page=QueryTools.initPage(params);
 		String taskOut= (String) params.get("taskOut");
 		String projectId= (String) params.get("projectId");
@@ -145,6 +144,7 @@ public class XmTaskController {
 
 			params.put("compete",user.getUserid());
 		}
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTaskService.getTask(params);	//列出XmTask列表
  		if("1".equals(params.get("withParents"))  && !"1".equals(params.get("isTop"))&& datas.size()>0){
 			Set<String> pidPathsSet=new HashSet<>();
@@ -190,8 +190,7 @@ public class XmTaskController {
 		
 
 		
-		RequestUtils.transformArray(params, "skillIds");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "skillIds");		
 		IPage page=QueryTools.initPage(params);
 		xmTask.put("taskOut","1");
 		xmTask.put("ntype","0");
@@ -241,8 +240,7 @@ public class XmTaskController {
 	}
 	@RequestMapping(value="/getXmTaskSort",method=RequestMethod.GET)
 	public Result getXmTaskSort(@ApiIgnore @RequestParam Map<String,Object> params){
-		User user=LoginUtils.getCurrentUserInfo();
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		User user=LoginUtils.getCurrentUserInfo();		
 		IPage page=QueryTools.initPage(params);
 		xmTask.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskSort(xmTask);
@@ -261,9 +259,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_editSomeFields",name = "批量修改修改任务中的某些字段",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmTaskMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user = LoginUtils.getCurrentUserInfo();
 			List<String> ids= (List<String>) xmTaskMap.get("ids");
 
@@ -456,13 +452,7 @@ public class XmTaskController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -542,9 +532,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_addTask",name = "新增任务",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/addTask",method=RequestMethod.POST)
 	public Result addTask(@RequestBody XmTaskVo xmTaskVo) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 
 
 			if(!StringUtils.hasText(xmTaskVo.getNtype())){
@@ -667,13 +655,7 @@ public class XmTaskController {
 				xmTaskVo = xmTaskService.addTask(xmTaskVo);
 			}
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -695,8 +677,7 @@ public class XmTaskController {
 	public Result listXmTask(@ApiIgnore @RequestParam Map<String,Object> xmTask){
 		 
 		RequestUtils.transformArray(params, "ids");
-		RequestUtils.transformArray(params, "tagIdList");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "tagIdList");		
 		IPage page=QueryTools.initPage(params);
 
 		String taskOut= (String) xmTask.get("taskOut");
@@ -708,12 +689,10 @@ public class XmTaskController {
 				xmTask.put("cbranchId",user.getBranchId());
 			}
 		}
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTask列表
 		
-		
-		
-		
 	}
 	
 	@ApiOperation( value = "删除一条任务信息",notes="delXmTask,仅需要上传主键字段")
@@ -723,9 +702,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_del",name = "删除任务",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTask(@RequestBody XmTask xmTask){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmTask.getId())){
 				tips.setFailureMsg("任务编号不能为空");
@@ -757,13 +734,7 @@ public class XmTaskController {
 			xmTaskService.deleteTask(xmTaskDb);
 			xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(), xmTaskDb.getId(), "项目-任务-删除任务", "删除任务"+xmTaskDb.getName());
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
+		return Result.ok();  
 		
 	}
 
@@ -774,9 +745,7 @@ public class XmTaskController {
 	////@HasQx(value = "xm_core_xmTask_setTaskCreateUser",name = "修改任务责任人",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/setTaskCreateUser",method=RequestMethod.POST)
 	public Result setTaskCreateUser(@RequestBody XmTaskVo xmTaskVo) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmTaskVo.getId())){
 				tips.setFailureMsg("任务编号不能为空");
@@ -811,13 +780,7 @@ public class XmTaskController {
 			 this.xmTaskService.updateSomeFieldByPk(xmTask);
 			 this.xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(),xmTaskDb.getId(),"项目-任务-修改任务责任人","修改任务【"+xmTaskDb.getName()+"】责任人。原责任人【"+xmTaskDb.getCreateUsername()+"】，新责任人【"+xmTask.getCreateUsername()+"】");
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "根据主键修改一条任务信息",notes="editXmTask")
@@ -827,9 +790,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_editXmTask",name = "修改任务",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTask(@RequestBody XmTaskVo xmTaskVo) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmTaskVo.getId())){
 				tips.setFailureMsg("任务编号不能为空");
@@ -874,13 +835,7 @@ public class XmTaskController {
 				xmTaskService.updateTask(xmTaskVo,xmTaskDb);
 			}
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "根据主键修改一条任务信息",notes="editXmTask")
@@ -890,9 +845,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_editTime",name = "修改任务时间",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editTime",method=RequestMethod.POST)
 	public Result editTime(@RequestBody XmTask xmTask) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmTask.getId())){
 				tips.setFailureMsg("任务编号不能为空");
@@ -914,13 +867,7 @@ public class XmTaskController {
 			}
 			xmTaskService.updateTime(xmTask,xmTaskDb);
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	/**不允许直接改进度，通过报工形式改进度
@@ -931,9 +878,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_editProgress",name = "修改任务进度百分比",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editProgress",method=RequestMethod.POST)
 	public Result editProgress(@RequestBody XmTask xmTask) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 			if(!StringUtils.hasText(xmTask.getId())){
 				tips.setFailureMsg("任务编号不能为空");
@@ -956,13 +901,7 @@ public class XmTaskController {
 			}
 			xmTaskService.updateProgress(xmTask,xmTaskDb);
 			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	**/
@@ -974,9 +913,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_batchImportFromTemplate",name = "从模板导入任务",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchImportFromTemplate",method=RequestMethod.POST)
 	public Result batchImportFromTemplate(@RequestBody BatchImportVo batchImportVo) {
-		
-		Tips tips=new Tips("成功导入");
-		try{
+
 			List<XmTask> xmTasks=batchImportVo.getXmTasks();
 			User user=LoginUtils.getCurrentUserInfo();
  			if(xmTasks==null || xmTasks.size()==0){
@@ -1122,9 +1059,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_batchRelTasksWithPhase",name = "批量将任务与一个项目计划关联",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchRelTasksWithPhase",method=RequestMethod.POST)
 	public Result batchRelTasksWithPhase(@RequestBody BatchRelTasksWithPhase tasksPhase) {
-		
-		Tips tips=new Tips("成功将任务数据与项目计划关联");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 
 			if(tasksPhase==null){
@@ -1203,13 +1138,7 @@ public class XmTaskController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
 			}
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	 **/
@@ -1220,9 +1149,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_batchRelTasksWithMenu",name = "批量将任务与一个用户需求关联",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchRelTasksWithMenu",method=RequestMethod.POST)
 	public Result batchRelTasksWithMenu(@RequestBody BatchRelTasksWithMenu tasksMenu) {
-		
-		Tips tips=new Tips("成功将任务与用户需求关联");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 
 			if(tasksMenu==null||tasksMenu.getTaskIds()==null||tasksMenu.getTaskIds().size()==0 ){
@@ -1316,9 +1243,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_batchDel",name = "批量删除任务",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTask(@RequestBody List<XmTask> xmTasks) {
-		
-		Tips tips=new Tips("成功删除"+xmTasks.size()+"条数据"); 
-		try{
+
 
 			User user=LoginUtils.getCurrentUserInfo();
 
@@ -1427,9 +1352,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_batchSaveBudget",name = "批量修改任务预算",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchSaveBudget",method=RequestMethod.POST)
 	public Result batchSaveBudget(@RequestBody  List<XmTask> xmTasks) {
-		
-		Tips tips=new Tips("成功修改"+xmTasks.size()+"条数据"); 
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 
 			if(xmTasks==null || xmTasks.size()==0){
@@ -1572,9 +1495,7 @@ public class XmTaskController {
 	//@HasQx(value = "xm_core_xmTask_batchChangeParentTask",name = "批量修改任务的上级",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchChangeParentTask",method=RequestMethod.POST)
 	public Result batchChangeParentTask(@RequestBody BatchChangeParentTaskVo xmTasksVo) {
-		
-		Tips tips=new Tips("成功修改");
-		try{
+
 			User user=LoginUtils.getCurrentUserInfo();
 
 			if(xmTasksVo.getTaskIds()==null || xmTasksVo.getTaskIds().size()==0){
@@ -1680,13 +1601,7 @@ public class XmTaskController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
 			}
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	/**
@@ -1710,7 +1625,7 @@ public class XmTaskController {
 	@RequestMapping(value="/processApprova",method=RequestMethod.POST)
 	public Result processApprova( @RequestBody Map<String,Object> flowVars){
 		
-		Tips tips=new Tips("成功新增一条数据");
+		
 		  
 		
 			

xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java

@@ -70,9 +70,9 @@ public class XmTaskEvalController {
 	public Result listXmTaskEval(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTaskEvalService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTaskEval列表
 
@@ -112,9 +112,7 @@ public class XmTaskEvalController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTaskEval(@RequestBody XmTaskEval xmTaskEval) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 
 			if(!StringUtils.hasText(xmTaskEval.getId())) {
@@ -158,9 +156,7 @@ public class XmTaskEvalController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTaskEval(@RequestBody XmTaskEval xmTaskEval){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTaskEval.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -169,7 +165,7 @@ public class XmTaskEvalController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmTaskEvalService.deleteByPk(xmTaskEval);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -179,9 +175,7 @@ public class XmTaskEvalController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTaskEval(@RequestBody XmTaskEval xmTaskEval) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTaskEval.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -200,9 +194,7 @@ public class XmTaskEvalController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmTaskEvalMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmTaskEvalMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -254,13 +246,7 @@ public class XmTaskEvalController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -271,7 +257,7 @@ public class XmTaskEvalController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTaskEval(@RequestBody List<XmTaskEval> xmTaskEvals) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmTaskEvals.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -110,8 +110,7 @@ public class XmTaskExecuserController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmTaskExecuser(@ApiIgnore @RequestParam Map<String,Object> params){
 		 
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		String projectId= (String) params.get("projectId");
@@ -124,12 +123,10 @@ public class XmTaskExecuserController {
 		}
 
 
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTaskExecuserService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTaskExecuser列表
 		
-		
-		
-		
 	}
 
 
@@ -141,8 +138,7 @@ public class XmTaskExecuserController {
 	@RequestMapping(value="/listWithTask",method=RequestMethod.GET)
 	public Result listXmTaskExecuserWithTask(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		String projectId= (String) params.get("projectId");
@@ -167,9 +163,7 @@ public class XmTaskExecuserController {
 	////@HasQx(value = "xm_core_xmTaskExecuser_add",name = "新增任务执行者",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTaskExecuser(@RequestBody XmTaskExecuser xmTaskExecuser) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 
 			 User user=LoginUtils.getCurrentUserInfo();
 			XmTask xmTaskDb=xmTaskService.selectOneObject(new XmTask(xmTaskExecuser.getTaskId()));
@@ -249,9 +243,7 @@ public class XmTaskExecuserController {
 	////@HasQx(value = "xm_core_xmTaskExecuser_leave",name = "执行人离开任务",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/leave",method=RequestMethod.POST)
 	public Result leave(@RequestBody List<XmTaskExecuser> xmTaskExecusers) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			if(xmTaskExecusers==null || xmTaskExecusers.size()==0){
 				tips.setFailureMsg("执行人列表不能为空");
 				m.put("tips", tips);
@@ -309,13 +301,7 @@ public class XmTaskExecuserController {
 			}else{
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
 			}
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -327,9 +313,7 @@ public class XmTaskExecuserController {
 	////@HasQx(value = "xm_core_xmTaskExecuser_execute",name = "修改任务执行人基础信息",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/execute",method=RequestMethod.POST)
 	public Result execute(@RequestBody  XmTaskExecuser xmTaskExecuser) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			/**
 			 * 如果是候选人变更为执行人，需要检查该候选人是否已加入项目中的某个组
 			 */
@@ -404,13 +388,7 @@ public class XmTaskExecuserController {
 
 			}
  			
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -421,9 +399,7 @@ public class XmTaskExecuserController {
 	////@HasQx(value = "xm_core_xmTaskExecuser_execute",name = "修改任务执行人基础信息",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/acceptance",method=RequestMethod.POST)
 	public Result acceptance(@RequestBody XmTaskAcceptanceVo xmTaskAcceptanceVo) {
-		
-		Tips tips=new Tips("成功验收");
-		try{
+
 			String taskId=xmTaskAcceptanceVo.getTaskId();
 			if(!StringUtils.hasText(taskId)){
 				tips.setFailureMsg("taskId-0");
@@ -496,13 +472,7 @@ public class XmTaskExecuserController {
 
 
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -514,9 +484,7 @@ public class XmTaskExecuserController {
 	////@HasQx(value = "xm_core_xmTaskExecuser_quotePrice",name = "项目中的任务报价",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/quotePrice",method=RequestMethod.POST)
 	public Result quotePrice(@RequestBody XmTaskExecuser xmTaskExecuser) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			String taskId=xmTaskExecuser.getTaskId();
 			XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId));
 			if(xmTask==null ){
@@ -550,13 +518,7 @@ public class XmTaskExecuserController {
 				
 
 			}
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "变更为候选人",notes="quotePrice")
@@ -566,9 +528,7 @@ public class XmTaskExecuserController {
 	////@HasQx(value = "xm_core_xmTaskExecuser_candidate",name = "变更成为任务候选人",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/candidate",method=RequestMethod.POST)
 	public Result becomeCandidate(@RequestBody XmTaskExecuser xmTaskExecuser) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			String taskId=xmTaskExecuser.getTaskId();
 			XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId));
 			if(xmTask==null ){
@@ -593,13 +553,7 @@ public class XmTaskExecuserController {
 				
 
 			}
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	
@@ -612,9 +566,7 @@ public class XmTaskExecuserController {
 	////@HasQx(value = "xm_core_xmTaskExecuser_del",name = "删除项目中任务的执行人",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTaskExecuser(@RequestBody XmTaskExecuser xmTaskExecuser){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			String taskId=xmTaskExecuser.getTaskId();
 			XmTask xmTaskDb= xmTaskService.selectOneObject(new XmTask(taskId));
 			if(xmTaskDb==null ){

xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java

@@ -90,9 +90,9 @@ public class XmTaskOrderController {
 	public Result listXmTaskOrder(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTaskOrderService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTaskOrder列表
 
@@ -114,9 +114,7 @@ public class XmTaskOrderController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTaskOrder(@RequestBody AddXmTaskOrderVo xmTaskOrder) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(!StringUtils.hasText(xmTaskOrder.getTaskId())){
 				return ResponseHelper.failed("taskId-0","任务编号不能为空");
 			}
@@ -267,9 +265,7 @@ public class XmTaskOrderController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTaskOrder(@RequestBody XmTaskOrder xmTaskOrder){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTaskOrder.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -278,7 +274,7 @@ public class XmTaskOrderController {
                 return failed("data-not-exists","数据不存在，无法删除");
             }
 			xmTaskOrderService.deleteByPk(xmTaskOrder);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	 */
@@ -290,9 +286,7 @@ public class XmTaskOrderController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTaskOrder(@RequestBody XmTaskOrder xmTaskOrder) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTaskOrder.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -313,9 +307,7 @@ public class XmTaskOrderController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmTaskOrderMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmTaskOrderMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -367,13 +359,7 @@ public class XmTaskOrderController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	*/
@@ -386,7 +372,7 @@ public class XmTaskOrderController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTaskOrder(@RequestBody List<XmTaskOrder> xmTaskOrders) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmTaskOrders.size()<=0){
                 return failed("data-0","请上送待删除数据列表");
@@ -454,7 +440,7 @@ public class XmTaskOrderController {
 	public Result orderPaySuccess(@RequestBody XmTaskOrder order) {
 		
 		try {
-			Tips tips=new Tips("操作成功");
+			
 			if(!StringUtils.hasText(order.getId())) {
 				return failed("data-0","订单Id不能为空");
 			}
@@ -483,7 +469,7 @@ public class XmTaskOrderController {
 	public Result payCancel(@RequestBody XmTaskOrder order) {
 		
 		try {
-			Tips tips=new Tips("操作成功");
+			
 			if(!StringUtils.hasText(order.getId())) {
 				return failed("data-0","订单Id不能为空");
 			}

xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java

@@ -79,11 +79,11 @@ public class XmTaskSbillController {
 	public Result listXmTaskSbill(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("branchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTaskSbillService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTaskSbill列表
 
@@ -98,9 +98,7 @@ public class XmTaskSbillController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTaskSbill(@RequestBody XmTaskSbill xmTaskSbill) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(StringUtils.isEmpty(xmTaskSbill.getId())) {
 			    createPk=true;
@@ -141,7 +139,7 @@ public class XmTaskSbillController {
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTaskSbill(@RequestBody XmTaskSbill xmTaskSbill){
 		
-		Tips tips=new Tips("成功删除一条数据");
+		
 		if( xmTaskSbill==null || !StringUtils.hasText(xmTaskSbill.getId())){
 			tips.setFailureMsg("请上送结算单编号");
 			m.put("tips", tips);
@@ -158,10 +156,10 @@ public class XmTaskSbillController {
 			m.put("tips", tips);
 			return m;
 		}
-		try{
+				
 			//删除结算单时候，要一起恢复工时单为未加入结算状态
 			xmTaskSbillService.deleteByPkAndReturnWorkload(sbillDb);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -175,7 +173,7 @@ public class XmTaskSbillController {
 	public Result batchJoinToSbill(@RequestBody BatchJoinToSbillVo batchJoinToSbill) {
 
 		
-		Tips tips=new Tips("成功更新一条数据");
+		
 		if(!StringUtils.hasText(batchJoinToSbill.getSbillId())){
 			return ResponseHelper.failed("sbillId-0","请上送结算单编号");
 		}
@@ -183,7 +181,7 @@ public class XmTaskSbillController {
 			return ResponseHelper.failed("workloadIds-0","请上送workloadIds");
 		}
 		User user=LoginUtils.getCurrentUserInfo();
-		try{
+				
 			XmTaskSbill sbillDb=this.xmTaskSbillService.selectOneById(batchJoinToSbill.getSbillId());
 			if(sbillDb==null){
 				return ResponseHelper.failed("sbill-0","结算单不存在");
@@ -292,13 +290,7 @@ public class XmTaskSbillController {
 			this.xmTaskSbillService.batchJoinToSbill(workloadsDb3.stream().map(i->i.getId()).collect(Collectors.toList()), canAdd,sameSbillDetails);
 
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -309,7 +301,7 @@ public class XmTaskSbillController {
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTaskSbill(@RequestBody XmTaskSbill xmTaskSbill) {
 		
-		Tips tips=new Tips("成功更新一条数据");
+		
 		if( xmTaskSbill==null || !StringUtils.hasText(xmTaskSbill.getId())){
 			tips.setFailureMsg("请上送结算单编号");
 			m.put("tips", tips);
@@ -327,7 +319,7 @@ public class XmTaskSbillController {
 			m.put("tips", tips);
 			return m;
 		}
-		try{
+				
 			xmTaskSbill.setLtime(new Date());
 			xmTaskSbillService.updateByPk(xmTaskSbill);
 		
@@ -343,9 +335,7 @@ public class XmTaskSbillController {
 	}) 
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTaskSbill(@RequestBody List<XmTaskSbill> xmTaskSbills) {
-		
-		Tips tips=new Tips("成功删除"+xmTaskSbills.size()+"条数据");
-		try{
+
 			xmTaskSbillService.batchDelete(xmTaskSbills);
 		}catch (BizException e) { 
 			tips=e.getTips();
@@ -365,7 +355,7 @@ public class XmTaskSbillController {
 	@RequestMapping(value="/processApprova",method=RequestMethod.POST)
 	public Result sbillProcessApprova(@RequestBody Map<String,Object> paramMap) {
 		Map<String,Object> map=new HashMap<>();
-		Tips tips=new Tips("成功更新结算单状态");
+		
 
 		String sbillId= (String) paramMap.get("sbillId");
 		if( !StringUtils.hasText(sbillId)){
@@ -375,7 +365,7 @@ public class XmTaskSbillController {
 		}
 		map.putAll(paramMap);
 
-		try{
+				
 			this.xmTaskSbillService.processApprova(map);
 			logger.debug("procInstId====="+paramMap.get("procInstId"));
 		}catch (BizException e) {

xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java

@@ -66,11 +66,11 @@ public class XmTaskSbillDetailController {
 	public Result listXmTaskSbillDetail(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "ids");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("linkBranchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTaskSbillDetailService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTaskSbillDetail列表
 
@@ -142,9 +142,7 @@ public class XmTaskSbillDetailController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTaskSbillDetail(@RequestBody XmTaskSbillDetail xmTaskSbillDetail) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmTaskSbillDetail.getId())) {
 			    createPk=true;
@@ -176,9 +174,7 @@ public class XmTaskSbillDetailController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTaskSbillDetail(@RequestBody XmTaskSbillDetail xmTaskSbillDetail) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTaskSbillDetail.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -197,9 +193,7 @@ public class XmTaskSbillDetailController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields(@RequestBody Map<String,Object> xmTaskSbillDetailMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmTaskSbillDetailMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -274,13 +268,7 @@ public class XmTaskSbillDetailController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -291,8 +279,8 @@ public class XmTaskSbillDetailController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTaskSbillDetail(@RequestBody List<XmTaskSbillDetail> xmTaskSbillDetails) {
 		
-        Tips tips=new Tips("成功删除"); 
-        try{
+        
+        		
         	User user=LoginUtils.getCurrentUserInfo();
             if(xmTaskSbillDetails.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java

@@ -52,15 +52,12 @@ public class XmTaskSkillController {
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Result listXmTaskSkill(@ApiIgnore @RequestParam Map<String,Object> params){
-		
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+				
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTaskSkillService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTaskSkill列表
 		
-		
-		
-		
 	}
 	
 	@ApiOperation( value = "批量添加技能",notes="batchDelXmTaskSkill,仅需要上传主键字段")
@@ -70,17 +67,9 @@ public class XmTaskSkillController {
 	//@HasQx(value = "xm_core_xmTaskSkill_batchAdd",name = "批量新增任务的技能要求",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
 	public Result batchAddSkill(@RequestBody List<XmTaskSkill> xmTaskSkills) {
-		
-		Tips tips=new Tips("成功添加"+xmTaskSkills.size()+"条数据");
-		try{
+
 			xmTaskSkillService.insertOrDelete(xmTaskSkills);
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	
@@ -93,9 +82,7 @@ public class XmTaskSkillController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTaskSkill(@RequestBody XmTaskSkill xmTaskSkill) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(StringUtils.isEmpty(xmTaskSkill.getId())) {
 				xmTaskSkill.setId(xmTaskSkillService.createKey("id"));
 			}else{
@@ -118,11 +105,9 @@ public class XmTaskSkillController {
 	//@HasQx(value = "xm_core_xmTaskSkill_del",name = "删除任务的技能要求",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTaskSkill(@RequestBody XmTaskSkill xmTaskSkill){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
 			xmTaskSkillService.deleteByPk(xmTaskSkill);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 	
@@ -133,9 +118,7 @@ public class XmTaskSkillController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTaskSkill(@RequestBody XmTaskSkill xmTaskSkill) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			xmTaskSkillService.updateByPk(xmTaskSkill);
 		
 	}
@@ -151,10 +134,10 @@ public class XmTaskSkillController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTaskSkill(@RequestBody List<XmTaskSkill> xmTaskSkills) {
 		
-		Tips tips=new Tips("成功删除"+xmTaskSkills.size()+"条数据"); 
+		
 		
 			xmTaskSkillService.batchDelete(xmTaskSkills);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java

@@ -75,10 +75,10 @@ public class XmTestCaseController {
 		
 		
 		RequestUtils.transformArray(params, "ids");
-		RequestUtils.transformArray(params, "menuIds");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "menuIds");		
 		IPage page=QueryTools.initPage(params);
 		paramsInit(xmTestCase);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTestCaseService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTestCase列表
 
@@ -131,9 +131,7 @@ public class XmTestCaseController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTestCase(@RequestBody XmTestCase xmTestCase) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 
 			xmTestCase.setId(xmTestCaseService.createKey("id"));
 			if(StringUtils.isEmpty(xmTestCase.getProductId())){
@@ -170,9 +168,7 @@ public class XmTestCaseController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTestCase(@RequestBody XmTestCase xmTestCase){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTestCase.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -200,9 +196,7 @@ public class XmTestCaseController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTestCase(@RequestBody XmTestCase xmTestCase) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTestCase.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -237,9 +231,7 @@ public class XmTestCaseController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmTestCaseMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmTestCaseMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -310,13 +302,7 @@ public class XmTestCaseController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -327,7 +313,7 @@ public class XmTestCaseController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTestCase(@RequestBody List<XmTestCase> xmTestCases) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmTestCases.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java

@@ -75,9 +75,9 @@ public class XmTestCasedbController {
 		
 		RequestUtils.transformArray(params, "ids");
 		User user=LoginUtils.getCurrentUserInfo();
-		xmTestCasedb.put("pbranchId",user.getBranchId());
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		xmTestCasedb.put("pbranchId",user.getBranchId());		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTestCasedbService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTestCasedb列表
 
@@ -91,9 +91,7 @@ public class XmTestCasedbController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTestCasedb(@RequestBody XmTestCasedb xmTestCasedb) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmTestCasedb.getId())) {
 			    createPk=true;
@@ -131,9 +129,7 @@ public class XmTestCasedbController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTestCasedb(@RequestBody XmTestCasedb xmTestCasedb){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTestCasedb.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -151,7 +147,7 @@ public class XmTestCasedbController {
 				}
 			}
 			xmTestCasedbService.deleteByPk(xmTestCasedb);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -161,9 +157,7 @@ public class XmTestCasedbController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTestCasedb(@RequestBody XmTestCasedb xmTestCasedb) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTestCasedb.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -198,9 +192,7 @@ public class XmTestCasedbController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmTestCasedbMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmTestCasedbMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -274,13 +266,7 @@ public class XmTestCasedbController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -291,7 +277,7 @@ public class XmTestCasedbController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTestCasedb(@RequestBody List<XmTestCasedb> xmTestCasedbs) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmTestCasedbs.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java

@@ -79,12 +79,12 @@ public class XmTestPlanCaseController {
 	public Result listXmTestPlanCase(@ApiIgnore @RequestParam Map<String,Object> params){
 		
 		
-		RequestUtils.transformArray(params, "pkList");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "pkList");		
 		IPage page=QueryTools.initPage(params);
 
 		User user= LoginUtils.getCurrentUserInfo();
 		paramsInit(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTestPlanCaseService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTestPlanCase列表
 
@@ -117,8 +117,7 @@ public class XmTestPlanCaseController {
 	@RequestMapping(value="/getXmTestPlanCaseExecStatusDist",method=RequestMethod.GET)
 	public Result getXmTestPlanCaseExecStatusDist(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+				
 		IPage page=QueryTools.initPage(params);
 		User user= LoginUtils.getCurrentUserInfo();
 		paramsInit(params);
@@ -134,8 +133,7 @@ public class XmTestPlanCaseController {
 	@RequestMapping(value="/getXmTestPlanCaseUserDist",method=RequestMethod.GET)
 	public Result getXmTestPlanCaseUserDist(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+				
 		IPage page=QueryTools.initPage(params);
 		paramsInit(params);
 		List<Map<String,Object>>	xmTestPlanCaseList = xmTestPlanCaseService.getXmTestPlanCaseUserDist(params);	//列出XmTestPlanCase列表
@@ -150,8 +148,7 @@ public class XmTestPlanCaseController {
 	@RequestMapping(value="/getXmTestDayTimesList",method=RequestMethod.GET)
 	public Result getXmTestDayTimesList(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+				
 		IPage page=QueryTools.initPage(params);
 		User user= LoginUtils.getCurrentUserInfo();
 		paramsInit(params);
@@ -165,8 +162,7 @@ public class XmTestPlanCaseController {
 	@RequestMapping(value="/getXmTestCaseToPlanCalcList",method=RequestMethod.GET)
 	public Result getXmTestCaseToPlanCalcList(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+				
 		IPage page=QueryTools.initPage(params);
 		User user= LoginUtils.getCurrentUserInfo();
 		paramsInit(params);
@@ -183,9 +179,7 @@ public class XmTestPlanCaseController {
 	})
 	@RequestMapping(value="/importFromTestCase",method=RequestMethod.POST)
 	public Result importFromTestCase(@RequestBody ImportFromTestCaseVo importFromTestCaseVo) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			if(importFromTestCaseVo.getCaseIds()==null || importFromTestCaseVo.getCaseIds().size()==0){
 				return ResponseHelper.failed("caseIds-0","测试用例编号不能为空");
 			}
@@ -235,13 +229,7 @@ public class XmTestPlanCaseController {
 				this.xmTestPlanCaseService.batchInsert(planCases);
 			}
 
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 	@ApiOperation( value = "删除一条测试计划与用例关系表信息",notes=" ")
@@ -250,9 +238,7 @@ public class XmTestPlanCaseController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTestPlanCase(@RequestBody XmTestPlanCase xmTestPlanCase){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTestPlanCase.getCaseId())) {
                  return failed("pk-not-exists","请上送主键参数caseId");
             }
@@ -283,9 +269,7 @@ public class XmTestPlanCaseController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTestPlanCase(@RequestBody XmTestPlanCase xmTestPlanCase) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTestPlanCase.getCaseId())) {
                  return failed("pk-not-exists","请上送主键参数caseId");
             }
@@ -316,9 +300,7 @@ public class XmTestPlanCaseController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmTestPlanCaseMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			List<Map<String,Object>> pkList= (List<Map<String,Object>>) xmTestPlanCaseMap.get("pkList");
 			if(pkList==null || pkList.size()==0){
 				return failed("pkList-0","pkList不能为空");
@@ -399,13 +381,7 @@ public class XmTestPlanCaseController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -416,7 +392,7 @@ public class XmTestPlanCaseController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTestPlanCase(@RequestBody List<XmTestPlanCase> xmTestPlanCases) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmTestPlanCases.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java

@@ -76,9 +76,9 @@ public class XmTestPlanController {
 		
 		RequestUtils.transformArray(params, "ids");
 		User user=LoginUtils.getCurrentUserInfo();
-		params.put("cbranchId",user.getBranchId());
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		params.put("cbranchId",user.getBranchId());		
 		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmTestPlanService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTestPlan列表
 
@@ -91,21 +91,13 @@ public class XmTestPlanController {
 	})
 	@RequestMapping(value="/calc",method=RequestMethod.POST)
 	public Result calcXmTestPlan(@RequestBody XmTestPlan xmTestPlan) {
-		
-		Tips tips=new Tips("成功统计测试计划数据");
-		try{
+
 			boolean createPk=false;
 			if(!StringUtils.hasText(xmTestPlan.getId())) {
 				return failed("id-0","测试计划编号不能为空");
 			}
 			this.xmTestPlanService.calcXmTestPlan(xmTestPlan.getId());
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -115,9 +107,7 @@ public class XmTestPlanController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmTestPlan(@RequestBody XmTestPlan xmTestPlan) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 		    boolean createPk=false;
 			if(!StringUtils.hasText(xmTestPlan.getId())) {
 			    createPk=true;
@@ -163,9 +153,7 @@ public class XmTestPlanController {
 	}) 
 	@RequestMapping(value="/del",method=RequestMethod.POST)
 	public Result delXmTestPlan(@RequestBody XmTestPlan xmTestPlan){
-		
-		Tips tips=new Tips("成功删除一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTestPlan.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -184,7 +172,7 @@ public class XmTestPlanController {
 				}
 			}
 			xmTestPlanService.deleteByPk(xmTestPlan);
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -194,9 +182,7 @@ public class XmTestPlanController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmTestPlan(@RequestBody XmTestPlan xmTestPlan) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmTestPlan.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -226,9 +212,7 @@ public class XmTestPlanController {
 	})
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmTestPlanMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             List<String> ids= (List<String>) xmTestPlanMap.get("ids");
 			if(ids==null || ids.size()==0){
 				return failed("ids-0","ids不能为空");
@@ -298,13 +282,7 @@ public class XmTestPlanController {
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 
@@ -315,7 +293,7 @@ public class XmTestPlanController {
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmTestPlan(@RequestBody List<XmTestPlan> xmTestPlans) {
 		
-        Tips tips=new Tips("成功删除"); 
+        
         
             if(xmTestPlans.size()<=0){
                 return failed("data-0","请上送待删除数据列表");

xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java

@@ -96,8 +96,7 @@ public class XmWorkloadController {
 		
 		RequestUtils.transformArray(params, "ids");
 		RequestUtils.transformArray(params, "wstatuses");
-		RequestUtils.transformArray(params, "sstatuses");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "sstatuses");		
 		IPage page=QueryTools.initPage(params);
 		String taskId= (String) params.get("taskId");
 		String sbillId= (String) params.get("sbillId");
@@ -105,6 +104,7 @@ public class XmWorkloadController {
 		String userid= (String) params.get("userid");
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("linkBranchId",user.getBranchId());
+		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
 		List<Map<String,Object>> datas = xmWorkloadService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmWorkload列表
 
@@ -116,8 +116,7 @@ public class XmWorkloadController {
 	@RequestMapping(value="/listProjectWorkloadSetDay",method=RequestMethod.GET)
 	public Result listProjectWorkloadSetDay(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+				
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("linkBranchId",user.getBranchId());
@@ -133,8 +132,7 @@ public class XmWorkloadController {
 	@RequestMapping(value="/listProjectWorkloadSetMonth",method=RequestMethod.GET)
 	public Result listProjectWorkloadSetMonth(@ApiIgnore @RequestParam Map<String,Object> params){
 		
-		
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+				
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("linkBranchId",user.getBranchId());
@@ -153,8 +151,7 @@ public class XmWorkloadController {
 		
 		RequestUtils.transformArray(params, "ids");
 		RequestUtils.transformArray(params, "wstatuses");
-		RequestUtils.transformArray(params, "sstatuses");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "sstatuses");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("linkBranchId",user.getBranchId());
@@ -176,8 +173,7 @@ public class XmWorkloadController {
 		
 		RequestUtils.transformArray(params, "ids");
 		RequestUtils.transformArray(params, "wstatuses");
-		RequestUtils.transformArray(params, "sstatuses");
-		QueryWrapper<XXXXXXXX> qw = QueryTools.initQueryWrapper(XXXXXXXX.class , params);
+		RequestUtils.transformArray(params, "sstatuses");		
 		IPage page=QueryTools.initPage(params);
 		String queryScope= (String) xmWorkload.get("queryScope");
 		User user=LoginUtils.getCurrentUserInfo();
@@ -196,9 +192,7 @@ public class XmWorkloadController {
 	}) 
 	@RequestMapping(value="/add",method=RequestMethod.POST)
 	public Result addXmWorkload(@RequestBody XmWorkload xmWorkload) {
-		
-		Tips tips=new Tips("成功新增一条数据");
-		try{
+
 			User user= LoginUtils.getCurrentUserInfo();
 			xmWorkload.setId(xmWorkloadService.createKey("id"));
 			xmWorkload.setCuserid(user.getUserid());
@@ -366,8 +360,9 @@ public class XmWorkloadController {
  				xmWorkload.setBranchId(xmTestCaseDb.getCbranchId());
  				xmWorkloadService.insert(xmWorkload);
 			}else if("4".equals(xmWorkload.getBizType())){//报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行
- 				List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
-			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+ 				QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
+		List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
+			return Result.ok();
 				if(xmTestPlanCaseDbs==null||xmTestPlanCaseDbs.size()==0){
 					return failed("xmTestPlanCaseDb-0","执行用例已不存在");
 				}
@@ -407,9 +402,7 @@ public class XmWorkloadController {
 	}) 
 	@RequestMapping(value="/edit",method=RequestMethod.POST)
 	public Result editXmWorkload(@RequestBody XmWorkload xmWorkload) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
             if(!StringUtils.hasText(xmWorkload.getId())) {
                  return failed("pk-not-exists","请上送主键参数id");
             }
@@ -449,9 +442,7 @@ public class XmWorkloadController {
 	}) 
 	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
 	public Result batchDelXmWorkload(@RequestBody List<XmWorkload> xmWorkloads) {
-		
-		Tips tips=new Tips("成功删除"+xmWorkloads.size()+"条数据"); 
-		try{
+
 			if(xmWorkloads.stream().filter(i->!StringUtils.hasText(i.getId())).findAny().isPresent()){
 				return ResponseHelper.failed("id-0","主键不能为空");
 			}
@@ -525,7 +516,7 @@ public class XmWorkloadController {
 			}else{
 				tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
 			}
-		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
+		return Result.ok();
 		
 	}
 
@@ -540,9 +531,7 @@ public class XmWorkloadController {
 	//@HasQx(value = "xm_core_xmWorkload_editSomeFields",name = "批量修改修改任务中的某些字段",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
 	@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
 	public Result editSomeFields(@RequestBody Map<String,Object> xmWorkloadMap) {
-		
-		Tips tips=new Tips("成功更新一条数据");
-		try{
+
 			List<String> ids= (List<String>) xmWorkloadMap.get("ids");
 
 			if(ids==null || ids.size()==0){
@@ -633,13 +622,7 @@ public class XmWorkloadController {
 			}
 
 			//
-		}catch (BizException e) {
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}
+		return Result.ok();
 		
 	}
 }