From 6f1ddf0150f6a73ee830e8fd83bfb7d80123f8ac Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Thu, 21 Mar 2019 15:29:02 +0800
Subject: [PATCH] update

---
 .../web/controller/CheckItemManageController.java  | 52 +++++++++++++++-------
 1 file changed, 36 insertions(+), 16 deletions(-)

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 ff94816..4e04fac 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,12 +2,9 @@ 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;
@@ -19,7 +16,6 @@ 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;
@@ -173,20 +169,44 @@ public class CheckItemManageController extends BaseController {
             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, "修改成功");
+        boolean start = true;
+        boolean end = true;
+        CheckItemManageQuery checkItemManageQuery = new CheckItemManageQuery();
+        checkItemManageQuery.setAffiliateId(affiliateId);
+        List<CheckItemManage> 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;
+            }
         } else {
-            ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败");
-            return;
+            ResultUtils.buildParameterErrorResultAndWrite(response, "此范围以填写!");
         }
+
     }
 
     /**
-- 
1.8.3.1