productDev/dmvisit.git

			@@ -147,7 +147,6 @@
			startmodel.setSteps(comLocation +";"+allList.get(0).getLongitude()+","+allList.get(0).getLatitude());
			}
			list.add(startmodel);

			for (int i = 0; i < allList.size(); i++) {
			if(allList.size() == i+1){
			JkCustomerNavigation endmodel = new JkCustomerNavigation();
			@@ -375,6 +374,9 @@
			Utils.MP.blankToNull(pageWrap.getModel());
			pageWrap.getModel().setIsdeleted(Constants.ZERO);
			queryWrapper.selectAll(JkSketchCustomer.class )
			.selectAs(JkCustomer::getLocation,JkSketchCustomer::getLocation)
			.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
			.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
			.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
			.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
			.selectAs(JkLine::getName,JkSketchCustomer::getLineName)

			@@ -550,7 +550,7 @@
			dataModel.initDataInfo(vehicleNumber1,demands1,demands2,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
			TspSolver.startSearch(dataModel);
			JkSketch nowModel = jkSketchMapper.selectById(model.getId());
			if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
			if(!StringUtils.equals(model.getJobId(), nowModel.getJobId())){
			log.error( "优化结果已失效，非最近一次操作！");
			return;
			}
			@@ -708,7 +708,7 @@
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"线路【"+line.getLineName()+"】调整失败，未获得最优交通规划方案！");
			}
			JkSketch nowModel = jkSketchMapper.selectById(model.getId());
			if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
			if(!StringUtils.equals(model.getJobId(), nowModel.getJobId())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"线路【"+line.getLineName()+"】调整失败，非最近一次操作！");
			}

	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史