diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java index 10a4d1e..ff94816 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java @@ -2,9 +2,12 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.permission.model.CheckItemManage; @@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; @@ -169,45 +173,20 @@ public class CheckItemManageController extends BaseController { ResultUtils.buildParameterErrorResultAndWrite(response, "请选择要修改的数据"); return; } - boolean start = true; - boolean end = true; - CheckItemManageQuery checkItemManageQuery = new CheckItemManageQuery(); - checkItemManageQuery.setAffiliateId(affiliateId); - List list = checkItemManageService.getCheckItemManage(affiliateId); - if (CollectionUtils.isNotEmpty(list)) { - for (CheckItemManage checkItemManage : list) { - if (checkItemManage.getStartWeek() < startweek && checkItemManage.getEndWeek() > startweek) { - start = false; - break; - } - } - for (CheckItemManage checkItemManage : list) { - if (checkItemManage.getStartWeek() < endweek && checkItemManage.getEndWeek() > endweek) { - end = false; - break; - } - } - } - - if (end && start) { - CheckItemManage checkItemManage = new CheckItemManage(); - checkItemManage.setId(id); - checkItemManage.setStartWeek(startweek); - checkItemManage.setEndWeek(endweek); - checkItemManage.setCheckItemInfoId(checkItemInfoId); - checkItemManage.setAffiliateId(affiliateId); - checkItemManage.setModified(new Date()); - Integer count = checkItemManageService.updateCheckItemMagage(checkItemManage); - if (count > 0 && null != count) { - ResultUtils.buildResultAndWrite(response, 0, "修改成功"); - } else { - ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败"); - return; - } + CheckItemManage checkItemManage = new CheckItemManage(); + checkItemManage.setId(id); + checkItemManage.setStartWeek(startweek); + checkItemManage.setEndWeek(endweek); + checkItemManage.setCheckItemInfoId(checkItemInfoId); + checkItemManage.setAffiliateId(affiliateId); + checkItemManage.setModified(new Date()); + Integer count = checkItemManageService.updateCheckItemMagage(checkItemManage); + if (count > 0 && null != count) { + ResultUtils.buildResultAndWrite(response, 0, "修改成功"); } else { - ResultUtils.buildParameterErrorResultAndWrite(response, "此范围以填写!"); + ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败"); + return; } - } /**