Browse Source

修改列表参数

anderx 3 years ago
parent
commit
0c90f881bf

+ 6 - 6
src/main/java/com/goafanti/order/controller/InputTaskSoptLog.java

@@ -5,11 +5,11 @@ import com.goafanti.common.utils.Param;
 
 import javax.validation.constraints.NotNull;
 
-public class InputTaskSoptLog {
+public class InputTaskStopLog {
 
     @Param(name="编号")
     @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
-    private Long taskSoptId;
+    private Long taskStopId;
     @Param(name="原因")
     @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
     private String reason;
@@ -24,12 +24,12 @@ public class InputTaskSoptLog {
         this.status = status;
     }
 
-    public Long getTaskSoptId() {
-        return taskSoptId;
+    public Long getTaskStopId() {
+        return taskStopId;
     }
 
-    public void setTaskSoptId(Long taskSoptId) {
-        this.taskSoptId = taskSoptId;
+    public void setTaskStopId(Long taskStopId) {
+        this.taskStopId = taskStopId;
     }
 
     public String getReason() {

+ 12 - 12
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -677,15 +677,15 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 项目暂停审核
 	 *
 	 */
-	@RequestMapping(value = "/examineProjectSotp" ,method = RequestMethod.POST)
-	public Result examineProjectSotp(@Validated InputTaskSoptLog in,BindingResult bindingResult){
+	@RequestMapping(value = "/examineProjectStop" ,method = RequestMethod.POST)
+	public Result examineProjectStop(@Validated InputTaskStopLog in,BindingResult bindingResult){
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
 			return res;
 		}
-		return res.data(orderProjectService.pushExamineProjectSotp( in));
+		return res.data(orderProjectService.examineProjectStop( in));
 	}
 
 
@@ -693,14 +693,14 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 项目暂停日志列表
 	 *
 	 */
-	@RequestMapping(value = "/projectSotpList" ,method = RequestMethod.GET)
-	public Result projectSotpList(Integer taskSoptId){
+	@RequestMapping(value = "/projectStopList" ,method = RequestMethod.GET)
+	public Result projectStopList(Integer taskStopId){
 		Result res = new Result();
-		if (taskSoptId==null){
+		if (taskStopId==null){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"项目暂停编号","项目暂停编号"));
 			return res;
 		}
-		return res.data(orderProjectService.projectSotpList( taskSoptId));
+		return res.data(orderProjectService.projectStopList( taskStopId));
 	}
 
 
@@ -712,12 +712,12 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 项目暂停列表
 	 *
 	 */
-	@RequestMapping(value = "/selectProjectSotp" ,method = RequestMethod.GET)
-	public Result selectProjectSotp(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
+	@RequestMapping(value = "/selectProjectStop" ,method = RequestMethod.GET)
+	public Result selectProjectStop(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
 									String startTime, String endTime, String receiverId, Integer pageNo,Integer pageSize){
 		Result res = new Result();
 
-		return res.data(orderProjectService.selectProjectSotp(  orderNo, userName, depId, contractNo,
+		return res.data(orderProjectService.selectProjectStop(  orderNo, userName, depId, contractNo,
 				projectName, status,startTime,endTime,receiverId, pageNo, pageSize));
 	}
 
@@ -725,11 +725,11 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 项目暂停列表
 	 *
 	 */
-	@RequestMapping(value = "/selectProjectSotp/export" ,method = RequestMethod.GET)
+	@RequestMapping(value = "/selectProjectStop/export" ,method = RequestMethod.GET)
 	public Result selectProjectSotpExport(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
 									String startTime, String endTime, String receiverId, Integer pageNo,Integer pageSize){
 		NewExcelUtil newExcelUtil=new NewExcelUtil(OutselectProjectSotpBo.class);
-		Pagination<?> p = orderProjectService.selectProjectSotp(orderNo, userName, depId, contractNo,
+		Pagination<?> p = orderProjectService.selectProjectStop(orderNo, userName, depId, contractNo,
 				projectName, status, startTime, endTime, receiverId, pageNo, pageSize);
 		List<OutselectProjectSotp> list = (List<OutselectProjectSotp>) p.getList();
 		List<OutselectProjectSotpBo> list2=new ArrayList<>();

+ 4 - 4
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -11,7 +11,7 @@ import com.goafanti.common.model.TaskSoptLog;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.InputProjectCheck;
-import com.goafanti.order.controller.InputTaskSoptLog;
+import com.goafanti.order.controller.InputTaskStopLog;
 import com.goafanti.organization.bo.OutPaymentNode;
 
 public interface OrderProjectService {
@@ -141,12 +141,12 @@ public interface OrderProjectService {
     Integer addProjectStop(InputProjectStop in);
 	Integer updateProjectStop(InputProjectStop in);
 
-	Pagination<?> selectProjectSotp(String orderNo, String userName, String depId, String contractNo, String projectName,
+	Pagination<?> selectProjectStop(String orderNo, String userName, String depId, String contractNo, String projectName,
 							 Integer status,String startTime,String endTime,String receiverId, Integer pageNo, Integer pageSize);
 
-	List<TaskSoptLogBo> projectSotpList(Integer taskSoptId);
+	List<TaskSoptLogBo> projectStopList(Integer taskStopId);
 
-	Object pushExamineProjectSotp(InputTaskSoptLog in);
+	Object examineProjectStop(InputTaskStopLog in);
 
 
 }

+ 8 - 8
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -17,7 +17,7 @@ import com.goafanti.common.model.*;
 import com.goafanti.common.utils.*;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.order.bo.*;
-import com.goafanti.order.controller.InputTaskSoptLog;
+import com.goafanti.order.controller.InputTaskStopLog;
 import com.goafanti.order.enums.*;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
@@ -1515,7 +1515,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 	@Override
-	public Pagination<?> selectProjectSotp(String orderNo, String userName, String depId, String contractNo, String projectName,
+	public Pagination<?> selectProjectStop(String orderNo, String userName, String depId, String contractNo, String projectName,
 										   Integer status,String startTime,String endTime,String receiverId, Integer pageNo, Integer pageSize) {
 		Map<String,Object>params =new HashMap<>();
 		if (orderNo!=null)params.put("orderNo",orderNo);
@@ -1542,14 +1542,14 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 	@Override
-	public List<TaskSoptLogBo> projectSotpList(Integer taskSoptId) {
-		List<TaskSoptLogBo> list =taskSoptLogMapper.selectListBySoptId(taskSoptId);
+	public List<TaskSoptLogBo> projectStopList(Integer taskStopId) {
+		List<TaskSoptLogBo> list =taskSoptLogMapper.selectListBySoptId(taskStopId);
 		return list;
 	}
 
 	@Override
-	public Object pushExamineProjectSotp(InputTaskSoptLog in) {
-		TaskSopt use = taskSoptMapper.selectByPrimaryKey(in.getTaskSoptId());
+	public Object examineProjectStop(InputTaskStopLog in) {
+		TaskSopt use = taskSoptMapper.selectByPrimaryKey(in.getTaskStopId());
 		TaskSopt t=new TaskSopt();
 		t.setId(use.getId());
 		if (in.getStatus()==1){
@@ -1567,7 +1567,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				examineProjectSotpAddNotice(task,1,use.getType());
 			}
 			TaskLog taskLog = new TaskLog();
-			taskLog.setSotpId(in.getTaskSoptId());
+			taskLog.setSotpId(in.getTaskStopId());
 			taskLog.setContent(str.toString());
 			taskLog.setAid(use.getCreateBy());
 			taskLogMapper.insertSelective(taskLog);
@@ -1583,7 +1583,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			t.setStatus(2);
 		}
 		TaskSoptLog taskSoptLog=new TaskSoptLog();
-		taskSoptLog.setTaskSoptId(in.getTaskSoptId());
+		taskSoptLog.setTaskSoptId(in.getTaskStopId());
 		taskSoptLog.setReason(in.getReason());
 		taskSoptLog.setStatus(in.getStatus());
 		taskSoptLog.setCreateTime(new Date());