2.0

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

@@ -4,13 +4,11 @@ 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.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.*;
@@ -26,7 +24,6 @@ import java.util.stream.Collectors;
 
 import static com.mdp.core.utils.BaseUtils.fromMap;
 import static com.mdp.core.utils.BaseUtils.toMap;
-import static com.mdp.core.utils.ResponseHelper.failed;
 
 /**
  * url编制采用rest风格,如对xm_budget_labor 项目人力成本预算的操作有增删改查,对应的url分别为:<br>
@@ -142,7 +139,7 @@ public class XmBudgetLaborController {
                 return Result.error("data-not-exists","数据不存在，无法修改");
             }
 			xmBudgetLaborService.updateSomeFieldByPk(xmBudgetLabor);
-		
+		return Result.ok();
 	}
 
     @ApiOperation( value = "批量修改某些字段",notes="")
@@ -242,7 +239,6 @@ public class XmBudgetLaborController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			}
-		return Result.ok();
 		
 	}
 

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

@@ -4,14 +4,12 @@ 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.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.*;
@@ -26,7 +24,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.mdp.core.utils.BaseUtils.toMap;
-import static com.mdp.core.utils.ResponseHelper.failed;
 
 /**
  * url编制采用rest风格,如对xm_budget_nlabor 项目人力成本预算的操作有增删改查,对应的url分别为:<br>
@@ -141,7 +138,7 @@ public class XmBudgetNlaborController {
                 return Result.error("data-not-exists","数据不存在，无法修改");
             }
 			xmBudgetNlaborService.updateSomeFieldByPk(xmBudgetNlabor);
-		
+		return Result.ok();
 	}
 
     @ApiOperation( value = "批量修改某些字段",notes="")
@@ -240,7 +237,6 @@ public class XmBudgetNlaborController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-		return Result.ok();
 		
 	}
 

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

@@ -6,14 +6,12 @@ import com.mdp.audit.log.client.annotation.AuditLog;
 import com.mdp.audit.log.client.annotation.OperType;
 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.RequestUtils;
 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;
@@ -111,7 +109,7 @@ public class XmEnvListController {
 				return ResponseHelper.failed("writeQx-0","请选中写权限");
 			}
 			xmEnvListService.addEnv(xmEnvList);
-		
+		return Result.ok();
 	}
 
 	@ApiOperation( value = "删除一条xm_env_list信息",notes="delXmEnvList,仅需要上传主键字段")
@@ -183,6 +181,7 @@ public class XmEnvListController {
 			}
 			xmEnvListService.updateByPk(xmEnvList);
 
+		return Result.ok();
 	}
 
 
@@ -224,20 +223,8 @@ public class XmEnvListController {
 	@AuditLog(firstMenu="办公平台",secondMenu="项目惯例",func="processApprova",funcDesc="项目环境清单审批",operType=OperType.UPDATE)
 	@RequestMapping(value="/processApprova",method=RequestMethod.POST)
 	public Result processApprova( @RequestBody Map<String,Object> flowVars){
-		
-		
-		  
-		
-			
-			this.xmEnvListService.processApprova(flowVars);
-			logger.debug("procInstId====="+flowVars.get("procInstId"));
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("执行异常",e);
-		}catch (Exception e) {
-			return Result.error(e.getMessage());
-			logger.error("执行异常",e);
-		}  
+		this.xmEnvListService.processApprova(flowVars);
+		return Result.ok();
 		
 	}
 }