sccg_server.git

			@@ -15,6 +15,7 @@
			import com.ycl.dto.caseHandler.DispatchInfoParam;
			import com.ycl.dto.caseHandler.QueryForViolationParam;
			import com.ycl.dto.casePool.IllegalBuildingParam;
			import com.ycl.dto.casePool.VideoInspectParam;
			import com.ycl.dto.casePool.ViolationParam;
			import com.ycl.entity.caseHandler.*;
			import com.ycl.entity.dict.DataDictionary;
			@@ -31,7 +32,6 @@
			import com.ycl.service.caseHandler.IViolationsService;
			import com.ycl.service.video.IVideoAlarmReportService;
			import com.ycl.vo.casePool.*;
			import com.ycl.vo.cockpit.enforcementEvents.EnforcementEventsVO;
			import com.ycl.vo.cockpit.enforcementEvents.EventVO;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -250,8 +250,8 @@
			if (baseCase.getCategory() == 1) {
			Map mapV = new HashMap();
			mapV.put("id", baseCase.getId());
			Violations violations = violationsMapper.selectCondMap(mapV);
			baseCase.setViolations(violations);
			ViolationsVO violationsVO = violationsMapper.selectCondMap(mapV);
			baseCase.setViolationsVO(violationsVO);
			} else {
			IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
			LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
			@@ -426,7 +426,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public Boolean updateCase(ViolationParam violationParam) {
			public Boolean updateCase(VideoInspectParam violationParam) {
			BaseCase baseCase = new BaseCase();
			BeanUtils.copyProperties(violationParam, baseCase);
			baseCase.setId(violationParam.getBaseId());
			@@ -434,7 +434,7 @@
			baseCaseMapper.updateById(baseCase);
			Violations violations = new Violations();
			BeanUtils.copyProperties(violationParam, violations);
			violations.setId(violations.getId());
			violations.setId(violationParam.getBaseId());
			if (violationParam.getState() == 6) {
			AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
			violationParam.setCreateUser(user.getUserId());