Commit e16ac130c094d6aeb73a1648e87aab8db5c79349
1 parent
b8e0d8a018
Exists in
master
and in
6 other branches
update3
Showing 1 changed file with 16 additions and 37 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java
View file @
e16ac13
| ... | ... | @@ -2,9 +2,12 @@ |
| 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; | |
| 5 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 7 | +import com.lyms.platform.common.result.BaseResponse; | |
| 6 | 8 | import com.lyms.platform.common.utils.ResultUtils; |
| 7 | 9 | import com.lyms.platform.common.utils.StringUtils; |
| 10 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
| 8 | 11 | import com.lyms.platform.operate.web.result.FrontEndResult; |
| 9 | 12 | import com.lyms.platform.operate.web.utils.CollectionUtils; |
| 10 | 13 | import com.lyms.platform.permission.model.CheckItemManage; |
| ... | ... | @@ -16,6 +19,7 @@ |
| 16 | 19 | import org.springframework.stereotype.Controller; |
| 17 | 20 | import org.springframework.web.bind.annotation.*; |
| 18 | 21 | |
| 22 | +import javax.servlet.http.HttpServletRequest; | |
| 19 | 23 | import javax.servlet.http.HttpServletResponse; |
| 20 | 24 | import java.util.ArrayList; |
| 21 | 25 | import java.util.Date; |
| 22 | 26 | |
| 23 | 27 | |
| ... | ... | @@ -169,45 +173,20 @@ |
| 169 | 173 | ResultUtils.buildParameterErrorResultAndWrite(response, "请选择要修改的数据"); |
| 170 | 174 | return; |
| 171 | 175 | } |
| 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 | - | |
| 192 | - if (end && start) { | |
| 193 | - CheckItemManage checkItemManage = new CheckItemManage(); | |
| 194 | - checkItemManage.setId(id); | |
| 195 | - checkItemManage.setStartWeek(startweek); | |
| 196 | - checkItemManage.setEndWeek(endweek); | |
| 197 | - checkItemManage.setCheckItemInfoId(checkItemInfoId); | |
| 198 | - checkItemManage.setAffiliateId(affiliateId); | |
| 199 | - checkItemManage.setModified(new Date()); | |
| 200 | - Integer count = checkItemManageService.updateCheckItemMagage(checkItemManage); | |
| 201 | - if (count > 0 && null != count) { | |
| 202 | - ResultUtils.buildResultAndWrite(response, 0, "修改成功"); | |
| 203 | - } else { | |
| 204 | - ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败"); | |
| 205 | - return; | |
| 206 | - } | |
| 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, "修改成功"); | |
| 207 | 186 | } else { |
| 208 | - ResultUtils.buildParameterErrorResultAndWrite(response, "此范围以填写!"); | |
| 187 | + ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败"); | |
| 188 | + return; | |
| 209 | 189 | } |
| 210 | - | |
| 211 | 190 | } |
| 212 | 191 | |
| 213 | 192 | /** |