Commit 6f1ddf0150f6a73ee830e8fd83bfb7d80123f8ac
1 parent
d39f42f16d
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 36 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java
View file @
6f1ddf0
| ... | ... | @@ -2,12 +2,9 @@ |
| 2 | 2 | |
| 3 | 3 | import com.lyms.platform.common.annotation.TokenRequired; |
| 4 | 4 | import com.lyms.platform.common.base.BaseController; |
| 5 | -import com.lyms.platform.common.base.LoginContext; | |
| 6 | 5 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 7 | -import com.lyms.platform.common.result.BaseResponse; | |
| 8 | 6 | import com.lyms.platform.common.utils.ResultUtils; |
| 9 | 7 | import com.lyms.platform.common.utils.StringUtils; |
| 10 | -import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
| 11 | 8 | import com.lyms.platform.operate.web.result.FrontEndResult; |
| 12 | 9 | import com.lyms.platform.operate.web.utils.CollectionUtils; |
| 13 | 10 | import com.lyms.platform.permission.model.CheckItemManage; |
| ... | ... | @@ -19,7 +16,6 @@ |
| 19 | 16 | import org.springframework.stereotype.Controller; |
| 20 | 17 | import org.springframework.web.bind.annotation.*; |
| 21 | 18 | |
| 22 | -import javax.servlet.http.HttpServletRequest; | |
| 23 | 19 | import javax.servlet.http.HttpServletResponse; |
| 24 | 20 | import java.util.ArrayList; |
| 25 | 21 | import java.util.Date; |
| 26 | 22 | |
| 27 | 23 | |
| ... | ... | @@ -173,20 +169,44 @@ |
| 173 | 169 | ResultUtils.buildParameterErrorResultAndWrite(response, "请选择要修改的数据"); |
| 174 | 170 | return; |
| 175 | 171 | } |
| 176 | - CheckItemManage checkItemManage = new CheckItemManage(); | |
| 177 | - checkItemManage.setId(id); | |
| 178 | - checkItemManage.setStartWeek(startweek); | |
| 179 | - checkItemManage.setEndWeek(endweek); | |
| 180 | - checkItemManage.setCheckItemInfoId(checkItemInfoId); | |
| 181 | - checkItemManage.setAffiliateId(affiliateId); | |
| 182 | - checkItemManage.setModified(new Date()); | |
| 183 | - Integer count = checkItemManageService.updateCheckItemMagage(checkItemManage); | |
| 184 | - if (count > 0 && null != count) { | |
| 185 | - ResultUtils.buildResultAndWrite(response, 0, "修改成功"); | |
| 172 | + boolean start = true; | |
| 173 | + boolean end = true; | |
| 174 | + CheckItemManageQuery checkItemManageQuery = new CheckItemManageQuery(); | |
| 175 | + checkItemManageQuery.setAffiliateId(affiliateId); | |
| 176 | + List<CheckItemManage> list = checkItemManageService.getCheckItemManage(affiliateId); | |
| 177 | + if (CollectionUtils.isNotEmpty(list)) { | |
| 178 | + for (CheckItemManage checkItemManage : list) { | |
| 179 | + if (checkItemManage.getStartWeek() <= startweek && checkItemManage.getEndWeek() >= startweek) { | |
| 180 | + start = false; | |
| 181 | + break; | |
| 182 | + } | |
| 183 | + } | |
| 184 | + for (CheckItemManage checkItemManage : list) { | |
| 185 | + if (checkItemManage.getStartWeek() <= endweek && checkItemManage.getEndWeek() >= endweek) { | |
| 186 | + end = false; | |
| 187 | + break; | |
| 188 | + } | |
| 189 | + } | |
| 190 | + } | |
| 191 | + if (end && start) { | |
| 192 | + CheckItemManage checkItemManage = new CheckItemManage(); | |
| 193 | + checkItemManage.setId(id); | |
| 194 | + checkItemManage.setStartWeek(startweek); | |
| 195 | + checkItemManage.setEndWeek(endweek); | |
| 196 | + checkItemManage.setCheckItemInfoId(checkItemInfoId); | |
| 197 | + checkItemManage.setAffiliateId(affiliateId); | |
| 198 | + checkItemManage.setModified(new Date()); | |
| 199 | + Integer count = checkItemManageService.updateCheckItemMagage(checkItemManage); | |
| 200 | + if (count > 0 && null != count) { | |
| 201 | + ResultUtils.buildResultAndWrite(response, 0, "修改成功"); | |
| 202 | + } else { | |
| 203 | + ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败"); | |
| 204 | + return; | |
| 205 | + } | |
| 186 | 206 | } else { |
| 187 | - ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败"); | |
| 188 | - return; | |
| 207 | + ResultUtils.buildParameterErrorResultAndWrite(response, "此范围以填写!"); | |
| 189 | 208 | } |
| 209 | + | |
| 190 | 210 | } |
| 191 | 211 | |
| 192 | 212 | /** |